GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r451:e186227e6169

Passes TimeWidget in UTC...

Alexandre Leroux -

r451:e186227e6169

parent child

Context file:

r451:e186227e6169

Collapse all files

gui/src/TimeWidget/TimeWidget.cpp +9 -6

             #include "TimeWidget/TimeWidget.h"
             #include "ui_TimeWidget.h"
+            #include <Common/DateUtils.h>
             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
             {
                 ui->setupUi(this);
                 ui->applyToolButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_DialogApplyButton));
                 // Connection
                 connect(ui->startDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                         &TimeWidget::onTimeUpdateRequested);
                 connect(ui->endDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
                         &TimeWidget::onTimeUpdateRequested);
                 connect(ui->applyToolButton, &QToolButton::clicked, &sqpApp->timeController(),
                         &TimeController::onTimeNotify);
                 // Initialisation
-                ui->startDateTimeEdit->setDateTime(
+                auto endDateTime = QDateTime::currentDateTimeUtc();
-                    QDateTime::currentDateTime().addSecs(-3600)); // one hour berefore
+                auto startDateTime = endDateTime.addSecs(-3600); // one hour before
-                ui->endDateTimeEdit->setDateTime(QDateTime::currentDateTime());
+                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);
             }
             TimeWidget::~TimeWidget()
             {
                 delete ui;
             }
             void TimeWidget::onTimeUpdateRequested()
             {
                 auto dateTime = SqpDateTime{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
                                             DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime())};
                 emit timeUpdated(std::move(dateTime));
             }

gui/ui/TimeWidget/TimeWidget.ui +6 0

             <?xml version="1.0" encoding="UTF-8"?>
             <ui version="4.0">
              <class>TimeWidget</class>
              <widget class="QWidget" name="TimeWidget">
               <property name="geometry">
                <rect>
                 <x>0</x>
                 <y>0</y>
                 <width>716</width>
                 <height>48</height>
                </rect>
               </property>
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QHBoxLayout" name="horizontalLayout_2">
                <item>
                 <widget class="QLabel" name="label">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="text">
                   <string>TStart :</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QDateTimeEdit" name="startDateTimeEdit">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="displayFormat">
                   <string>dd/MM/yyyy HH:mm:ss:zzz</string>
                  </property>
                  <property name="calendarPopup">
                   <bool>true</bool>
                  </property>
+                 <property name="timeSpec">
+                  <enum>Qt::UTC</enum>
+                 </property>
                 </widget>
                </item>
                <item>
                 <widget class="QLabel" name="label_2">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="text">
                   <string>TEnd :</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QDateTimeEdit" name="endDateTimeEdit">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                    <horstretch>0</horstretch>
                    <verstretch>0</verstretch>
                   </sizepolicy>
                  </property>
                  <property name="displayFormat">
                   <string>dd/MM/yyyy HH:mm:ss:zzz</string>
                  </property>
                  <property name="calendarPopup">
                   <bool>true</bool>
                  </property>
+                 <property name="timeSpec">
+                  <enum>Qt::UTC</enum>
+                 </property>
                 </widget>
                </item>
                <item>
                 <widget class="QToolButton" name="applyToolButton">
                  <property name="text">
                   <string>...</string>
                  </property>
                 </widget>
                </item>
               </layout>
              </widget>
              <resources/>
              <connections/>
             </ui>

plugins/amda/src/AmdaResultParser.cpp +3 -1

             #include "AmdaResultParser.h"
+            #include <Common/DateUtils.h>
             #include <Data/ScalarSeries.h>
             #include <QDateTime>
             #include <QFile>
             #include <QRegularExpression>
             #include <cmath>
             Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
             namespace {
             /// Message in result file when the file was not found on server
             const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
             /// Format for dates in result files
             const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
             /// Separator between values in a result line
             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
             /// Regex to find unit in a line. Examples of valid lines:
             /// ... - Units : nT - ...
             /// ... -Units:nT- ...
             /// ... -Units:   m²- ...
             /// ... - Units : m/s - ...
             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
             /// Converts a string date to a double date
             /// @return a double that represents the date in seconds, NaN if the string date can't be converted
             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();
             }
             /**
              * Reads stream to retrieve x-axis unit
              * @param stream the stream to read
              * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
              * error occured during reading
              */
             Unit readXAxisUnit(QTextStream &stream)
             {
                 QString line{};
                 if (stream.readLineInto(&line)) {
                     auto match = UNIT_REGEX.match(line);
                     if (match.hasMatch()) {
                         return Unit{match.captured(1), true};
                     }
                     else {
                         qCWarning(LOG_AmdaResultParser())
                             << QObject::tr("Can't read unit: invalid line %1").arg(line);
                     }
                 }
                 else {
                     qCWarning(LOG_AmdaResultParser()) << QObject::tr("Can't read unit: end of file");
                 }
                 // Error cases
                 return Unit{{}, true};
             }
             /**
              * Reads stream to retrieve results
              * @param stream the stream to read
              * @return the pair of vectors x-axis data/values data that has been read in the stream
              */
             QPair<QVector<double>, QVector<double> > readResults(QTextStream &stream)
             {
                 auto xData = QVector<double>{};
                 auto valuesData = QVector<double>{};
                 QString line{};
                 while (stream.readLineInto(&line)) {
                     auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
                     if (lineData.size() == 2) {
                         // X : the data is converted from date to double (in secs)
                         auto x = doubleDate(lineData.at(0));
                         // Value
                         bool valueOk;
                         auto value = lineData.at(1).toDouble(&valueOk);
                         // Adds result only if x and value are valid
                         if (!std::isnan(x) && !std::isnan(value) && valueOk) {
                             xData.push_back(x);
                             valuesData.push_back(value);
                         }
                         else {
                             qCWarning(LOG_AmdaResultParser())
                                 << QObject::tr(
                                        "Can't retrieve results from line %1: x and/or value are invalid")
                                        .arg(line);
                         }
                     }
                     else {
                         qCWarning(LOG_AmdaResultParser())
                             << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
                     }
                 }
                 return qMakePair(std::move(xData), std::move(valuesData));
             }
             } // namespace
             std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath) noexcept
             {
                 QFile file{filePath};
                 if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data from file %1: %2")
                                .arg(filePath, file.errorString());
                     return nullptr;
                 }
                 QTextStream stream{&file};
                 // Checks if the file was found on the server
                 auto firstLine = stream.readLine();
                 if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
                     qCCritical(LOG_AmdaResultParser())
                         << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
                                .arg(filePath);
                     return nullptr;
                 }
                 // Ignore comments lines
                 stream.readLine();
                 // Reads x-axis unit
                 auto xAxisUnit = readXAxisUnit(stream);
                 // Reads results
                 auto results = readResults(stream);
                 return std::make_shared<ScalarSeries>(std::move(results.first), std::move(results.second),
                                                       xAxisUnit, Unit{});
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages