GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r471:d00d6fd96c10

Change SqpRange for SqpDateTime

perrinel -

r471:d00d6fd96c10

parent child

Context file:

r471:d00d6fd96c10

app/src/MainWindow.cpp +6 -6

                 // /////////// //
                 // Controllers / controllers connections
-                connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpDateTime)),
+                connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpRange)), &sqpApp->variableController(),
-                        &sqpApp->variableController(), SLOT(onDateTimeOnSelection(SqpDateTime)));
+                        SLOT(onDateTimeOnSelection(SqpRange)));
                 // Widgets / controllers connections
                         m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
                 // Time
-                connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
+                connect(timeWidget, SIGNAL(timeUpdated(SqpRange)), &sqpApp->timeController(),
-                        SLOT(onTimeToUpdate(SqpDateTime)));
+                        SLOT(onTimeToUpdate(SqpRange)));
                 // Visualization
                 connect(&sqpApp->visualizationController(),
                         SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable>)));
                 connect(&sqpApp->visualizationController(),
-                        SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)), m_Ui->view,
+                        SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)), m_Ui->view,
-                        SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)));
+                        SLOT(onRangeChanged(std::shared_ptr<Variable>, const SqpRange &)));
                 // Widgets / widgets connections

core/include/Data/DataProviderParameters.h +2 -2

             #ifndef SCIQLOP_DATAPROVIDERPARAMETERS_H
             #define SCIQLOP_DATAPROVIDERPARAMETERS_H
-            #include "SqpDateTime.h"
+            #include "SqpRange.h"
             /**
              * @brief The DataProviderParameters struct holds the information needed to retrieve data from a
              */
             struct DataProviderParameters {
                 /// Times for which retrieve data
-                QVector<SqpDateTime> m_Times;
+                QVector<SqpRange> m_Times;
                 /// Extra data that can be used by the provider to retrieve data
                 QVariantHash m_Data;
             };

core/include/Data/IDataProvider.h +2 -2

             #include <Common/MetaTypes.h>
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <functional>
                  * identified by identifier
                  */
                 void dataProvided(QUuid identifier, std::shared_ptr<IDataSeries> dateSerie,
-                                  const SqpDateTime &dateTime);
+                                  const SqpRange &dateTime);
                 /**
                     * @brief dataProvided send dataSeries under dateTime and that corresponds of the data

core/include/Time/TimeController.h +4 -4

             #include "CoreGlobal.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
             public:
                 explicit TimeController(QObject *parent = 0);
-                SqpDateTime dateTime() const noexcept;
+                SqpRange dateTime() const noexcept;
             signals:
                 /// Signal emitted to notify that time parameters has beed updated
-                void timeUpdated(SqpDateTime time);
+                void timeUpdated(SqpRange time);
             public slots:
                 /// Slot called when a new dateTime has been defined.
-                void onTimeToUpdate(SqpDateTime dateTime);
+                void onTimeToUpdate(SqpRange dateTime);
                 /// Slot called when the dateTime has to be notified. Call timeUpdated signal
                 void onTimeNotify();

core/include/Variable/Variable.h +7 -7

             #include "CoreGlobal.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
                 Q_OBJECT
             public:
-                explicit Variable(const QString &name, const SqpDateTime &dateTime,
+                explicit Variable(const QString &name, const SqpRange &dateTime,
                                   const QVariantHash &metadata = {});
                 QString name() const noexcept;
-                SqpDateTime dateTime() const noexcept;
+                SqpRange dateTime() const noexcept;
-                void setDateTime(const SqpDateTime &dateTime) noexcept;
+                void setDateTime(const SqpRange &dateTime) noexcept;
                 /// @return the data of the variable, nullptr if there is no data
                 IDataSeries *dataSeries() const noexcept;
                 QVariantHash metadata() const noexcept;
-                bool contains(const SqpDateTime &dateTime) const noexcept;
+                bool contains(const SqpRange &dateTime) const noexcept;
-                bool intersect(const SqpDateTime &dateTime) const noexcept;
+                bool intersect(const SqpRange &dateTime) const noexcept;
-                bool isInside(const SqpDateTime &dateTime) const noexcept;
+                bool isInside(const SqpRange &dateTime) const noexcept;
             public slots:
                 void setDataSeries(std::shared_ptr<IDataSeries> dataSeries) noexcept;

core/include/Variable/VariableCacheController.h +5 -5

             #include <QLoggingCategory>
             #include <QObject>
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
                 explicit VariableCacheController(QObject *parent = 0);
-                void addDateTime(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
+                void addDateTime(std::shared_ptr<Variable> variable, const SqpRange &dateTime);
                 /// Clears cache concerning a variable
                 void clear(std::shared_ptr<Variable> variable) noexcept;
                 /// Return all of the SqpDataTime part of the dateTime whose are not in the cache
-                QVector<SqpDateTime> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
+                QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
-                                                                   const SqpDateTime &dateTime);
+                                                                const SqpRange &dateTime);
-                QVector<SqpDateTime> dateCacheList(std::shared_ptr<Variable> variable) const noexcept;
+                QVector<SqpRange> dateCacheList(std::shared_ptr<Variable> variable) const noexcept;
                 void displayCache(std::shared_ptr<Variable> variable) const;

core/include/Variable/VariableController.h +4 -4

             #include "CoreGlobal.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
                 /// Signal emitted when a data acquisition is requested on a range for a variable
-                void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range);
+                void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
             public slots:
                 /// Request the data loading of the variable whithin dateTime
-                void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
+                void onRequestDataLoading(std::shared_ptr<Variable> variable, const SqpRange &dateTime);
                 /**
                  * Creates a new variable and adds it to the model
                  * @param name the name of the new variable
                                     std::shared_ptr<IDataProvider> provider) noexcept;
                 /// Update the temporal parameters of every selected variable to dateTime
-                void onDateTimeOnSelection(const SqpDateTime &dateTime);
+                void onDateTimeOnSelection(const SqpRange &dateTime);
                 void onVariableRetrieveDataInProgress(QUuid identifier, double progress);

core/include/Variable/VariableModel.h +2 -2

             #include "CoreGlobal.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QAbstractTableModel>
             #include <QLoggingCategory>
                  * @param metadata the metadata associated to the new variable
                  * @return the pointer to the new variable
                  */
-                std::shared_ptr<Variable> createVariable(const QString &name, const SqpDateTime &dateTime,
+                std::shared_ptr<Variable> createVariable(const QString &name, const SqpRange &dateTime,
                                                          const QVariantHash &metadata) noexcept;
                 /**

core/include/Visualization/VisualizationController.h +2 -2

             #include "CoreGlobal.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QObject>
                 void variableAboutToBeDeleted(std::shared_ptr<Variable> variable);
                 /// Signal emitted when a data acquisition is requested on a range for a variable
-                void rangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range);
+                void rangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range);
             public slots:
                 /// Manage init/end of the controller

core/src/Time/TimeController.cpp +3 -3

             struct TimeController::TimeControllerPrivate {
-                SqpDateTime m_DateTime;
+                SqpRange m_DateTime;
             };
             TimeController::TimeController(QObject *parent)
                 qCDebug(LOG_TimeController()) << tr("TimeController construction");
             }
-            SqpDateTime TimeController::dateTime() const noexcept
+            SqpRange TimeController::dateTime() const noexcept
             {
                 return impl->m_DateTime;
             }
-            void TimeController::onTimeToUpdate(SqpDateTime dateTime)
+            void TimeController::onTimeToUpdate(SqpRange dateTime)
             {
                 impl->m_DateTime = dateTime;
             }

core/src/Variable/Variable.cpp +10 -10

             #include "Variable/Variable.h"
             #include <Data/IDataSeries.h>
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QReadWriteLock>
             #include <QThread>
             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
             struct Variable::VariablePrivate {
-                explicit VariablePrivate(const QString &name, const SqpDateTime &dateTime,
+                explicit VariablePrivate(const QString &name, const SqpRange &dateTime,
                                          const QVariantHash &metadata)
                         : m_Name{name}, m_DateTime{dateTime}, m_Metadata{metadata}, m_DataSeries{nullptr}
                 {
                 QString m_Name;
-                SqpDateTime m_DateTime; // The dateTime available in the view and loaded. not the cache.
+                SqpRange m_DateTime; // The dateTime available in the view and loaded. not the cache.
                 QVariantHash m_Metadata;
                 std::unique_ptr<IDataSeries> m_DataSeries;
             };
-            Variable::Variable(const QString &name, const SqpDateTime &dateTime, const QVariantHash &metadata)
+            Variable::Variable(const QString &name, const SqpRange &dateTime, const QVariantHash &metadata)
                     : impl{spimpl::make_unique_impl<VariablePrivate>(name, dateTime, metadata)}
             {
             }
                 return impl->m_Name;
             }
-            SqpDateTime Variable::dateTime() const noexcept
+            SqpRange Variable::dateTime() const noexcept
             {
                 return impl->m_DateTime;
             }
-            void Variable::setDateTime(const SqpDateTime &dateTime) noexcept
+            void Variable::setDateTime(const SqpRange &dateTime) noexcept
             {
                 impl->m_DateTime = dateTime;
             }
                 return impl->m_Metadata;
             }
-            bool Variable::contains(const SqpDateTime &dateTime) const noexcept
+            bool Variable::contains(const SqpRange &dateTime) const noexcept
             {
                 return impl->m_DateTime.contains(dateTime);
             }
-            bool Variable::intersect(const SqpDateTime &dateTime) const noexcept
+            bool Variable::intersect(const SqpRange &dateTime) const noexcept
             {
                 return impl->m_DateTime.intersect(dateTime);
             }
-            bool Variable::isInside(const SqpDateTime &dateTime) const noexcept
+            bool Variable::isInside(const SqpRange &dateTime) const noexcept
             {
-                return dateTime.contains(SqpDateTime{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});
+                return dateTime.contains(SqpRange{impl->m_DateTime.m_TStart, impl->m_DateTime.m_TEnd});
             }

core/src/Variable/VariableCacheController.cpp +36 -39

             struct VariableCacheController::VariableCacheControllerPrivate {
-                std::unordered_map<std::shared_ptr<Variable>, QVector<SqpDateTime> >
+                std::unordered_map<std::shared_ptr<Variable>, QVector<SqpRange> > m_VariableToSqpRangeListMap;
-                    m_VariableToSqpDateTimeListMap;
-                void addInCacheDataByEnd(const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList,
+                void addInCacheDataByEnd(const SqpRange &dateTime, QVector<SqpRange> &dateTimeList,
-                                         QVector<SqpDateTime> &notInCache, int cacheIndex,
+                                         QVector<SqpRange> &notInCache, int cacheIndex, double currentTStart);
-                                         double currentTStart);
-                void addInCacheDataByStart(const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList,
+                void addInCacheDataByStart(const SqpRange &dateTime, QVector<SqpRange> &dateTimeList,
-                                           QVector<SqpDateTime> &notInCache, int cacheIndex,
+                                           QVector<SqpRange> &notInCache, int cacheIndex, double currentTStart);
-                                           double currentTStart);
-                void addDateTimeRecurse(const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList,
+                void addDateTimeRecurse(const SqpRange &dateTime, QVector<SqpRange> &dateTimeList,
                                         int cacheIndex);
             };
             }
             void VariableCacheController::addDateTime(std::shared_ptr<Variable> variable,
-                                                      const SqpDateTime &dateTime)
+                                                      const SqpRange &dateTime)
             {
                 qCDebug(LOG_VariableCacheController()) << "VariableCacheController::addDateTime"
                                                        << QThread::currentThread()->objectName();
                 if (variable) {
-                    auto findVariableIte = impl->m_VariableToSqpDateTimeListMap.find(variable);
+                    auto findVariableIte = impl->m_VariableToSqpRangeListMap.find(variable);
-                    if (findVariableIte == impl->m_VariableToSqpDateTimeListMap.end()) {
+                    if (findVariableIte == impl->m_VariableToSqpRangeListMap.end()) {
-                        impl->m_VariableToSqpDateTimeListMap[variable].push_back(dateTime);
+                        impl->m_VariableToSqpRangeListMap[variable].push_back(dateTime);
                     }
                     else {
-                        // addDateTime modify the list<SqpDateTime> of the variable in a way to ensure
+                        // addDateTime modify the list<SqpRange> of the variable in a way to ensure
                         // that the list is ordered : l(0) < l(1). We assume also a < b
-                        // (with a & b of type SqpDateTime) means ts(b) > te(a)
+                        // (with a & b of type SqpRange) means ts(b) > te(a)
                         // The algorithm will try the merge of two interval:
                         // - dateTime will be compare with the first interval of the list:
                         //   C: if it is superior, we do the same with the next interval of the list
                         try {
-                            impl->addDateTimeRecurse(dateTime,
+                            impl->addDateTimeRecurse(dateTime, impl->m_VariableToSqpRangeListMap.at(variable),
-                                                     impl->m_VariableToSqpDateTimeListMap.at(variable), 0);
+);
                         }
                         catch (const std::out_of_range &e) {
                             qCWarning(LOG_VariableCacheController()) << "addDateTime" << e.what();
                     return;
                 }
-                auto nbEntries = impl->m_VariableToSqpDateTimeListMap.erase(variable);
+                auto nbEntries = impl->m_VariableToSqpRangeListMap.erase(variable);
                 auto clearCacheMessage
                     = (nbEntries != 0)
                 qCDebug(LOG_VariableCacheController()) << clearCacheMessage;
             }
-            QVector<SqpDateTime>
+            QVector<SqpRange>
             VariableCacheController::provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
-                                                                   const SqpDateTime &dateTime)
+                                                                   const SqpRange &dateTime)
             {
                 qCDebug(LOG_VariableCacheController())
                     << "VariableCacheController::provideNotInCacheDateTimeList"
                     << QThread::currentThread()->objectName();
-                auto notInCache = QVector<SqpDateTime>{};
+                auto notInCache = QVector<SqpRange>{};
                 // This algorithm is recursif. The idea is to localise the start time then the end time in the
                 // list of date time request associated to the variable
                 // We assume that the list is ordered in a way that l(0) < l(1). We assume also a < b
-                // (with a & b of type SqpDateTime) means ts(b) > te(a)
+                // (with a & b of type SqpRange) means ts(b) > te(a)
-                auto it = impl->m_VariableToSqpDateTimeListMap.find(variable);
+                auto it = impl->m_VariableToSqpRangeListMap.find(variable);
-                if (it != impl->m_VariableToSqpDateTimeListMap.end()) {
+                if (it != impl->m_VariableToSqpRangeListMap.end()) {
                     impl->addInCacheDataByStart(dateTime, it->second, notInCache, 0, dateTime.m_TStart);
                 }
                 else {
                 return notInCache;
             }
-            QVector<SqpDateTime>
+            QVector<SqpRange>
             VariableCacheController::dateCacheList(std::shared_ptr<Variable> variable) const noexcept
             {
                 qCDebug(LOG_VariableCacheController()) << "VariableCacheController::dateCacheList"
                                                        << QThread::currentThread()->objectName();
                 try {
-                    return impl->m_VariableToSqpDateTimeListMap.at(variable);
+                    return impl->m_VariableToSqpRangeListMap.at(variable);
                 }
                 catch (const std::out_of_range &e) {
                     qCWarning(LOG_VariableCacheController()) << e.what();
-                    return QVector<SqpDateTime>{};
+                    return QVector<SqpRange>{};
                 }
             }
             void VariableCacheController::VariableCacheControllerPrivate::addDateTimeRecurse(
-                const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList, int cacheIndex)
+                const SqpRange &dateTime, QVector<SqpRange> &dateTimeList, int cacheIndex)
             {
                 const auto dateTimeListSize = dateTimeList.count();
                 if (cacheIndex >= dateTimeListSize) {
                     // rerun the algo from this index with the merged interval
                     auto mTStart = std::min(dateTime.m_TStart, currentDateTime.m_TStart);
                     auto mTEnd = std::max(dateTime.m_TEnd, currentDateTime.m_TEnd);
-                    auto mergeDateTime = SqpDateTime{mTStart, mTEnd};
+                    auto mergeDateTime = SqpRange{mTStart, mTEnd};
                     dateTimeList.remove(cacheIndex);
                     addDateTimeRecurse(mergeDateTime, dateTimeList, cacheIndex);
             void VariableCacheController::VariableCacheControllerPrivate::addInCacheDataByEnd(
-                const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList,
+                const SqpRange &dateTime, QVector<SqpRange> &dateTimeList, QVector<SqpRange> &notInCache,
-                QVector<SqpDateTime> &notInCache, int cacheIndex, double currentTStart)
+                int cacheIndex, double currentTStart)
             {
                 const auto dateTimeListSize = dateTimeList.count();
                 if (cacheIndex >= dateTimeListSize) {
                     if (currentTStart < dateTime.m_TEnd) {
                         // te localised after all other interval: The last interval is [currentTsart, te]
-                        notInCache.push_back(SqpDateTime{currentTStart, dateTime.m_TEnd});
+                        notInCache.push_back(SqpRange{currentTStart, dateTime.m_TEnd});
                     }
                     return;
                 }
                 auto currentDateTimeJ = dateTimeList[cacheIndex];
                 if (dateTime.m_TEnd <= currentDateTimeJ.m_TStart) {
                     // te localised between to interval: The last interval is [currentTsart, te]
-                    notInCache.push_back(SqpDateTime{currentTStart, dateTime.m_TEnd});
+                    notInCache.push_back(SqpRange{currentTStart, dateTime.m_TEnd});
                 }
                 else {
-                    notInCache.push_back(SqpDateTime{currentTStart, currentDateTimeJ.m_TStart});
+                    notInCache.push_back(SqpRange{currentTStart, currentDateTimeJ.m_TStart});
                     if (dateTime.m_TEnd > currentDateTimeJ.m_TEnd) {
                         // te not localised before the current interval: we need to look at the next interval
                         addInCacheDataByEnd(dateTime, dateTimeList, notInCache, ++cacheIndex,
             }
             void VariableCacheController::VariableCacheControllerPrivate::addInCacheDataByStart(
-                const SqpDateTime &dateTime, QVector<SqpDateTime> &dateTimeList,
+                const SqpRange &dateTime, QVector<SqpRange> &dateTimeList, QVector<SqpRange> &notInCache,
-                QVector<SqpDateTime> &notInCache, int cacheIndex, double currentTStart)
+                int cacheIndex, double currentTStart)
             {
                 const auto dateTimeListSize = dateTimeList.count();
                 if (cacheIndex >= dateTimeListSize) {
                     // ts localised after all other interval: The last interval is [ts, te]
-                    notInCache.push_back(SqpDateTime{currentTStart, dateTime.m_TEnd});
+                    notInCache.push_back(SqpRange{currentTStart, dateTime.m_TEnd});
                     return;
                 }
             void VariableCacheController::displayCache(std::shared_ptr<Variable> variable) const
             {
-                auto variableDateTimeList = impl->m_VariableToSqpDateTimeListMap.find(variable);
+                auto variableDateTimeList = impl->m_VariableToSqpRangeListMap.find(variable);
-                if (variableDateTimeList != impl->m_VariableToSqpDateTimeListMap.end()) {
+                if (variableDateTimeList != impl->m_VariableToSqpRangeListMap.end()) {
                     qCInfo(LOG_VariableCacheController()) << tr("VariableCacheController::displayCache")
                                                           << variableDateTimeList->second;
                 }

core/src/Variable/VariableController.cpp +2 -2

                 }
             }
-            void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
+            void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
             void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
-                                                          const SqpDateTime &dateTime)
+                                                          const SqpRange &dateTime)
             {
                 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
                                                   << QThread::currentThread()->objectName();

core/src/Variable/VariableModel.cpp +1 -1

             }
             std::shared_ptr<Variable> VariableModel::createVariable(const QString &name,
-                                                                    const SqpDateTime &dateTime,
+                                                                    const SqpRange &dateTime,
                                                                     const QVariantHash &metadata) noexcept
             {
                 auto insertIndex = rowCount();

core/tests/Variable/TestVariableCacheController.cpp +22 -22

                 auto ts0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto te0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
-                auto sqp0 = SqpDateTime{static_cast<double>(ts0.toMSecsSinceEpoch()),
+                auto sqp0 = SqpRange{static_cast<double>(ts0.toMSecsSinceEpoch()),
                                      static_cast<double>(te0.toMSecsSinceEpoch())};
                 auto ts1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
                 auto te1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 8, 0, 0}};
-                auto sqp1 = SqpDateTime{static_cast<double>(ts1.toMSecsSinceEpoch()),
+                auto sqp1 = SqpRange{static_cast<double>(ts1.toMSecsSinceEpoch()),
                                      static_cast<double>(te1.toMSecsSinceEpoch())};
                 auto ts2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 18, 0, 0}};
                 auto te2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 20, 0, 0}};
-                auto sqp2 = SqpDateTime{static_cast<double>(ts2.toMSecsSinceEpoch()),
+                auto sqp2 = SqpRange{static_cast<double>(ts2.toMSecsSinceEpoch()),
                                      static_cast<double>(te2.toMSecsSinceEpoch())};
                 auto var0 = std::make_shared<Variable>("", sqp0);
                 // first case [ts,te] < ts0
                 auto ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 auto te = QDateTime{QDate{2017, 01, 01}, QTime{2, 1, 0, 0}};
-                auto sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                auto sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                     static_cast<double>(te.toMSecsSinceEpoch())};
                 // second case ts < ts0 &&  ts0 < te <= te0
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 3th case ts < ts0 &&  te0 < te <= ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 4th case ts < ts0 &&  ts1 < te <= te1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 7, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 5th case ts < ts0 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 0, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 22, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 6th case ts2 < ts
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 45, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 47, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 7th case ts = te0 && te < ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 8th case ts0 < ts < te0 && te < ts1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 9th case ts0 < ts < te0 &&  ts1 < te < te1
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 30, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 7, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 10th case te1 < ts < te < ts2
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 9, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 10, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 11th case te0 < ts < ts1 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 47, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 // 12th case te0 < ts < ts1 &&  te3 < te
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 5, 0, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 10, 0, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 // 12th case ts0 < ts < te0
                 ts = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 10, 0}};
                 te = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 50, 0}};
-                sqp = SqpDateTime{static_cast<double>(ts.toMSecsSinceEpoch()),
+                sqp = SqpRange{static_cast<double>(ts.toMSecsSinceEpoch()),
                                static_cast<double>(te.toMSecsSinceEpoch())};
                 notInCach = variableCacheController.provideNotInCacheDateTimeList(var0, sqp);
                 auto ts0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 3, 0, 0}};
                 auto te0 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
-                auto sqp0 = SqpDateTime{static_cast<double>(ts0.toMSecsSinceEpoch()),
+                auto sqp0 = SqpRange{static_cast<double>(ts0.toMSecsSinceEpoch()),
                                      static_cast<double>(te0.toMSecsSinceEpoch())};
                 auto ts1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
                 auto te1 = QDateTime{QDate{2017, 01, 01}, QTime{2, 8, 0, 0}};
-                auto sqp1 = SqpDateTime{static_cast<double>(ts1.toMSecsSinceEpoch()),
+                auto sqp1 = SqpRange{static_cast<double>(ts1.toMSecsSinceEpoch()),
                                      static_cast<double>(te1.toMSecsSinceEpoch())};
                 auto ts2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 18, 0, 0}};
                 auto te2 = QDateTime{QDate{2017, 01, 01}, QTime{2, 20, 0, 0}};
-                auto sqp2 = SqpDateTime{static_cast<double>(ts2.toMSecsSinceEpoch()),
+                auto sqp2 = SqpRange{static_cast<double>(ts2.toMSecsSinceEpoch()),
                                      static_cast<double>(te2.toMSecsSinceEpoch())};
                 auto ts01 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto te01 = QDateTime{QDate{2017, 01, 01}, QTime{2, 6, 0, 0}};
-                auto sqp01 = SqpDateTime{static_cast<double>(ts01.toMSecsSinceEpoch()),
+                auto sqp01 = SqpRange{static_cast<double>(ts01.toMSecsSinceEpoch()),
                                       static_cast<double>(te01.toMSecsSinceEpoch())};
                 auto ts3 = QDateTime{QDate{2017, 01, 01}, QTime{2, 14, 0, 0}};
                 auto te3 = QDateTime{QDate{2017, 01, 01}, QTime{2, 16, 0, 0}};
-                auto sqp3 = SqpDateTime{static_cast<double>(ts3.toMSecsSinceEpoch()),
+                auto sqp3 = SqpRange{static_cast<double>(ts3.toMSecsSinceEpoch()),
                                      static_cast<double>(te3.toMSecsSinceEpoch())};
                 auto ts03 = QDateTime{QDate{2017, 01, 01}, QTime{2, 4, 0, 0}};
                 auto te03 = QDateTime{QDate{2017, 01, 01}, QTime{2, 22, 0, 0}};
-                auto sqp03 = SqpDateTime{static_cast<double>(ts03.toMSecsSinceEpoch()),
+                auto sqp03 = SqpRange{static_cast<double>(ts03.toMSecsSinceEpoch()),
                                       static_cast<double>(te03.toMSecsSinceEpoch())};

gui/include/TimeWidget/TimeWidget.h +2 -2

             #include <QWidget>
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             namespace Ui {
             class TimeWidget;
             signals:
                 /// Signal emitted when the time parameters has beed updated
-                void timeUpdated(SqpDateTime time);
+                void timeUpdated(SqpRange time);
             public slots:
                 /// slot called when time parameters update has ben requested

gui/include/Visualization/VisualizationGraphHelper.h +2 -2

             #ifndef SCIQLOP_VISUALIZATIONGRAPHHELPER_H
             #define SCIQLOP_VISUALIZATIONGRAPHHELPER_H
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QVector>
                                                               QCustomPlot &plot) noexcept;
                 static void updateData(QVector<QCPAbstractPlottable *> plotableVect, IDataSeries *dataSeries,
-                                       const SqpDateTime &dateTime);
+                                       const SqpRange &dateTime);
             };
             #endif // SCIQLOP_VISUALIZATIONGRAPHHELPER_H

gui/include/Visualization/VisualizationGraphWidget.h +6 -6

             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationGraphWidget)
             class QCPRange;
-            class SqpDateTime;
+            class SqpRange;
             class Variable;
             /**
                 /// Removes a variable from the graph
                 void removeVariable(std::shared_ptr<Variable> variable) noexcept;
-                void setRange(std::shared_ptr<Variable> variable, const SqpDateTime &range);
+                void setRange(std::shared_ptr<Variable> variable, const SqpRange &range);
-                SqpDateTime graphRange() const noexcept;
+                SqpRange graphRange() const noexcept;
-                void setGraphRange(const SqpDateTime &range);
+                void setGraphRange(const SqpRange &range);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
             signals:
-                void requestDataLoading(std::shared_ptr<Variable> variable, const SqpDateTime &dateTime);
+                void requestDataLoading(std::shared_ptr<Variable> variable, const SqpRange &dateTime);
-                void synchronize(const SqpDateTime &dateTime, const SqpDateTime &oldDateTime,
+                void synchronize(const SqpRange &dateTime, const SqpRange &oldDateTime,
                                  VisualizationGraphWidgetZoomType zoomType);

gui/include/Visualization/VisualizationWidget.h +2 -2

             #define SCIQLOP_VISUALIZATIONWIDGET_H
             #include "Visualization/IVisualizationWidget.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>
             #include <QWidget>
                 /// Slot called when a variable is about to be deleted from SciQlop
                 void onVariableAboutToBeDeleted(std::shared_ptr<Variable> variable) noexcept;
-                void onRangeChanged(std::shared_ptr<Variable> variable, const SqpDateTime &range) noexcept;
+                void onRangeChanged(std::shared_ptr<Variable> variable, const SqpRange &range) noexcept;
             private:
                 Ui::VisualizationWidget *ui;

gui/include/Visualization/operations/RescaleAxeOperation.h +2 -2

             #define SCIQLOP_RESCALEAXEOPERATION_H
             #include "Visualization/IVisualizationWidgetVisitor.h"
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <Common/spimpl.h>
                  * Ctor
                  * @param variable the variable to remove from widgets
                  */
-                explicit RescaleAxeOperation(std::shared_ptr<Variable> variable, const SqpDateTime &range);
+                explicit RescaleAxeOperation(std::shared_ptr<Variable> variable, const SqpRange &range);
                 void visitEnter(VisualizationWidget *widget) override final;
                 void visitLeave(VisualizationWidget *widget) override final;

gui/src/SqpApplication.cpp +2 -2

                             SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
                     connect(m_VariableController.get(),
-                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)),
+                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)),
                             m_VisualizationController.get(),
-                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpDateTime &)));
+                            SIGNAL(rangeChanged(std::shared_ptr<Variable>, const SqpRange &)));
                     m_DataSourceController->moveToThread(&m_DataSourceControllerThread);

gui/src/TimeWidget/TimeWidget.cpp +2 -2

                 ui->startDateTimeEdit->setDateTime(startDateTime);
                 ui->endDateTimeEdit->setDateTime(endDateTime);
-                auto dateTime = SqpDateTime{DateUtils::secondsSinceEpoch(startDateTime),
+                auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(startDateTime),
                                          DateUtils::secondsSinceEpoch(endDateTime)};
                 sqpApp->timeController().onTimeToUpdate(dateTime);
             void TimeWidget::onTimeUpdateRequested()
             {
-                auto dateTime = SqpDateTime{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
+                auto dateTime = SqpRange{DateUtils::secondsSinceEpoch(ui->startDateTimeEdit->dateTime()),
                                          DateUtils::secondsSinceEpoch(ui->endDateTimeEdit->dateTime())};
                 emit timeUpdated(std::move(dateTime));

gui/src/Visualization/VisualizationGraphHelper.cpp +3 -3

             }
             void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSeries,
-                                  const SqpDateTime &dateTime)
+                                  const SqpRange &dateTime)
             {
                 qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
                                                         << QThread::currentThread()->objectName();
             }
             QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QCustomPlot &plot,
-                                                              const SqpDateTime &dateTime)
+                                                              const SqpRange &dateTime)
             {
                 auto component = plot.addGraph();
             }
             void VisualizationGraphHelper::updateData(QVector<QCPAbstractPlottable *> plotableVect,
-                                                      IDataSeries *dataSeries, const SqpDateTime &dateTime)
+                                                      IDataSeries *dataSeries, const SqpRange &dateTime)
             {
                 if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {
                     if (plotableVect.size() == 1) {

gui/src/Visualization/VisualizationGraphWidget.cpp +8 -9

                 // when adding a variable, we need to set its time range to the current graph range
                 auto grapheRange = ui->widget->xAxis->range();
-                auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
+                auto dateTime = SqpRange{grapheRange.lower, grapheRange.upper};
                 variable->setDateTime(dateTime);
                 auto variableDateTimeWithTolerance = dateTime;
                 ui->widget->replot();
             }
-            void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable,
+            void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable, const SqpRange &range)
-                                                    const SqpDateTime &range)
             {
                 // Note: in case of different axes that depends on variable, we could start with a code like
                 // that:
                 ui->widget->replot();
             }
-            SqpDateTime VisualizationGraphWidget::graphRange() const noexcept
+            SqpRange VisualizationGraphWidget::graphRange() const noexcept
             {
                 auto grapheRange = ui->widget->xAxis->range();
-                return SqpDateTime{grapheRange.lower, grapheRange.upper};
+                return SqpRange{grapheRange.lower, grapheRange.upper};
             }
-            void VisualizationGraphWidget::setGraphRange(const SqpDateTime &range)
+            void VisualizationGraphWidget::setGraphRange(const SqpRange &range)
             {
                 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::setGraphRange START");
                 ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd);
                 qCInfo(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged")
                                                        << QThread::currentThread()->objectName();
-                auto dateTimeRange = SqpDateTime{t1.lower, t1.upper};
+                auto dateTimeRange = SqpRange{t1.lower, t1.upper};
                 auto zoomType = impl->getZoomType(t1, t2);
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                 }
                 if (impl->m_DoSynchronize && !impl->m_IsCalibration) {
-                    auto oldDateTime = SqpDateTime{t2.lower, t2.upper};
+                    auto oldDateTime = SqpRange{t2.lower, t2.upper};
                     qCDebug(LOG_VisualizationGraphWidget())
                         << tr("TORM: VisualizationGraphWidget::Synchronize notify !!")
                         << QThread::currentThread()->objectName();
                 //    - use a map (unique keys) and store as values directly the list of components
                 auto grapheRange = ui->widget->xAxis->range();
-                auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
+                auto dateTime = SqpRange{grapheRange.lower, grapheRange.upper};
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {

gui/src/Visualization/VisualizationWidget.cpp +1 -1

             }
             void VisualizationWidget::onRangeChanged(std::shared_ptr<Variable> variable,
-                                                     const SqpDateTime &range) noexcept
+                                                     const SqpRange &range) noexcept
             {
                 // Calls the operation of rescaling all graph that contrains variable in the visualization
                 auto rescaleVariableOperation = RescaleAxeOperation{variable, range};

gui/src/Visualization/VisualizationZoneWidget.cpp +3 -3

             #include "Visualization/VisualizationZoneWidget.h"
-            #include "Data/SqpDateTime.h"
+            #include "Data/SqpRange.h"
             #include "Visualization/IVisualizationWidgetVisitor.h"
             #include "Visualization/VisualizationGraphWidget.h"
                 graphWidget->addVariable(variable);
                 // Lambda to synchronize zone widget
-                auto synchronizeZoneWidget = [this, graphWidget](const SqpDateTime &dateTime,
+                auto synchronizeZoneWidget = [this, graphWidget](const SqpRange &dateTime,
-                                                                 const SqpDateTime &oldDateTime,
+                                                                 const SqpRange &oldDateTime,
                                                                  VisualizationGraphWidgetZoomType zoomType) {
                     auto frameLayout = ui->visualizationZoneFrame->layout();
                     for (auto i = 0; i < frameLayout->count(); ++i) {

gui/src/Visualization/operations/RescaleAxeOperation.cpp +3 -5

             Q_LOGGING_CATEGORY(LOG_RescaleAxeOperation, "RescaleAxeOperation")
             struct RescaleAxeOperation::RescaleAxeOperationPrivate {
-                explicit RescaleAxeOperationPrivate(std::shared_ptr<Variable> variable,
+                explicit RescaleAxeOperationPrivate(std::shared_ptr<Variable> variable, const SqpRange &range)
-                                                    const SqpDateTime &range)
                         : m_Variable{variable}, m_Range{range}
                 {
                 }
                 std::shared_ptr<Variable> m_Variable;
-                SqpDateTime m_Range;
+                SqpRange m_Range;
             };
-            RescaleAxeOperation::RescaleAxeOperation(std::shared_ptr<Variable> variable,
+            RescaleAxeOperation::RescaleAxeOperation(std::shared_ptr<Variable> variable, const SqpRange &range)
-                                                     const SqpDateTime &range)
                     : impl{spimpl::make_unique_impl<RescaleAxeOperationPrivate>(variable, range)}
             {
             }

plugins/amda/include/AmdaProvider.h +1 -1

                 void requestDataAborting(QUuid identifier) override;
             private:
-                void retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data);
+                void retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data);
             };
             #endif // SCIQLOP_AMDAPROVIDER_H

plugins/amda/src/AmdaProvider.cpp +3 -3

             const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss");
             /// Formats a time to a date that can be passed in URL
-            QString dateFormat(double sqpDateTime) noexcept
+            QString dateFormat(double sqpRange) noexcept
             {
-                auto dateTime = DateUtils::dateTime(sqpDateTime);
+                auto dateTime = DateUtils::dateTime(sqpRange);
                 return dateTime.toString(AMDA_TIME_FORMAT);
             }
                 }
             }
-            void AmdaProvider::retrieveData(QUuid token, const SqpDateTime &dateTime, const QVariantHash &data)
+            void AmdaProvider::retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data)
             {
                 // Retrieves product ID from data: if the value is invalid, no request is made
                 auto productId = data.value(AMDA_XML_ID_KEY).toString();

plugins/mockplugin/include/CosinusProvider.h +1 -1

             private:
-                std::shared_ptr<IDataSeries> retrieveData(QUuid token, const SqpDateTime &dateTime);
+                std::shared_ptr<IDataSeries> retrieveData(QUuid token, const SqpRange &dateTime);
                 QHash<QUuid, bool> m_VariableToEnableProvider;
             };

plugins/mockplugin/src/CosinusProvider.cpp +1 -1

             Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider")
-            std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid token, const SqpDateTime &dateTime)
+            std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid token, const SqpRange &dateTime)
             {
                 // TODO: Add Mutex
                 auto dataIndex = 0;

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