@@ -36,7 +36,6 | |||||
36 |
|
36 | |||
37 | #include <QAction> |
|
37 | #include <QAction> | |
38 | #include <QDate> |
|
38 | #include <QDate> | |
39 | #include <QDateTime> |
|
|||
40 | #include <QDir> |
|
39 | #include <QDir> | |
41 | #include <QFileDialog> |
|
40 | #include <QFileDialog> | |
42 | #include <QToolBar> |
|
41 | #include <QToolBar> |
@@ -23,7 +23,7 struct Unit { | |||||
23 | inline bool operator!=(const Unit &other) const { return !(*this == other); } |
|
23 | inline bool operator!=(const Unit &other) const { return !(*this == other); } | |
24 |
|
24 | |||
25 | QString m_Name; ///< Unit name |
|
25 | QString m_Name; ///< Unit name | |
26 | bool m_TimeUnit; ///< The unit is a unit of time |
|
26 | bool m_TimeUnit; ///< The unit is a unit of time (UTC) | |
27 | }; |
|
27 | }; | |
28 |
|
28 | |||
29 | /** |
|
29 | /** |
@@ -12,9 +12,9 | |||||
12 | * @brief The SqpDateTime struct holds the information of time parameters |
|
12 | * @brief The SqpDateTime struct holds the information of time parameters | |
13 | */ |
|
13 | */ | |
14 | struct SqpDateTime { |
|
14 | struct SqpDateTime { | |
15 | /// Start time |
|
15 | /// Start time (UTC) | |
16 | double m_TStart; |
|
16 | double m_TStart; | |
17 | /// End time |
|
17 | /// End time (UTC) | |
18 | double m_TEnd; |
|
18 | double m_TEnd; | |
19 |
|
19 | |||
20 | bool contains(const SqpDateTime &dateTime) const noexcept |
|
20 | bool contains(const SqpDateTime &dateTime) const noexcept |
@@ -8,7 +8,6 | |||||
8 | #include <Data/IDataSeries.h> |
|
8 | #include <Data/IDataSeries.h> | |
9 | #include <Time/TimeController.h> |
|
9 | #include <Time/TimeController.h> | |
10 |
|
10 | |||
11 | #include <QDateTime> |
|
|||
12 | #include <QMutex> |
|
11 | #include <QMutex> | |
13 | #include <QThread> |
|
12 | #include <QThread> | |
14 | #include <QUuid> |
|
13 | #include <QUuid> |
@@ -99,7 +99,7 void TestAmdaResultParser::testReadTxt_data() | |||||
99 | // ////////// // |
|
99 | // ////////// // | |
100 |
|
100 | |||
101 | auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) { |
|
101 | auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) { | |
102 | return QDateTime{{year, month, day}, {hours, minutes, seconds}}; |
|
102 | return QDateTime{{year, month, day}, {hours, minutes, seconds}, Qt::UTC}; | |
103 | }; |
|
103 | }; | |
104 |
|
104 | |||
105 | // Valid file |
|
105 | // Valid file |
General Comments 0
You need to be logged in to leave comments.
Login now