Auto status change to "Under Review"
| @@ -0,0 +1,28 | |||||
|
|
1 | #ifndef SCIQLOP_VARIABLEREQUEST_H | |||
|
|
2 | #define SCIQLOP_VARIABLEREQUEST_H | |||
|
|
3 | ||||
|
|
4 | #include <QObject> | |||
|
|
5 | ||||
|
|
6 | #include <QUuid> | |||
|
|
7 | ||||
|
|
8 | #include <Common/MetaTypes.h> | |||
|
|
9 | #include <Data/IDataSeries.h> | |||
|
|
10 | #include <Data/SqpRange.h> | |||
|
|
11 | ||||
|
|
12 | #include <memory> | |||
|
|
13 | ||||
|
|
14 | /** | |||
|
|
15 | * @brief The VariableRequest struct holds the information of an acquisition request | |||
|
|
16 | */ | |||
|
|
17 | struct VariableRequest { | |||
|
|
18 | VariableRequest() { m_CanUpdate = false; } | |||
|
|
19 | ||||
|
|
20 | SqpRange m_RangeRequested; | |||
|
|
21 | SqpRange m_CacheRangeRequested; | |||
|
|
22 | std::shared_ptr<IDataSeries> m_DataSeries; | |||
|
|
23 | bool m_CanUpdate; | |||
|
|
24 | }; | |||
|
|
25 | ||||
|
|
26 | SCIQLOP_REGISTER_META_TYPE(VARIABLEREQUEST_REGISTRY, VariableRequest) | |||
|
|
27 | ||||
|
|
28 | #endif // SCIQLOP_VARIABLEREQUEST_H | |||
| @@ -14,16 +14,16 | |||||
| 14 | #include <memory> |
|
14 | #include <memory> | |
| 15 |
|
15 | |||
| 16 | /** |
|
16 | /** | |
| 17 |
* @brief The AcquisitionRequest struct holds the information of an |
|
17 | * @brief The AcquisitionRequest struct holds the information of an variable request | |
| 18 | */ |
|
18 | */ | |
| 19 | struct AcquisitionRequest { |
|
19 | struct AcquisitionRequest { | |
| 20 | AcquisitionRequest() |
|
20 | AcquisitionRequest() | |
| 21 | { |
|
21 | { | |
| 22 |
|
||||
| 23 | m_AcqIdentifier = QUuid::createUuid(); |
|
22 | m_AcqIdentifier = QUuid::createUuid(); | |
| 24 | m_Size = 0; |
|
23 | m_Size = 0; | |
| 25 | } |
|
24 | } | |
| 26 |
|
25 | |||
|
|
26 | QUuid m_VarRequestId; | |||
| 27 | QUuid m_AcqIdentifier; |
|
27 | QUuid m_AcqIdentifier; | |
| 28 | QUuid m_vIdentifier; |
|
28 | QUuid m_vIdentifier; | |
| 29 | DataProviderParameters m_DataProviderParameters; |
|
29 | DataProviderParameters m_DataProviderParameters; | |
| @@ -28,9 +28,9 public: | |||||
| 28 | explicit VariableAcquisitionWorker(QObject *parent = 0); |
|
28 | explicit VariableAcquisitionWorker(QObject *parent = 0); | |
| 29 | virtual ~VariableAcquisitionWorker(); |
|
29 | virtual ~VariableAcquisitionWorker(); | |
| 30 |
|
30 | |||
| 31 |
|
|
31 | QUuid pushVariableRequest(QUuid varRequestId, QUuid vIdentifier, SqpRange rangeRequested, | |
| 32 | SqpRange cacheRangeRequested, DataProviderParameters parameters, |
|
32 | SqpRange cacheRangeRequested, DataProviderParameters parameters, | |
| 33 | std::shared_ptr<IDataProvider> provider); |
|
33 | std::shared_ptr<IDataProvider> provider); | |
| 34 |
|
34 | |||
| 35 | void abortProgressRequested(QUuid vIdentifier); |
|
35 | void abortProgressRequested(QUuid vIdentifier); | |
| 36 |
|
36 | |||
| @@ -29,8 +29,8 class SCIQLOP_CORE_EXPORT VariableCacheStrategy : public QObject { | |||||
| 29 | public: |
|
29 | public: | |
| 30 | explicit VariableCacheStrategy(QObject *parent = 0); |
|
30 | explicit VariableCacheStrategy(QObject *parent = 0); | |
| 31 |
|
31 | |||
| 32 |
std::pair<SqpRange, SqpRange> compute |
|
32 | std::pair<SqpRange, SqpRange> computeStrategyRanges(const SqpRange &vRange, | |
| 33 | const SqpRange &rangeRequested); |
|
33 | const SqpRange &rangeRequested); | |
| 34 |
|
34 | |||
| 35 | private: |
|
35 | private: | |
| 36 | class VariableCacheStrategyPrivate; |
|
36 | class VariableCacheStrategyPrivate; | |
| @@ -46,16 +46,19 VariableAcquisitionWorker::~VariableAcquisitionWorker() | |||||
| 46 | } |
|
46 | } | |
| 47 |
|
47 | |||
| 48 |
|
48 | |||
| 49 |
|
|
49 | QUuid VariableAcquisitionWorker::pushVariableRequest(QUuid varRequestId, QUuid vIdentifier, | |
| 50 |
SqpRange |
|
50 | SqpRange rangeRequested, | |
| 51 |
|
|
51 | SqpRange cacheRangeRequested, | |
| 52 |
|
|
52 | DataProviderParameters parameters, | |
|
|
53 | std::shared_ptr<IDataProvider> provider) | |||
| 53 | { |
|
54 | { | |
| 54 |
qC |
|
55 | qCDebug(LOG_VariableAcquisitionWorker()) | |
| 55 | << tr("TORM VariableAcquisitionWorker::pushVariableRequest ") << cacheRangeRequested; |
|
56 | << tr("TORM VariableAcquisitionWorker::pushVariableRequest ") << cacheRangeRequested; | |
|
|
57 | auto varRequestIdCanceled = QUuid(); | |||
| 56 |
|
58 | |||
| 57 | // Request creation |
|
59 | // Request creation | |
| 58 | auto acqRequest = AcquisitionRequest{}; |
|
60 | auto acqRequest = AcquisitionRequest{}; | |
|
|
61 | acqRequest.m_VarRequestId = varRequestId; | |||
| 59 | acqRequest.m_vIdentifier = vIdentifier; |
|
62 | acqRequest.m_vIdentifier = vIdentifier; | |
| 60 | acqRequest.m_DataProviderParameters = parameters; |
|
63 | acqRequest.m_DataProviderParameters = parameters; | |
| 61 | acqRequest.m_RangeRequested = rangeRequested; |
|
64 | acqRequest.m_RangeRequested = rangeRequested; | |
| @@ -63,6 +66,7 void VariableAcquisitionWorker::pushVariableRequest(QUuid vIdentifier, SqpRange | |||||
| 63 | acqRequest.m_Size = parameters.m_Times.size(); |
|
66 | acqRequest.m_Size = parameters.m_Times.size(); | |
| 64 | acqRequest.m_Provider = provider; |
|
67 | acqRequest.m_Provider = provider; | |
| 65 |
|
68 | |||
|
|
69 | ||||
| 66 | // Register request |
|
70 | // Register request | |
| 67 | impl->lockWrite(); |
|
71 | impl->lockWrite(); | |
| 68 | impl->m_AcqIdentifierToAcqRequestMap.insert( |
|
72 | impl->m_AcqIdentifierToAcqRequestMap.insert( | |
| @@ -71,6 +75,13 void VariableAcquisitionWorker::pushVariableRequest(QUuid vIdentifier, SqpRange | |||||
| 71 | auto it = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier); |
|
75 | auto it = impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.find(vIdentifier); | |
| 72 | if (it != impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) { |
|
76 | if (it != impl->m_VIdentifierToCurrrentAcqIdNextIdPairMap.cend()) { | |
| 73 | // A current request already exists, we can replace the next one |
|
77 | // A current request already exists, we can replace the next one | |
|
|
78 | auto nextAcqId = it->second.second; | |||
|
|
79 | auto acqIdentifierToAcqRequestMapIt = impl->m_AcqIdentifierToAcqRequestMap.find(nextAcqId); | |||
|
|
80 | if (acqIdentifierToAcqRequestMapIt != impl->m_AcqIdentifierToAcqRequestMap.cend()) { | |||
|
|
81 | auto request = acqIdentifierToAcqRequestMapIt->second; | |||
|
|
82 | varRequestIdCanceled = request.m_VarRequestId; | |||
|
|
83 | } | |||
|
|
84 | ||||
| 74 | it->second.second = acqRequest.m_AcqIdentifier; |
|
85 | it->second.second = acqRequest.m_AcqIdentifier; | |
| 75 | impl->unlock(); |
|
86 | impl->unlock(); | |
| 76 | } |
|
87 | } | |
| @@ -83,6 +94,8 void VariableAcquisitionWorker::pushVariableRequest(QUuid vIdentifier, SqpRange | |||||
| 83 | QMetaObject::invokeMethod(this, "onExecuteRequest", Qt::QueuedConnection, |
|
94 | QMetaObject::invokeMethod(this, "onExecuteRequest", Qt::QueuedConnection, | |
| 84 | Q_ARG(QUuid, acqRequest.m_AcqIdentifier)); |
|
95 | Q_ARG(QUuid, acqRequest.m_AcqIdentifier)); | |
| 85 | } |
|
96 | } | |
|
|
97 | ||||
|
|
98 | return varRequestIdCanceled; | |||
| 86 | } |
|
99 | } | |
| 87 |
|
100 | |||
| 88 | void VariableAcquisitionWorker::abortProgressRequested(QUuid vIdentifier) |
|
101 | void VariableAcquisitionWorker::abortProgressRequested(QUuid vIdentifier) | |
| @@ -173,7 +186,7 void VariableAcquisitionWorker::onVariableDataAcquired(QUuid acqIdentifier, | |||||
| 173 |
|
186 | |||
| 174 | void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier) |
|
187 | void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier) | |
| 175 | { |
|
188 | { | |
| 176 |
qC |
|
189 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread(); | |
| 177 | impl->lockRead(); |
|
190 | impl->lockRead(); | |
| 178 | auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier); |
|
191 | auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier); | |
| 179 | if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) { |
|
192 | if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) { | |
| @@ -20,7 +20,7 VariableCacheStrategy::VariableCacheStrategy(QObject *parent) | |||||
| 20 | } |
|
20 | } | |
| 21 |
|
21 | |||
| 22 | std::pair<SqpRange, SqpRange> |
|
22 | std::pair<SqpRange, SqpRange> | |
| 23 |
VariableCacheStrategy::compute |
|
23 | VariableCacheStrategy::computeStrategyRanges(const SqpRange &vRange, const SqpRange &rangeRequested) | |
| 24 | { |
|
24 | { | |
| 25 |
|
25 | |||
| 26 | auto varRanges = std::pair<SqpRange, SqpRange>{}; |
|
26 | auto varRanges = std::pair<SqpRange, SqpRange>{}; | |
| @@ -1,6 +1,5 | |||||
| 1 | #include <Variable/Variable.h> |
|
1 | #include <Variable/Variable.h> | |
| 2 | #include <Variable/VariableAcquisitionWorker.h> |
|
2 | #include <Variable/VariableAcquisitionWorker.h> | |
| 3 | #include <Variable/VariableCacheController.h> |
|
|||
| 4 | #include <Variable/VariableCacheStrategy.h> |
|
3 | #include <Variable/VariableCacheStrategy.h> | |
| 5 | #include <Variable/VariableController.h> |
|
4 | #include <Variable/VariableController.h> | |
| 6 | #include <Variable/VariableModel.h> |
|
5 | #include <Variable/VariableModel.h> | |
| @@ -9,6 +8,7 | |||||
| 9 | #include <Data/DataProviderParameters.h> |
|
8 | #include <Data/DataProviderParameters.h> | |
| 10 | #include <Data/IDataProvider.h> |
|
9 | #include <Data/IDataProvider.h> | |
| 11 | #include <Data/IDataSeries.h> |
|
10 | #include <Data/IDataSeries.h> | |
|
|
11 | #include <Data/VariableRequest.h> | |||
| 12 | #include <Time/TimeController.h> |
|
12 | #include <Time/TimeController.h> | |
| 13 |
|
13 | |||
| 14 | #include <QMutex> |
|
14 | #include <QMutex> | |
| @@ -16,6 +16,7 | |||||
| 16 | #include <QUuid> |
|
16 | #include <QUuid> | |
| 17 | #include <QtCore/QItemSelectionModel> |
|
17 | #include <QtCore/QItemSelectionModel> | |
| 18 |
|
18 | |||
|
|
19 | #include <deque> | |||
| 19 | #include <set> |
|
20 | #include <set> | |
| 20 | #include <unordered_map> |
|
21 | #include <unordered_map> | |
| 21 |
|
22 | |||
| @@ -78,7 +79,6 struct VariableController::VariableControllerPrivate { | |||||
| 78 | : m_WorkingMutex{}, |
|
79 | : m_WorkingMutex{}, | |
| 79 | m_VariableModel{new VariableModel{parent}}, |
|
80 | m_VariableModel{new VariableModel{parent}}, | |
| 80 | m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}}, |
|
81 | m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}}, | |
| 81 | m_VariableCacheController{std::make_unique<VariableCacheController>()}, |
|
|||
| 82 | m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()}, |
|
82 | m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()}, | |
| 83 | m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}, |
|
83 | m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}, | |
| 84 | q{parent} |
|
84 | q{parent} | |
| @@ -97,7 +97,8 struct VariableController::VariableControllerPrivate { | |||||
| 97 | } |
|
97 | } | |
| 98 |
|
98 | |||
| 99 |
|
99 | |||
| 100 |
void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested |
|
100 | void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested, | |
|
|
101 | QUuid varRequestId); | |||
| 101 |
|
102 | |||
| 102 | QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable, |
|
103 | QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable, | |
| 103 | const SqpRange &dateTime); |
|
104 | const SqpRange &dateTime); | |
| @@ -108,6 +109,11 struct VariableController::VariableControllerPrivate { | |||||
| 108 |
|
109 | |||
| 109 | void registerProvider(std::shared_ptr<IDataProvider> provider); |
|
110 | void registerProvider(std::shared_ptr<IDataProvider> provider); | |
| 110 |
|
111 | |||
|
|
112 | void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest); | |||
|
|
113 | QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries); | |||
|
|
114 | void updateVariableRequest(QUuid varRequestId); | |||
|
|
115 | void cancelVariableRequest(QUuid varRequestId); | |||
|
|
116 | ||||
| 111 | QMutex m_WorkingMutex; |
|
117 | QMutex m_WorkingMutex; | |
| 112 | /// Variable model. The VariableController has the ownership |
|
118 | /// Variable model. The VariableController has the ownership | |
| 113 | VariableModel *m_VariableModel; |
|
119 | VariableModel *m_VariableModel; | |
| @@ -115,7 +121,6 struct VariableController::VariableControllerPrivate { | |||||
| 115 |
|
121 | |||
| 116 |
|
122 | |||
| 117 | TimeController *m_TimeController{nullptr}; |
|
123 | TimeController *m_TimeController{nullptr}; | |
| 118 | std::unique_ptr<VariableCacheController> m_VariableCacheController; |
|
|||
| 119 | std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy; |
|
124 | std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy; | |
| 120 | std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker; |
|
125 | std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker; | |
| 121 | QThread m_VariableAcquisitionWorkerThread; |
|
126 | QThread m_VariableAcquisitionWorkerThread; | |
| @@ -128,6 +133,10 struct VariableController::VariableControllerPrivate { | |||||
| 128 | std::map<QUuid, QUuid> m_VariableIdGroupIdMap; |
|
133 | std::map<QUuid, QUuid> m_VariableIdGroupIdMap; | |
| 129 | std::set<std::shared_ptr<IDataProvider> > m_ProviderSet; |
|
134 | std::set<std::shared_ptr<IDataProvider> > m_ProviderSet; | |
| 130 |
|
135 | |||
|
|
136 | std::map<QUuid, std::map<QUuid, VariableRequest> > m_VarRequestIdToVarIdVarRequestMap; | |||
|
|
137 | ||||
|
|
138 | std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap; | |||
|
|
139 | ||||
| 131 |
|
140 | |||
| 132 | VariableController *q; |
|
141 | VariableController *q; | |
| 133 | }; |
|
142 | }; | |
| @@ -199,8 +208,6 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noex | |||||
| 199 | << tr("Number of providers deleted for variable %1: %2") |
|
208 | << tr("Number of providers deleted for variable %1: %2") | |
| 200 | .arg(variable->name(), QString::number(nbProvidersDeleted)); |
|
209 | .arg(variable->name(), QString::number(nbProvidersDeleted)); | |
| 201 |
|
210 | |||
| 202 | // Clears cache |
|
|||
| 203 | impl->m_VariableCacheController->clear(variable); |
|
|||
| 204 |
|
211 | |||
| 205 | // Deletes from model |
|
212 | // Deletes from model | |
| 206 | impl->m_VariableModel->deleteVariable(variable); |
|
213 | impl->m_VariableModel->deleteVariable(variable); | |
| @@ -241,7 +248,10 VariableController::createVariable(const QString &name, const QVariantHash &meta | |||||
| 241 | impl->m_VariableToIdentifierMap[newVariable] = identifier; |
|
248 | impl->m_VariableToIdentifierMap[newVariable] = identifier; | |
| 242 |
|
249 | |||
| 243 |
|
250 | |||
| 244 | impl->processRequest(newVariable, range); |
|
251 | auto varRequestId = QUuid::createUuid(); | |
|
|
252 | qCInfo(LOG_VariableController()) << "processRequest for" << name << varRequestId; | |||
|
|
253 | impl->processRequest(newVariable, range, varRequestId); | |||
|
|
254 | impl->updateVariableRequest(varRequestId); | |||
| 245 |
|
255 | |||
| 246 | return newVariable; |
|
256 | return newVariable; | |
| 247 | } |
|
257 | } | |
| @@ -249,41 +259,32 VariableController::createVariable(const QString &name, const QVariantHash &meta | |||||
| 249 |
|
259 | |||
| 250 | void VariableController::onDateTimeOnSelection(const SqpRange &dateTime) |
|
260 | void VariableController::onDateTimeOnSelection(const SqpRange &dateTime) | |
| 251 | { |
|
261 | { | |
| 252 | // TODO check synchronisation |
|
262 | // TODO check synchronisation and Rescale | |
| 253 | qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection" |
|
263 | qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection" | |
| 254 | << QThread::currentThread()->objectName(); |
|
264 | << QThread::currentThread()->objectName(); | |
| 255 | auto selectedRows = impl->m_VariableSelectionModel->selectedRows(); |
|
265 | auto selectedRows = impl->m_VariableSelectionModel->selectedRows(); | |
|
|
266 | auto varRequestId = QUuid::createUuid(); | |||
| 256 |
|
267 | |||
| 257 | for (const auto &selectedRow : qAsConst(selectedRows)) { |
|
268 | for (const auto &selectedRow : qAsConst(selectedRows)) { | |
| 258 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { |
|
269 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { | |
| 259 | selectedVariable->setRange(dateTime); |
|
270 | selectedVariable->setRange(dateTime); | |
| 260 | impl->processRequest(selectedVariable, dateTime); |
|
271 | impl->processRequest(selectedVariable, dateTime, varRequestId); | |
| 261 |
|
272 | |||
| 262 | // notify that rescale operation has to be done |
|
273 | // notify that rescale operation has to be done | |
| 263 | emit rangeChanged(selectedVariable, dateTime); |
|
274 | emit rangeChanged(selectedVariable, dateTime); | |
| 264 | } |
|
275 | } | |
| 265 | } |
|
276 | } | |
|
|
277 | impl->updateVariableRequest(varRequestId); | |||
| 266 | } |
|
278 | } | |
| 267 |
|
279 | |||
| 268 | void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested, |
|
280 | void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested, | |
| 269 | const SqpRange &cacheRangeRequested, |
|
281 | const SqpRange &cacheRangeRequested, | |
| 270 | QVector<AcquisitionDataPacket> dataAcquired) |
|
282 | QVector<AcquisitionDataPacket> dataAcquired) | |
| 271 | { |
|
283 | { | |
| 272 | if (auto var = impl->findVariable(vIdentifier)) { |
|
284 | auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired); | |
| 273 | var->setRange(rangeRequested); |
|
285 | auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries); | |
| 274 | var->setCacheRange(cacheRangeRequested); |
|
286 | if (!varRequestId.isNull()) { | |
| 275 | qCDebug(LOG_VariableController()) << tr("1: onDataProvided") << rangeRequested; |
|
287 | impl->updateVariableRequest(varRequestId); | |
| 276 | qCDebug(LOG_VariableController()) << tr("2: onDataProvided") << cacheRangeRequested; |
|
|||
| 277 |
|
||||
| 278 | auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired); |
|
|||
| 279 | qCDebug(LOG_VariableController()) << tr("3: onDataProvided") |
|
|||
| 280 | << retrievedDataSeries->range(); |
|
|||
| 281 | var->mergeDataSeries(retrievedDataSeries); |
|
|||
| 282 | qCDebug(LOG_VariableController()) << tr("4: onDataProvided"); |
|
|||
| 283 | emit var->updated(); |
|
|||
| 284 | } |
|
|||
| 285 | else { |
|
|||
| 286 | qCCritical(LOG_VariableController()) << tr("Impossible to provide data to a null variable"); |
|
|||
| 287 | } |
|
288 | } | |
| 288 | } |
|
289 | } | |
| 289 |
|
290 | |||
| @@ -363,22 +364,25 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> | |||||
| 363 | { |
|
364 | { | |
| 364 | // NOTE: oldRange isn't really necessary since oldRange == variable->range(). |
|
365 | // NOTE: oldRange isn't really necessary since oldRange == variable->range(). | |
| 365 |
|
366 | |||
| 366 | qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading" |
|
|||
| 367 | << QThread::currentThread()->objectName(); |
|
|||
| 368 | // we want to load data of the variable for the dateTime. |
|
367 | // we want to load data of the variable for the dateTime. | |
| 369 | // First we check if the cache contains some of them. |
|
368 | // First we check if the cache contains some of them. | |
| 370 | // For the other, we ask the provider to give them. |
|
369 | // For the other, we ask the provider to give them. | |
| 371 |
|
370 | |||
|
|
371 | auto varRequestId = QUuid::createUuid(); | |||
|
|
372 | qCInfo(LOG_VariableController()) << "VariableController::onRequestDataLoading" | |||
|
|
373 | << QThread::currentThread()->objectName() << varRequestId; | |||
|
|
374 | ||||
| 372 | for (const auto &var : variables) { |
|
375 | for (const auto &var : variables) { | |
| 373 | qCDebug(LOG_VariableController()) << "processRequest for" << var->name(); |
|
376 | qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId; | |
| 374 | impl->processRequest(var, range); |
|
377 | impl->processRequest(var, range, varRequestId); | |
| 375 | } |
|
378 | } | |
| 376 |
|
379 | |||
| 377 | if (synchronise) { |
|
380 | if (synchronise) { | |
| 378 | // Get the group ids |
|
381 | // Get the group ids | |
| 379 | qCDebug(LOG_VariableController()) |
|
382 | qCDebug(LOG_VariableController()) | |
| 380 | << "TORM VariableController::onRequestDataLoading for synchro var ENABLE"; |
|
383 | << "TORM VariableController::onRequestDataLoading for synchro var ENABLE"; | |
| 381 |
auto groupIds = std::set<QUuid> |
|
384 | auto groupIds = std::set<QUuid>{}; | |
|
|
385 | auto groupIdToOldRangeMap = std::map<QUuid, SqpRange>{}; | |||
| 382 | for (const auto &var : variables) { |
|
386 | for (const auto &var : variables) { | |
| 383 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var); |
|
387 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var); | |
| 384 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { |
|
388 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { | |
| @@ -386,6 +390,7 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> | |||||
| 386 | auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId); |
|
390 | auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId); | |
| 387 | if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) { |
|
391 | if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) { | |
| 388 | auto gId = varIdToGroupIdIt->second; |
|
392 | auto gId = varIdToGroupIdIt->second; | |
|
|
393 | groupIdToOldRangeMap.insert(std::make_pair(gId, var->range())); | |||
| 389 | if (groupIds.find(gId) == groupIds.cend()) { |
|
394 | if (groupIds.find(gId) == groupIds.cend()) { | |
| 390 | qCDebug(LOG_VariableController()) << "Synchro detect group " << gId; |
|
395 | qCDebug(LOG_VariableController()) << "Synchro detect group " << gId; | |
| 391 | groupIds.insert(gId); |
|
396 | groupIds.insert(gId); | |
| @@ -407,9 +412,10 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> | |||||
| 407 | if (var != nullptr) { |
|
412 | if (var != nullptr) { | |
| 408 | qCDebug(LOG_VariableController()) << "processRequest synchro for" |
|
413 | qCDebug(LOG_VariableController()) << "processRequest synchro for" | |
| 409 | << var->name(); |
|
414 | << var->name(); | |
| 410 | auto vSyncRangeRequested |
|
415 | auto vSyncRangeRequested = computeSynchroRangeRequested( | |
| 411 |
|
|
416 | var->range(), range, groupIdToOldRangeMap.at(gId)); | |
| 412 |
|
|
417 | qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested; | |
|
|
418 | impl->processRequest(var, vSyncRangeRequested, varRequestId); | |||
| 413 | } |
|
419 | } | |
| 414 | else { |
|
420 | else { | |
| 415 | qCCritical(LOG_VariableController()) |
|
421 | qCCritical(LOG_VariableController()) | |
| @@ -420,6 +426,8 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> | |||||
| 420 | } |
|
426 | } | |
| 421 | } |
|
427 | } | |
| 422 | } |
|
428 | } | |
|
|
429 | ||||
|
|
430 | impl->updateVariableRequest(varRequestId); | |||
| 423 | } |
|
431 | } | |
| 424 |
|
432 | |||
| 425 |
|
433 | |||
| @@ -463,22 +471,43 AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const | |||||
| 463 | } |
|
471 | } | |
| 464 |
|
472 | |||
| 465 | void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var, |
|
473 | void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var, | |
| 466 |
const SqpRange &rangeRequested |
|
474 | const SqpRange &rangeRequested, | |
|
|
475 | QUuid varRequestId) | |||
| 467 | { |
|
476 | { | |
| 468 |
|
477 | |||
| 469 | auto varRangesRequested |
|
478 | // TODO: protect at | |
| 470 | = m_VariableCacheStrategy->computeCacheRange(var->range(), rangeRequested); |
|
479 | auto varRequest = VariableRequest{}; | |
| 471 | auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second); |
|
480 | auto varId = m_VariableToIdentifierMap.at(var); | |
| 472 | auto inCacheRangeList = var->provideInCacheRangeList(varRangesRequested.second); |
|
481 | ||
|
|
482 | auto varStrategyRangesRequested | |||
|
|
483 | = m_VariableCacheStrategy->computeStrategyRanges(var->range(), rangeRequested); | |||
|
|
484 | auto notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second); | |||
|
|
485 | auto inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second); | |||
| 473 |
|
486 | |||
| 474 | if (!notInCacheRangeList.empty()) { |
|
487 | if (!notInCacheRangeList.empty()) { | |
| 475 | auto identifier = m_VariableToIdentifierMap.at(var); |
|
488 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; | |
|
|
489 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; | |||
|
|
490 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest RR ") << rangeRequested; | |||
|
|
491 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest R ") | |||
|
|
492 | << varStrategyRangesRequested.first; | |||
|
|
493 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("TORM processRequest CR ") | |||
|
|
494 | << varStrategyRangesRequested.second; | |||
|
|
495 | // store VarRequest | |||
|
|
496 | storeVariableRequest(varId, varRequestId, varRequest); | |||
|
|
497 | ||||
| 476 | auto varProvider = m_VariableToProviderMap.at(var); |
|
498 | auto varProvider = m_VariableToProviderMap.at(var); | |
| 477 | if (varProvider != nullptr) { |
|
499 | if (varProvider != nullptr) { | |
| 478 | m_VariableAcquisitionWorker->pushVariableRequest( |
|
500 | auto varRequestIdCanceled = m_VariableAcquisitionWorker->pushVariableRequest( | |
| 479 | identifier, varRangesRequested.first, varRangesRequested.second, |
|
501 | varRequestId, varId, varStrategyRangesRequested.first, | |
|
|
502 | varStrategyRangesRequested.second, | |||
| 480 | DataProviderParameters{std::move(notInCacheRangeList), var->metadata()}, |
|
503 | DataProviderParameters{std::move(notInCacheRangeList), var->metadata()}, | |
| 481 | varProvider); |
|
504 | varProvider); | |
|
|
505 | ||||
|
|
506 | if (!varRequestIdCanceled.isNull()) { | |||
|
|
507 | qCInfo(LOG_VariableAcquisitionWorker()) << tr("varRequestIdCanceled: ") | |||
|
|
508 | << varRequestIdCanceled; | |||
|
|
509 | cancelVariableRequest(varRequestIdCanceled); | |||
|
|
510 | } | |||
| 482 | } |
|
511 | } | |
| 483 | else { |
|
512 | else { | |
| 484 | qCCritical(LOG_VariableController()) |
|
513 | qCCritical(LOG_VariableController()) | |
| @@ -490,10 +519,13 void VariableController::VariableControllerPrivate::processRequest(std::shared_p | |||||
| 490 | } |
|
519 | } | |
| 491 | } |
|
520 | } | |
| 492 | else { |
|
521 | else { | |
| 493 | var->setRange(rangeRequested); |
|
522 | ||
| 494 |
var |
|
523 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; | |
| 495 | var->setDataSeries(var->dataSeries()->subDataSeries(varRangesRequested.second)); |
|
524 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; | |
| 496 | emit var->updated(); |
|
525 | // store VarRequest | |
|
|
526 | storeVariableRequest(varId, varRequestId, varRequest); | |||
|
|
527 | acceptVariableRequest(varId, | |||
|
|
528 | var->dataSeries()->subDataSeries(varStrategyRangesRequested.second)); | |||
| 497 | } |
|
529 | } | |
| 498 | } |
|
530 | } | |
| 499 |
|
531 | |||
| @@ -550,3 +582,157 void VariableController::VariableControllerPrivate::registerProvider( | |||||
| 550 | qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists "); |
|
582 | qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists "); | |
| 551 | } |
|
583 | } | |
| 552 | } |
|
584 | } | |
|
|
585 | ||||
|
|
586 | void VariableController::VariableControllerPrivate::storeVariableRequest( | |||
|
|
587 | QUuid varId, QUuid varRequestId, const VariableRequest &varRequest) | |||
|
|
588 | { | |||
|
|
589 | // First request for the variable. we can create an entry for it | |||
|
|
590 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); | |||
|
|
591 | if (varIdToVarRequestIdQueueMapIt == m_VarIdToVarRequestIdQueueMap.cend()) { | |||
|
|
592 | auto varRequestIdQueue = std::deque<QUuid>{}; | |||
|
|
593 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in QUEUE"); | |||
|
|
594 | varRequestIdQueue.push_back(varRequestId); | |||
|
|
595 | m_VarIdToVarRequestIdQueueMap.insert(std::make_pair(varId, std::move(varRequestIdQueue))); | |||
|
|
596 | } | |||
|
|
597 | else { | |||
|
|
598 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in EXISTING QUEUE"); | |||
|
|
599 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |||
|
|
600 | varRequestIdQueue.push_back(varRequestId); | |||
|
|
601 | } | |||
|
|
602 | ||||
|
|
603 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |||
|
|
604 | if (varRequestIdToVarIdVarRequestMapIt == m_VarRequestIdToVarIdVarRequestMap.cend()) { | |||
|
|
605 | auto varIdToVarRequestMap = std::map<QUuid, VariableRequest>{}; | |||
|
|
606 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); | |||
|
|
607 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in MAP"); | |||
|
|
608 | m_VarRequestIdToVarIdVarRequestMap.insert( | |||
|
|
609 | std::make_pair(varRequestId, std::move(varIdToVarRequestMap))); | |||
|
|
610 | } | |||
|
|
611 | else { | |||
|
|
612 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |||
|
|
613 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in EXISTING MAP"); | |||
|
|
614 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); | |||
|
|
615 | } | |||
|
|
616 | } | |||
|
|
617 | ||||
|
|
618 | QUuid VariableController::VariableControllerPrivate::acceptVariableRequest( | |||
|
|
619 | QUuid varId, std::shared_ptr<IDataSeries> dataSeries) | |||
|
|
620 | { | |||
|
|
621 | QUuid varRequestId; | |||
|
|
622 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); | |||
|
|
623 | if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) { | |||
|
|
624 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |||
|
|
625 | varRequestId = varRequestIdQueue.front(); | |||
|
|
626 | auto varRequestIdToVarIdVarRequestMapIt | |||
|
|
627 | = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |||
|
|
628 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { | |||
|
|
629 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |||
|
|
630 | auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId); | |||
|
|
631 | if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) { | |||
|
|
632 | qCDebug(LOG_VariableController()) << tr("acceptVariableRequest"); | |||
|
|
633 | auto &varRequest = varIdToVarRequestMapIt->second; | |||
|
|
634 | varRequest.m_DataSeries = dataSeries; | |||
|
|
635 | varRequest.m_CanUpdate = true; | |||
|
|
636 | } | |||
|
|
637 | else { | |||
|
|
638 | qCDebug(LOG_VariableController()) | |||
|
|
639 | << tr("Impossible to acceptVariableRequest of a unknown variable id attached " | |||
|
|
640 | "to a variableRequestId") | |||
|
|
641 | << varRequestId << varId; | |||
|
|
642 | } | |||
|
|
643 | } | |||
|
|
644 | else { | |||
|
|
645 | qCCritical(LOG_VariableController()) | |||
|
|
646 | << tr("Impossible to acceptVariableRequest of a unknown variableRequestId") | |||
|
|
647 | << varRequestId; | |||
|
|
648 | } | |||
|
|
649 | ||||
|
|
650 | qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in QUEUE ?") | |||
|
|
651 | << varRequestIdQueue.size(); | |||
|
|
652 | varRequestIdQueue.pop_front(); | |||
|
|
653 | qCDebug(LOG_VariableController()) << tr("2: erase REQUEST in QUEUE ?") | |||
|
|
654 | << varRequestIdQueue.size(); | |||
|
|
655 | if (varRequestIdQueue.empty()) { | |||
|
|
656 | m_VarIdToVarRequestIdQueueMap.erase(varId); | |||
|
|
657 | } | |||
|
|
658 | } | |||
|
|
659 | else { | |||
|
|
660 | qCCritical(LOG_VariableController()) | |||
|
|
661 | << tr("Impossible to acceptVariableRequest of a unknown variable id") << varId; | |||
|
|
662 | } | |||
|
|
663 | ||||
|
|
664 | return varRequestId; | |||
|
|
665 | } | |||
|
|
666 | ||||
|
|
667 | void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId) | |||
|
|
668 | { | |||
|
|
669 | ||||
|
|
670 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |||
|
|
671 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { | |||
|
|
672 | bool processVariableUpdate = true; | |||
|
|
673 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |||
|
|
674 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); | |||
|
|
675 | (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) && processVariableUpdate; | |||
|
|
676 | ++varIdToVarRequestMapIt) { | |||
|
|
677 | processVariableUpdate &= varIdToVarRequestMapIt->second.m_CanUpdate; | |||
|
|
678 | qCDebug(LOG_VariableController()) << tr("updateVariableRequest") | |||
|
|
679 | << processVariableUpdate; | |||
|
|
680 | } | |||
|
|
681 | ||||
|
|
682 | if (processVariableUpdate) { | |||
|
|
683 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); | |||
|
|
684 | varIdToVarRequestMapIt != varIdToVarRequestMap.cend(); ++varIdToVarRequestMapIt) { | |||
|
|
685 | if (auto var = findVariable(varIdToVarRequestMapIt->first)) { | |||
|
|
686 | auto &varRequest = varIdToVarRequestMapIt->second; | |||
|
|
687 | var->setRange(varRequest.m_RangeRequested); | |||
|
|
688 | var->setCacheRange(varRequest.m_CacheRangeRequested); | |||
|
|
689 | qCDebug(LOG_VariableController()) << tr("1: onDataProvided") | |||
|
|
690 | << varRequest.m_RangeRequested; | |||
|
|
691 | qCDebug(LOG_VariableController()) << tr("2: onDataProvided") | |||
|
|
692 | << varRequest.m_CacheRangeRequested; | |||
|
|
693 | var->mergeDataSeries(varRequest.m_DataSeries); | |||
|
|
694 | qCDebug(LOG_VariableController()) << tr("3: onDataProvided") | |||
|
|
695 | << varRequest.m_DataSeries->range(); | |||
|
|
696 | qCDebug(LOG_VariableController()) << tr("4: onDataProvided"); | |||
|
|
697 | emit var->updated(); | |||
|
|
698 | } | |||
|
|
699 | else { | |||
|
|
700 | qCCritical(LOG_VariableController()) | |||
|
|
701 | << tr("Impossible to update data to a null variable"); | |||
|
|
702 | } | |||
|
|
703 | } | |||
|
|
704 | ||||
|
|
705 | // cleaning varRequestId | |||
|
|
706 | qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in MAP ?") | |||
|
|
707 | << m_VarRequestIdToVarIdVarRequestMap.size(); | |||
|
|
708 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); | |||
|
|
709 | qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in MAP ?") | |||
|
|
710 | << m_VarRequestIdToVarIdVarRequestMap.size(); | |||
|
|
711 | } | |||
|
|
712 | } | |||
|
|
713 | else { | |||
|
|
714 | qCCritical(LOG_VariableController()) | |||
|
|
715 | << tr("Cannot updateVariableRequest for a unknow varRequestId") << varRequestId; | |||
|
|
716 | } | |||
|
|
717 | } | |||
|
|
718 | ||||
|
|
719 | void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId) | |||
|
|
720 | { | |||
|
|
721 | // cleaning varRequestId | |||
|
|
722 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); | |||
|
|
723 | ||||
|
|
724 | for (auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.begin(); | |||
|
|
725 | varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.end();) { | |||
|
|
726 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |||
|
|
727 | varRequestIdQueue.erase( | |||
|
|
728 | std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId), | |||
|
|
729 | varRequestIdQueue.end()); | |||
|
|
730 | if (varRequestIdQueue.empty()) { | |||
|
|
731 | varIdToVarRequestIdQueueMapIt | |||
|
|
732 | = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt); | |||
|
|
733 | } | |||
|
|
734 | else { | |||
|
|
735 | ++varIdToVarRequestIdQueueMapIt; | |||
|
|
736 | } | |||
|
|
737 | } | |||
|
|
738 | } | |||
| @@ -100,49 +100,49 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V | |||||
| 100 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; |
|
100 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; | |
| 101 | graphChildRange.m_TStart += deltaLeft; |
|
101 | graphChildRange.m_TStart += deltaLeft; | |
| 102 | graphChildRange.m_TEnd -= deltaRight; |
|
102 | graphChildRange.m_TEnd -= deltaRight; | |
| 103 |
qC |
|
103 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn"); | |
| 104 |
qC |
|
104 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") | |
| 105 |
|
|
105 | << deltaLeft; | |
| 106 |
qC |
|
106 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") | |
| 107 |
|
|
107 | << deltaRight; | |
| 108 |
qC |
|
108 | qCDebug(LOG_VisualizationZoneWidget()) | |
| 109 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
109 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
| 110 |
|
110 | |||
| 111 | break; |
|
111 | break; | |
| 112 | } |
|
112 | } | |
| 113 |
|
113 | |||
| 114 | case AcquisitionZoomType::ZoomOut: { |
|
114 | case AcquisitionZoomType::ZoomOut: { | |
| 115 |
qC |
|
115 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut"); | |
| 116 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
116 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
| 117 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
117 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
| 118 |
qC |
|
118 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") | |
| 119 |
|
|
119 | << deltaLeft; | |
| 120 |
qC |
|
120 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") | |
| 121 |
|
|
121 | << deltaRight; | |
| 122 |
qC |
|
122 | qCDebug(LOG_VisualizationZoneWidget()) | |
| 123 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
123 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
| 124 | graphChildRange.m_TStart -= deltaLeft; |
|
124 | graphChildRange.m_TStart -= deltaLeft; | |
| 125 | graphChildRange.m_TEnd += deltaRight; |
|
125 | graphChildRange.m_TEnd += deltaRight; | |
| 126 | break; |
|
126 | break; | |
| 127 | } |
|
127 | } | |
| 128 | case AcquisitionZoomType::PanRight: { |
|
128 | case AcquisitionZoomType::PanRight: { | |
| 129 |
qC |
|
129 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight"); | |
| 130 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
130 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
| 131 | graphChildRange.m_TStart += deltaRight; |
|
131 | graphChildRange.m_TStart += deltaRight; | |
| 132 | graphChildRange.m_TEnd += deltaRight; |
|
132 | graphChildRange.m_TEnd += deltaRight; | |
| 133 |
qC |
|
133 | qCDebug(LOG_VisualizationZoneWidget()) | |
| 134 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
134 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
| 135 | break; |
|
135 | break; | |
| 136 | } |
|
136 | } | |
| 137 | case AcquisitionZoomType::PanLeft: { |
|
137 | case AcquisitionZoomType::PanLeft: { | |
| 138 |
qC |
|
138 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft"); | |
| 139 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
139 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
| 140 | graphChildRange.m_TStart -= deltaLeft; |
|
140 | graphChildRange.m_TStart -= deltaLeft; | |
| 141 | graphChildRange.m_TEnd -= deltaLeft; |
|
141 | graphChildRange.m_TEnd -= deltaLeft; | |
| 142 | break; |
|
142 | break; | |
| 143 | } |
|
143 | } | |
| 144 | case AcquisitionZoomType::Unknown: { |
|
144 | case AcquisitionZoomType::Unknown: { | |
| 145 |
qC |
|
145 | qCDebug(LOG_VisualizationZoneWidget()) | |
| 146 | << tr("Impossible to synchronize: zoom type unknown"); |
|
146 | << tr("Impossible to synchronize: zoom type unknown"); | |
| 147 | break; |
|
147 | break; | |
| 148 | } |
|
148 | } | |
| @@ -153,11 +153,11 VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V | |||||
| 153 | break; |
|
153 | break; | |
| 154 | } |
|
154 | } | |
| 155 | graphChild->enableAcquisition(false); |
|
155 | graphChild->enableAcquisition(false); | |
| 156 |
qC |
|
156 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ") | |
| 157 |
|
|
157 | << graphChild->graphRange(); | |
| 158 |
qC |
|
158 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ") | |
| 159 |
|
|
159 | << graphChildRange; | |
| 160 |
qC |
|
160 | qCDebug(LOG_VisualizationZoneWidget()) | |
| 161 | << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart; |
|
161 | << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart; | |
| 162 | graphChild->setGraphRange(graphChildRange); |
|
162 | graphChild->setGraphRange(graphChildRange); | |
| 163 | graphChild->enableAcquisition(true); |
|
163 | graphChild->enableAcquisition(true); | |
| @@ -76,8 +76,8 void AmdaProvider::requestDataLoading(QUuid acqIdentifier, const DataProviderPar | |||||
| 76 | for (const auto &dateTime : qAsConst(times)) { |
|
76 | for (const auto &dateTime : qAsConst(times)) { | |
| 77 | this->retrieveData(acqIdentifier, dateTime, data); |
|
77 | this->retrieveData(acqIdentifier, dateTime, data); | |
| 78 |
|
78 | |||
| 79 | // TORM |
|
79 | // TORM when AMDA will support quick asynchrone request | |
| 80 |
|
|
80 | QThread::msleep(1000); | |
| 81 | } |
|
81 | } | |
| 82 | } |
|
82 | } | |
| 83 |
|
83 | |||
| @@ -130,8 +130,8 void TestAmdaAcquisition::testAcquisition() | |||||
| 130 | QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit); |
|
130 | QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit); | |
| 131 | loop.exec(); |
|
131 | loop.exec(); | |
| 132 |
|
132 | |||
| 133 |
q |
|
133 | qInfo() << count << "RANGE " << var->range(); | |
| 134 |
q |
|
134 | qInfo() << count << "CACHERANGE" << var->cacheRange(); | |
| 135 |
|
135 | |||
| 136 | QCOMPARE(var->range().m_TStart, nextSqpR.m_TStart); |
|
136 | QCOMPARE(var->range().m_TStart, nextSqpR.m_TStart); | |
| 137 | QCOMPARE(var->range().m_TEnd, nextSqpR.m_TEnd); |
|
137 | QCOMPARE(var->range().m_TEnd, nextSqpR.m_TEnd); | |
| @@ -144,7 +144,7 void TestAmdaAcquisition::testAcquisition() | |||||
| 144 | // 2 : pan (jump) left for one hour |
|
144 | // 2 : pan (jump) left for one hour | |
| 145 | auto nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 1, 0, 0}}; |
|
145 | auto nextVarRS = QDateTime{QDate{2012, 01, 02}, QTime{2, 1, 0, 0}}; | |
| 146 | auto nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 2, 0, 0}}; |
|
146 | auto nextVarRE = QDateTime{QDate{2012, 01, 02}, QTime{2, 2, 0, 0}}; | |
| 147 |
|
|
147 | requestDataLoading(nextVarRS, nextVarRE); | |
| 148 |
|
148 | |||
| 149 |
|
149 | |||
| 150 | // 3 : pan (jump) right for one hour |
|
150 | // 3 : pan (jump) right for one hour | |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * M core/include/Data/AcquisitionRequest.h * M core/include/Variable/VariableAcquisitionWorker.h * M core/include/Variable/VariableCacheStrategy.h * M core/include/Variable/VariableController.h * M core/src/Variable/VariableAcquisitionWorker.cpp * M core/src/Variable/VariableCacheStrategy.cpp * M core/src/Variable/VariableController.cpp * M gui/src/Visualization/VisualizationZoneWidget.cpp * M plugins/amda/include/AmdaPlugin.h * M plugins/amda/src/AmdaProvider.cpp * M plugins/amda/tests/TestAmdaAcquisition.cpp * M plugins/mockplugin/include/MockPlugin.h * R COPYING * R app/src/MainWindow.cpp * R app/ui/MainWindow.ui * R cmake/sciqlop_package_qt.cmake * R core/include/Common/DateUtils.h * R core/include/Common/MetaTypes.h * R core/include/Common/SortUtils.h * R core/include/CoreGlobal.h * R core/include/Data/AcquisitionDataPacket.h * R core/include/Data/ArrayData.h * R core/include/Data/DataProviderParameters.h * R core/include/Data/DataSeries.h * R core/include/Data/DataSeriesIterator.h * R core/include/Data/IDataProvider.h * R core/include/Data/IDataSeries.h * R core/include/Data/ScalarSeries.h * R core/include/Data/SqpRange.h * R core/include/Data/VectorSeries.h * R core/include/DataSource/DataSourceItemAction.h * R core/include/Network/NetworkController.h * R core/include/Plugin/PluginManager.h * R core/include/Settings/ISqpSettingsBindable.h * R core/include/Settings/SqpSettingsDefs.h * R core/include/Time/TimeController.h * R core/include/Variable/Variable.h * R core/include/Variable/VariableCacheController.h * R core/include/Variable/VariableModel.h * R core/include/Variable/VariableSynchronizationGroup.h * R core/include/Visualization/VisualizationController.h * R core/src/Common/DateUtils.cpp * R core/src/Data/DataSeriesIterator.cpp * R core/src/Data/ScalarSeries.cpp * R core/src/Data/VectorSeries.cpp * R core/src/DataSource/DataSourceItemAction.cpp * R core/src/Network/NetworkController.cpp * R core/src/Plugin/PluginManager.cpp * R core/src/Settings/SqpSettingsDefs.cpp * R core/src/Time/TimeController.cpp * R core/src/Variable/Variable.cpp * R core/src/Variable/VariableCacheController.cpp * R core/src/Variable/VariableModel.cpp * R core/src/Variable/VariableSynchronizationGroup.cpp * R core/src/Visualization/VisualizationController.cpp * R core/tests/Data/TestDataSeries.cpp * R core/tests/Data/TestOneDimArrayData.cpp * R core/tests/Data/TestTwoDimArrayData.cpp * R core/tests/Variable/TestVariable.cpp * R core/tests/Variable/TestVariableCacheController.cpp * R gui/include/Common/ColorUtils.h * R gui/include/DataSource/DataSourceTreeWidgetHelper.h * R gui/include/DataSource/DataSourceTreeWidgetItem.h * R gui/include/DataSource/DataSourceWidget.h * R gui/include/Settings/SqpSettingsDialog.h * R gui/include/Settings/SqpSettingsGeneralWidget.h * R gui/include/SidePane/SqpSidePane.h * R gui/include/TimeWidget/TimeWidget.h * R gui/include/Variable/VariableInspectorWidget.h * R gui/include/Variable/VariableMenuHeaderWidget.h * R gui/include/Visualization/IVariableContainer.h * R gui/include/Visualization/IVisualizationWidget.h * R gui/include/Visualization/IVisualizationWidgetVisitor.h * R gui/include/Visualization/VisualizationDefs.h * R gui/include/Visualization/VisualizationGraphHelper.h * R gui/include/Visualization/VisualizationGraphRenderingDelegate.h * R gui/include/Visualization/VisualizationGraphWidget.h * R gui/include/Visualization/VisualizationTabWidget.h * R gui/include/Visualization/VisualizationWidget.h * R gui/include/Visualization/VisualizationZoneWidget.h * R gui/include/Visualization/operations/GenerateVariableMenuOperation.h * R gui/include/Visualization/operations/MenuBuilder.h * R gui/include/Visualization/operations/RemoveVariableOperation.h * R gui/include/Visualization/operations/RescaleAxeOperation.h * R gui/include/Visualization/qcustomplot.h * R gui/resources/icones/dataSourceComponent.png * R gui/resources/icones/dataSourceNode.png * R gui/resources/icones/dataSourceProduct.png * R gui/resources/icones/dataSourceRoot.png * R gui/resources/icones/delete.png * R gui/resources/icones/next.png * R gui/resources/icones/openInspector.png * R gui/resources/icones/plot.png * R gui/resources/icones/previous.png * R gui/resources/icones/sciqlop2PNG_1024.png * R gui/resources/icones/unplot.png * R gui/resources/sqpguiresources.qrc * R gui/src/Common/ColorUtils.cpp * R gui/src/DataSource/DataSourceTreeWidgetHelper.cpp * R gui/src/DataSource/DataSourceTreeWidgetItem.cpp * R gui/src/DataSource/DataSourceWidget.cpp * R gui/src/Settings/SqpSettingsDialog.cpp * R gui/src/Settings/SqpSettingsGeneralWidget.cpp * R gui/src/SidePane/SqpSidePane.cpp * R gui/src/TimeWidget/TimeWidget.cpp * R gui/src/Variable/VariableInspectorWidget.cpp * R gui/src/Variable/VariableMenuHeaderWidget.cpp * R gui/src/Visualization/VisualizationGraphHelper.cpp * R gui/src/Visualization/VisualizationGraphRenderingDelegate.cpp * R gui/src/Visualization/VisualizationGraphWidget.cpp * R gui/src/Visualization/VisualizationTabWidget.cpp * R gui/src/Visualization/VisualizationWidget.cpp * R gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp * R gui/src/Visualization/operations/MenuBuilder.cpp * R gui/src/Visualization/operations/RemoveVariableOperation.cpp * R gui/src/Visualization/operations/RescaleAxeOperation.cpp * R gui/src/Visualization/qcustomplot.cpp * R gui/ui/DataSource/DataSourceWidget.ui * R gui/ui/Settings/SqpSettingsDialog.ui * R gui/ui/Settings/SqpSettingsGeneralWidget.ui * R gui/ui/SidePane/SqpSidePane.ui * R gui/ui/TimeWidget/TimeWidget.ui * R gui/ui/Variable/VariableInspectorWidget.ui * R gui/ui/Variable/VariableMenuHeaderWidget.ui * R gui/ui/Visualization/VisualizationGraphWidget.ui * R gui/ui/Visualization/VisualizationTabWidget.ui * R gui/ui/Visualization/VisualizationWidget.ui * R gui/ui/Visualization/VisualizationZoneWidget.ui * R gui/vera-exclusions/exclusions.txt * R plugin/CMakeLists.txt * R plugin/cmake/Findsciqlop-plugin.cmake * R plugin/include/Plugin/IPlugin.h * R plugins/amda/CMakeLists.txt * R plugins/amda/cmake/Findsciqlop-amda.cmake * R plugins/amda/include/AmdaDefs.h * R plugins/amda/include/AmdaGlobal.h * R plugins/amda/include/AmdaParser.h * R plugins/amda/include/AmdaProvider.h * R plugins/amda/include/AmdaResultParser.h * R plugins/amda/resources/amda.json * R plugins/amda/resources/amdaresources.qrc * R plugins/amda/resources/samples/AmdaSample.json * R plugins/amda/resources/samples/AmdaSampleV2.json * R plugins/amda/src/AmdaDefs.cpp * R plugins/amda/src/AmdaParser.cpp * R plugins/amda/src/AmdaPlugin.cpp * R plugins/amda/src/AmdaResultParser.cpp * R plugins/amda/tests-resources/TestAmdaAcquisition/AmdaData-2012-01-01-12-00-00_2012-01-03-12-00-00.txt * R plugins/amda/tests-resources/TestAmdaParser/TwoRootsFile.json * R plugins/amda/tests-resources/TestAmdaParser/ValidFile1.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootKey.json * R plugins/amda/tests-resources/TestAmdaParser/WrongRootType.json * R plugins/amda/tests-resources/TestAmdaResultParser/FileNotFound.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NaNValue.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NaNX.txt * R plugins/amda/tests-resources/TestAmdaResultParser/NoUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/TooManyValues.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidScalar1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/ValidVector1.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongDate.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongUnit.txt * R plugins/amda/tests-resources/TestAmdaResultParser/WrongValue.txt * R plugins/amda/tests/TestAmdaParser.cpp * R plugins/amda/tests/TestAmdaResultParser.cpp * R plugins/mockplugin/CMakeLists.txt * R plugins/mockplugin/cmake/Findsciqlop-mockplugin.cmake * R plugins/mockplugin/include/CosinusProvider.h * R plugins/mockplugin/include/MockPluginGlobal.h * R plugins/mockplugin/resources/mockplugin.json * R plugins/mockplugin/src/CosinusProvider.cpp * R plugins/mockplugin/src/MockPlugin.cpp * R README.md * R app/CMakeLists.txt * R app/include/MainWindow.h * R app/src/Main.cpp * R app/vera-exclusions/exclusions.txt * R cmake/sciqlop.cmake * R cmake/sciqlop_applications.cmake * R cmake/sciqlop_package.cmake * R cmake/sciqlop_params.cmake * R core/CMakeLists.txt * R core/include/Common/spimpl.h * R core/include/DataSource/DataSourceController.h * R core/include/DataSource/DataSourceItem.h * R core/src/DataSource/DataSourceController.cpp * R core/src/DataSource/DataSourceItem.cpp * R core/tests/DataSource/TestDataSourceController.cpp * R core/vera-exclusions/exclusions.txt * R formatting/cmake/use_clangformat.cmake * R formatting/vera-exclusions/exclusions.txt * R gui/CMakeLists.txt * R gui/include/SqpApplication.h * R gui/src/SqpApplication.cpp * R LICENSE * R app/src/mainwindow.cpp * R app/src/mainwindow.ui
You need to be logged in to leave comments.
Login now