GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r501:7c5044f34aa3

Update worker for SqpRange compatibility

perrinel -

r501:7c5044f34aa3

parent child

Context file:

r501:7c5044f34aa3

core/include/Variable/VariableAcquisitionWorker.h +1 -1

             #include <QObject>
             #include <QUuid>
-            #include <Data/SqpDateTime.h>
+            #include <Data/SqpRange.h>
             #include <QLoggingCategory>

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

             struct VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate {
-                std::unordered_map<std::shared_ptr<Variable>, QVector<SqpDateTime> >
+                std::unordered_map<std::shared_ptr<Variable>, QVector<SqpRange> >
                     m_VariableToSqpDateTimeListMap;
             };

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

                 {
                 }
-                QVector<SqpDateTime> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
+                QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
-                                                                   const SqpDateTime &dateTime);
+                                                                const SqpRange &dateTime);
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
             }
-            QVector<SqpDateTime> VariableController::VariableControllerPrivate::provideNotInCacheDateTimeList(
+            QVector<SqpRange> VariableController::VariableControllerPrivate::provideNotInCacheDateTimeList(
-                std::shared_ptr<Variable> variable, const SqpDateTime &dateTime)
+                std::shared_ptr<Variable> variable, const SqpRange &dateTime)
             {
-                auto notInCache = QVector<SqpDateTime>{};
+                auto notInCache = QVector<SqpRange>{};
                 if (!variable->contains(dateTime)) {
                     auto vDateTime = variable->dateTime();
                         notInCache << dateTime;
                     }
                     else if (dateTime.m_TStart < vDateTime.m_TStart && dateTime.m_TEnd <= vDateTime.m_TEnd) {
-                        notInCache << SqpDateTime{dateTime.m_TStart, vDateTime.m_TStart};
+                        notInCache << SqpRange{dateTime.m_TStart, vDateTime.m_TStart};
                     }
                     else if (dateTime.m_TStart < vDateTime.m_TStart && dateTime.m_TEnd > vDateTime.m_TEnd) {
-                        notInCache << SqpDateTime{dateTime.m_TStart, vDateTime.m_TStart}
+                        notInCache << SqpRange{dateTime.m_TStart, vDateTime.m_TStart}
-                                   << SqpDateTime{vDateTime.m_TEnd, dateTime.m_TStart};
+                                   << SqpRange{vDateTime.m_TEnd, dateTime.m_TStart};
                     }
                     else if (dateTime.m_TStart < vDateTime.m_TEnd) {
-                        notInCache << SqpDateTime{vDateTime.m_TEnd, dateTime.m_TStart};
+                        notInCache << SqpRange{vDateTime.m_TEnd, dateTime.m_TStart};
                     }
                     else {
                         qCCritical(LOG_VariableController()) << tr("Detection of unknown case.")

General Comments 1

perrinel

|

Auto status change to "Under Review"

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