From e186227e6169c6dce6d828c04b0209dc8cf07fc1 2017-08-02 15:12:50
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-08-02 15:12:50
Subject: [PATCH] Passes TimeWidget in UTC

+ specifies that AMDA uses UTC datetimes

---

diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index 79a0146..01cd71f 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -1,6 +1,7 @@
 #include "TimeWidget/TimeWidget.h"
 #include "ui_TimeWidget.h"
 
+#include <Common/DateUtils.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 
@@ -22,13 +23,15 @@ TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget
             &TimeController::onTimeNotify);
 
     // Initialisation
-    ui->startDateTimeEdit->setDateTime(
-        QDateTime::currentDateTime().addSecs(-3600)); // one hour berefore
-    ui->endDateTimeEdit->setDateTime(QDateTime::currentDateTime());
+    auto endDateTime = QDateTime::currentDateTimeUtc();
+    auto startDateTime = endDateTime.addSecs(-3600); // one hour before
+
+    ui->startDateTimeEdit->setDateTime(startDateTime);
+    ui->endDateTimeEdit->setDateTime(endDateTime);
+
+    auto dateTime = SqpDateTime{DateUtils::secondsSinceEpoch(startDateTime),
+                                DateUtils::secondsSinceEpoch(endDateTime)};
 
-    auto dateTime
-        = SqpDateTime{QDateTime::currentDateTime().addSecs(-3600).toMSecsSinceEpoch() / 1000.0,
-                      QDateTime::currentDateTime().toMSecsSinceEpoch() / 1000.0};
     sqpApp->timeController().onTimeToUpdate(dateTime);
 }
 
diff --git a/gui/ui/TimeWidget/TimeWidget.ui b/gui/ui/TimeWidget/TimeWidget.ui
index d1f5ccb..afc7200 100644
--- a/gui/ui/TimeWidget/TimeWidget.ui
+++ b/gui/ui/TimeWidget/TimeWidget.ui
@@ -47,6 +47,9 @@
      <property name="calendarPopup">
       <bool>true</bool>
      </property>
+     <property name="timeSpec">
+      <enum>Qt::UTC</enum>
+     </property>
     </widget>
    </item>
    <item>
@@ -76,6 +79,9 @@
      <property name="calendarPopup">
       <bool>true</bool>
      </property>
+     <property name="timeSpec">
+      <enum>Qt::UTC</enum>
+     </property>
     </widget>
    </item>
    <item>
diff --git a/plugins/amda/src/AmdaResultParser.cpp b/plugins/amda/src/AmdaResultParser.cpp
index e435dce..61fb44b 100644
--- a/plugins/amda/src/AmdaResultParser.cpp
+++ b/plugins/amda/src/AmdaResultParser.cpp
@@ -1,5 +1,6 @@
 #include "AmdaResultParser.h"
 
+#include <Common/DateUtils.h>
 #include <Data/ScalarSeries.h>
 
 #include <QDateTime>
@@ -33,7 +34,8 @@ const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.
 double doubleDate(const QString &stringDate) noexcept
 {
     auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
-    return dateTime.isValid() ? (dateTime.toMSecsSinceEpoch() / 1000.)
+    dateTime.setTimeSpec(Qt::UTC);
+    return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
                               : std::numeric_limits<double>::quiet_NaN();
 }