@@ -1,6 +1,7 | |||||
1 | #include "TimeWidget/TimeWidget.h" |
|
1 | #include "TimeWidget/TimeWidget.h" | |
2 | #include "ui_TimeWidget.h" |
|
2 | #include "ui_TimeWidget.h" | |
3 |
|
3 | |||
|
4 | #include <Common/DateUtils.h> | |||
4 | #include <SqpApplication.h> |
|
5 | #include <SqpApplication.h> | |
5 | #include <Time/TimeController.h> |
|
6 | #include <Time/TimeController.h> | |
6 |
|
7 | |||
@@ -22,13 +23,15 TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget | |||||
22 | &TimeController::onTimeNotify); |
|
23 | &TimeController::onTimeNotify); | |
23 |
|
24 | |||
24 | // Initialisation |
|
25 | // Initialisation | |
25 | ui->startDateTimeEdit->setDateTime( |
|
26 | auto endDateTime = QDateTime::currentDateTimeUtc(); | |
26 |
|
|
27 | auto startDateTime = endDateTime.addSecs(-3600); // one hour before | |
27 | ui->endDateTimeEdit->setDateTime(QDateTime::currentDateTime()); |
|
28 | ||
|
29 | ui->startDateTimeEdit->setDateTime(startDateTime); | |||
|
30 | ui->endDateTimeEdit->setDateTime(endDateTime); | |||
|
31 | ||||
|
32 | auto dateTime = SqpDateTime{DateUtils::secondsSinceEpoch(startDateTime), | |||
|
33 | DateUtils::secondsSinceEpoch(endDateTime)}; | |||
28 |
|
34 | |||
29 | auto dateTime |
|
|||
30 | = SqpDateTime{QDateTime::currentDateTime().addSecs(-3600).toMSecsSinceEpoch() / 1000.0, |
|
|||
31 | QDateTime::currentDateTime().toMSecsSinceEpoch() / 1000.0}; |
|
|||
32 | sqpApp->timeController().onTimeToUpdate(dateTime); |
|
35 | sqpApp->timeController().onTimeToUpdate(dateTime); | |
33 | } |
|
36 | } | |
34 |
|
37 |
@@ -47,6 +47,9 | |||||
47 | <property name="calendarPopup"> |
|
47 | <property name="calendarPopup"> | |
48 | <bool>true</bool> |
|
48 | <bool>true</bool> | |
49 | </property> |
|
49 | </property> | |
|
50 | <property name="timeSpec"> | |||
|
51 | <enum>Qt::UTC</enum> | |||
|
52 | </property> | |||
50 | </widget> |
|
53 | </widget> | |
51 | </item> |
|
54 | </item> | |
52 | <item> |
|
55 | <item> | |
@@ -76,6 +79,9 | |||||
76 | <property name="calendarPopup"> |
|
79 | <property name="calendarPopup"> | |
77 | <bool>true</bool> |
|
80 | <bool>true</bool> | |
78 | </property> |
|
81 | </property> | |
|
82 | <property name="timeSpec"> | |||
|
83 | <enum>Qt::UTC</enum> | |||
|
84 | </property> | |||
79 | </widget> |
|
85 | </widget> | |
80 | </item> |
|
86 | </item> | |
81 | <item> |
|
87 | <item> |
@@ -1,5 +1,6 | |||||
1 | #include "AmdaResultParser.h" |
|
1 | #include "AmdaResultParser.h" | |
2 |
|
2 | |||
|
3 | #include <Common/DateUtils.h> | |||
3 | #include <Data/ScalarSeries.h> |
|
4 | #include <Data/ScalarSeries.h> | |
4 |
|
5 | |||
5 | #include <QDateTime> |
|
6 | #include <QDateTime> | |
@@ -33,7 +34,8 const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(. | |||||
33 | double doubleDate(const QString &stringDate) noexcept |
|
34 | double doubleDate(const QString &stringDate) noexcept | |
34 | { |
|
35 | { | |
35 | auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT); |
|
36 | auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT); | |
36 | return dateTime.isValid() ? (dateTime.toMSecsSinceEpoch() / 1000.) |
|
37 | dateTime.setTimeSpec(Qt::UTC); | |
|
38 | return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime) | |||
37 | : std::numeric_limits<double>::quiet_NaN(); |
|
39 | : std::numeric_limits<double>::quiet_NaN(); | |
38 | } |
|
40 | } | |
39 |
|
41 |
General Comments 0
You need to be logged in to leave comments.
Login now