| @@ -1,20 +1,25 | |||
|
|
1 | 1 | #ifndef SCIQLOP_DATASERIES_H |
|
|
2 | 2 | #define SCIQLOP_DATASERIES_H |
|
|
3 | 3 | |
|
|
4 | #include "CoreGlobal.h" | |
|
|
5 | ||
|
|
4 | 6 | #include <Common/SortUtils.h> |
|
|
5 | 7 | |
|
|
6 | 8 | #include <Data/ArrayData.h> |
|
|
7 | 9 | #include <Data/IDataSeries.h> |
|
|
8 | 10 | |
|
|
9 | 11 | #include <QLoggingCategory> |
|
|
10 | ||
|
|
11 | 12 | #include <QReadLocker> |
|
|
12 | 13 | #include <QReadWriteLock> |
|
|
13 | 14 | #include <memory> |
|
|
14 | 15 | |
|
|
15 | Q_DECLARE_LOGGING_CATEGORY(LOG_DataSeries) | |
|
|
16 | Q_LOGGING_CATEGORY(LOG_DataSeries, "DataSeries") | |
|
|
17 | ||
|
|
16 | // We don't use the Qt macro since the log is used in the header file, which causes multiple log | |
|
|
17 | // definitions with inheritance. Inline method is used instead | |
|
|
18 | inline const QLoggingCategory &LOG_DataSeries() | |
|
|
19 | { | |
|
|
20 | static const QLoggingCategory category{"DataSeries"}; | |
|
|
21 | return category; | |
|
|
22 | } | |
|
|
18 | 23 | |
|
|
19 | 24 | /** |
|
|
20 | 25 | * @brief The DataSeries class is the base (abstract) implementation of IDataSeries. |
| @@ -27,7 +32,7 Q_LOGGING_CATEGORY(LOG_DataSeries, "DataSeries") | |||
|
|
27 | 32 | * |
|
|
28 | 33 | */ |
|
|
29 | 34 | template <int Dim> |
|
|
30 | class DataSeries : public IDataSeries { | |
|
|
35 | class SCIQLOP_CORE_EXPORT DataSeries : public IDataSeries { | |
|
|
31 | 36 | public: |
|
|
32 | 37 | class IteratorValue { |
|
|
33 | 38 | public: |
| @@ -9,6 +9,7 ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (D) | |||
|
|
9 | 9 | ArrayData\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (arraydata_detail) |
|
|
10 | 10 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (D) |
|
|
11 | 11 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (Dim) |
|
|
12 | DataSeries\.h:\d+:.*IPSIS_S04_METHOD.*found: LOG_DataSeries | |
|
|
12 | 13 | DataSeries\.h:\d+:.*IPSIS_S04_VARIABLE.* |
|
|
13 | 14 | |
|
|
14 | 15 | # Ignore false positive relative to iterators |
General Comments 0
You need to be logged in to leave comments.
Login now