##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Implementation on time widget for only one selected variable
perrinel -
r834:0f717271fd46
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,971 +1,1003
1 #include <Variable/Variable.h>
1 #include <Variable/Variable.h>
2 #include <Variable/VariableAcquisitionWorker.h>
2 #include <Variable/VariableAcquisitionWorker.h>
3 #include <Variable/VariableCacheStrategy.h>
3 #include <Variable/VariableCacheStrategy.h>
4 #include <Variable/VariableCacheStrategyFactory.h>
4 #include <Variable/VariableCacheStrategyFactory.h>
5 #include <Variable/VariableController.h>
5 #include <Variable/VariableController.h>
6 #include <Variable/VariableModel.h>
6 #include <Variable/VariableModel.h>
7 #include <Variable/VariableSynchronizationGroup.h>
7 #include <Variable/VariableSynchronizationGroup.h>
8
8
9 #include <Data/DataProviderParameters.h>
9 #include <Data/DataProviderParameters.h>
10 #include <Data/IDataProvider.h>
10 #include <Data/IDataProvider.h>
11 #include <Data/IDataSeries.h>
11 #include <Data/IDataSeries.h>
12 #include <Data/VariableRequest.h>
12 #include <Data/VariableRequest.h>
13 #include <Time/TimeController.h>
13 #include <Time/TimeController.h>
14
14
15 #include <QMutex>
15 #include <QMutex>
16 #include <QThread>
16 #include <QThread>
17 #include <QUuid>
17 #include <QUuid>
18 #include <QtCore/QItemSelectionModel>
18 #include <QtCore/QItemSelectionModel>
19
19
20 #include <deque>
20 #include <deque>
21 #include <set>
21 #include <set>
22 #include <unordered_map>
22 #include <unordered_map>
23
23
24 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
24 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
25
25
26 namespace {
26 namespace {
27
27
28 SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
28 SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
29 const SqpRange &oldGraphRange)
29 const SqpRange &oldGraphRange)
30 {
30 {
31 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
31 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
32
32
33 auto varRangeRequested = varRange;
33 auto varRangeRequested = varRange;
34 switch (zoomType) {
34 switch (zoomType) {
35 case AcquisitionZoomType::ZoomIn: {
35 case AcquisitionZoomType::ZoomIn: {
36 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
36 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
37 auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
37 auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
38 varRangeRequested.m_TStart += deltaLeft;
38 varRangeRequested.m_TStart += deltaLeft;
39 varRangeRequested.m_TEnd -= deltaRight;
39 varRangeRequested.m_TEnd -= deltaRight;
40 break;
40 break;
41 }
41 }
42
42
43 case AcquisitionZoomType::ZoomOut: {
43 case AcquisitionZoomType::ZoomOut: {
44 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
44 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
45 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
45 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
46 varRangeRequested.m_TStart -= deltaLeft;
46 varRangeRequested.m_TStart -= deltaLeft;
47 varRangeRequested.m_TEnd += deltaRight;
47 varRangeRequested.m_TEnd += deltaRight;
48 break;
48 break;
49 }
49 }
50 case AcquisitionZoomType::PanRight: {
50 case AcquisitionZoomType::PanRight: {
51 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
51 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
52 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
52 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
53 varRangeRequested.m_TStart += deltaLeft;
53 varRangeRequested.m_TStart += deltaLeft;
54 varRangeRequested.m_TEnd += deltaRight;
54 varRangeRequested.m_TEnd += deltaRight;
55 break;
55 break;
56 }
56 }
57 case AcquisitionZoomType::PanLeft: {
57 case AcquisitionZoomType::PanLeft: {
58 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
58 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
59 auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
59 auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
60 varRangeRequested.m_TStart -= deltaLeft;
60 varRangeRequested.m_TStart -= deltaLeft;
61 varRangeRequested.m_TEnd -= deltaRight;
61 varRangeRequested.m_TEnd -= deltaRight;
62 break;
62 break;
63 }
63 }
64 case AcquisitionZoomType::Unknown: {
64 case AcquisitionZoomType::Unknown: {
65 qCCritical(LOG_VariableController())
65 qCCritical(LOG_VariableController())
66 << VariableController::tr("Impossible to synchronize: zoom type unknown");
66 << VariableController::tr("Impossible to synchronize: zoom type unknown");
67 break;
67 break;
68 }
68 }
69 default:
69 default:
70 qCCritical(LOG_VariableController()) << VariableController::tr(
70 qCCritical(LOG_VariableController()) << VariableController::tr(
71 "Impossible to synchronize: zoom type not take into account");
71 "Impossible to synchronize: zoom type not take into account");
72 // No action
72 // No action
73 break;
73 break;
74 }
74 }
75
75
76 return varRangeRequested;
76 return varRangeRequested;
77 }
77 }
78 }
78 }
79
79
80 enum class VariableRequestHandlerState { OFF, RUNNING, PENDING };
80 enum class VariableRequestHandlerState { OFF, RUNNING, PENDING };
81
81
82 struct VariableRequestHandler {
82 struct VariableRequestHandler {
83
83
84 VariableRequestHandler()
84 VariableRequestHandler()
85 {
85 {
86 m_CanUpdate = false;
86 m_CanUpdate = false;
87 m_State = VariableRequestHandlerState::OFF;
87 m_State = VariableRequestHandlerState::OFF;
88 }
88 }
89
89
90 QUuid m_VarId;
90 QUuid m_VarId;
91 VariableRequest m_RunningVarRequest;
91 VariableRequest m_RunningVarRequest;
92 VariableRequest m_PendingVarRequest;
92 VariableRequest m_PendingVarRequest;
93 VariableRequestHandlerState m_State;
93 VariableRequestHandlerState m_State;
94 bool m_CanUpdate;
94 bool m_CanUpdate;
95 };
95 };
96
96
97 struct VariableController::VariableControllerPrivate {
97 struct VariableController::VariableControllerPrivate {
98 explicit VariableControllerPrivate(VariableController *parent)
98 explicit VariableControllerPrivate(VariableController *parent)
99 : m_WorkingMutex{},
99 : m_WorkingMutex{},
100 m_VariableModel{new VariableModel{parent}},
100 m_VariableModel{new VariableModel{parent}},
101 m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
101 m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
102 // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
102 // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
103 m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy(
103 m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy(
104 CacheStrategy::SingleThreshold)},
104 CacheStrategy::SingleThreshold)},
105 m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
105 m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()},
106 q{parent}
106 q{parent}
107 {
107 {
108
108
109 m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
109 m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
110 m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
110 m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
111 }
111 }
112
112
113
113
114 virtual ~VariableControllerPrivate()
114 virtual ~VariableControllerPrivate()
115 {
115 {
116 qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
116 qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
117 m_VariableAcquisitionWorkerThread.quit();
117 m_VariableAcquisitionWorkerThread.quit();
118 m_VariableAcquisitionWorkerThread.wait();
118 m_VariableAcquisitionWorkerThread.wait();
119 }
119 }
120
120
121
121
122 void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested,
122 void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested,
123 QUuid varRequestId);
123 QUuid varRequestId);
124
124
125 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
125 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
126 std::shared_ptr<IDataSeries>
126 std::shared_ptr<IDataSeries>
127 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
127 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
128
128
129 void registerProvider(std::shared_ptr<IDataProvider> provider);
129 void registerProvider(std::shared_ptr<IDataProvider> provider);
130
130
131 void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest);
131 void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest);
132 QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries);
132 QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries);
133 void updateVariables(QUuid varRequestId);
133 void updateVariables(QUuid varRequestId);
134 void updateVariableRequest(QUuid varRequestId);
134 void updateVariableRequest(QUuid varRequestId);
135 void cancelVariableRequest(QUuid varRequestId);
135 void cancelVariableRequest(QUuid varRequestId);
136 void executeVarRequest(std::shared_ptr<Variable> var, VariableRequest &varRequest);
136 void executeVarRequest(std::shared_ptr<Variable> var, VariableRequest &varRequest);
137
137
138 QMutex m_WorkingMutex;
138 QMutex m_WorkingMutex;
139 /// Variable model. The VariableController has the ownership
139 /// Variable model. The VariableController has the ownership
140 VariableModel *m_VariableModel;
140 VariableModel *m_VariableModel;
141 QItemSelectionModel *m_VariableSelectionModel;
141 QItemSelectionModel *m_VariableSelectionModel;
142
142
143
143
144 TimeController *m_TimeController{nullptr};
144 TimeController *m_TimeController{nullptr};
145 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
145 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
146 std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
146 std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
147 QThread m_VariableAcquisitionWorkerThread;
147 QThread m_VariableAcquisitionWorkerThread;
148
148
149 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
149 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
150 m_VariableToProviderMap;
150 m_VariableToProviderMap;
151 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
151 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
152 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
152 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
153 m_GroupIdToVariableSynchronizationGroupMap;
153 m_GroupIdToVariableSynchronizationGroupMap;
154 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
154 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
155 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
155 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
156
156
157 std::map<QUuid, std::list<QUuid> > m_VarGroupIdToVarIds;
157 std::map<QUuid, std::list<QUuid> > m_VarGroupIdToVarIds;
158 std::map<QUuid, std::unique_ptr<VariableRequestHandler> > m_VarIdToVarRequestHandler;
158 std::map<QUuid, std::unique_ptr<VariableRequestHandler> > m_VarIdToVarRequestHandler;
159
159
160 VariableController *q;
160 VariableController *q;
161 };
161 };
162
162
163
163
164 VariableController::VariableController(QObject *parent)
164 VariableController::VariableController(QObject *parent)
165 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
165 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
166 {
166 {
167 qCDebug(LOG_VariableController()) << tr("VariableController construction")
167 qCDebug(LOG_VariableController()) << tr("VariableController construction")
168 << QThread::currentThread();
168 << QThread::currentThread();
169
169
170 connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
170 connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
171 &VariableController::onAbortProgressRequested);
171 &VariableController::onAbortProgressRequested);
172
172
173 connect(impl->m_VariableAcquisitionWorker.get(),
173 connect(impl->m_VariableAcquisitionWorker.get(),
174 &VariableAcquisitionWorker::variableCanceledRequested, this,
174 &VariableAcquisitionWorker::variableCanceledRequested, this,
175 &VariableController::onAbortAcquisitionRequested);
175 &VariableController::onAbortAcquisitionRequested);
176
176
177 connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this,
177 connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this,
178 &VariableController::onDataProvided);
178 &VariableController::onDataProvided);
179 connect(impl->m_VariableAcquisitionWorker.get(),
179 connect(impl->m_VariableAcquisitionWorker.get(),
180 &VariableAcquisitionWorker::variableRequestInProgress, this,
180 &VariableAcquisitionWorker::variableRequestInProgress, this,
181 &VariableController::onVariableRetrieveDataInProgress);
181 &VariableController::onVariableRetrieveDataInProgress);
182
182
183
183
184 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started,
184 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started,
185 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize);
185 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize);
186 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
186 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
187 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
187 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
188
188
189
189
190 impl->m_VariableAcquisitionWorkerThread.start();
190 impl->m_VariableAcquisitionWorkerThread.start();
191 }
191 }
192
192
193 VariableController::~VariableController()
193 VariableController::~VariableController()
194 {
194 {
195 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
195 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
196 << QThread::currentThread();
196 << QThread::currentThread();
197 this->waitForFinish();
197 this->waitForFinish();
198 }
198 }
199
199
200 VariableModel *VariableController::variableModel() noexcept
200 VariableModel *VariableController::variableModel() noexcept
201 {
201 {
202 return impl->m_VariableModel;
202 return impl->m_VariableModel;
203 }
203 }
204
204
205 QItemSelectionModel *VariableController::variableSelectionModel() noexcept
205 QItemSelectionModel *VariableController::variableSelectionModel() noexcept
206 {
206 {
207 return impl->m_VariableSelectionModel;
207 return impl->m_VariableSelectionModel;
208 }
208 }
209
209
210 void VariableController::setTimeController(TimeController *timeController) noexcept
210 void VariableController::setTimeController(TimeController *timeController) noexcept
211 {
211 {
212 impl->m_TimeController = timeController;
212 impl->m_TimeController = timeController;
213 }
213 }
214
214
215 std::shared_ptr<Variable>
215 std::shared_ptr<Variable>
216 VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept
216 VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept
217 {
217 {
218 if (impl->m_VariableModel->containsVariable(variable)) {
218 if (impl->m_VariableModel->containsVariable(variable)) {
219 // Clones variable
219 // Clones variable
220 auto duplicate = variable->clone();
220 auto duplicate = variable->clone();
221
221
222 // Adds clone to model
222 // Adds clone to model
223 impl->m_VariableModel->addVariable(duplicate);
223 impl->m_VariableModel->addVariable(duplicate);
224
224
225 // Generates clone identifier
225 // Generates clone identifier
226 impl->m_VariableToIdentifierMap[duplicate] = QUuid::createUuid();
226 impl->m_VariableToIdentifierMap[duplicate] = QUuid::createUuid();
227
227
228 // Registers provider
228 // Registers provider
229 auto variableProvider = impl->m_VariableToProviderMap.at(variable);
229 auto variableProvider = impl->m_VariableToProviderMap.at(variable);
230 auto duplicateProvider = variableProvider != nullptr ? variableProvider->clone() : nullptr;
230 auto duplicateProvider = variableProvider != nullptr ? variableProvider->clone() : nullptr;
231
231
232 impl->m_VariableToProviderMap[duplicate] = duplicateProvider;
232 impl->m_VariableToProviderMap[duplicate] = duplicateProvider;
233 if (duplicateProvider) {
233 if (duplicateProvider) {
234 impl->registerProvider(duplicateProvider);
234 impl->registerProvider(duplicateProvider);
235 }
235 }
236
236
237 return duplicate;
237 return duplicate;
238 }
238 }
239 else {
239 else {
240 qCCritical(LOG_VariableController())
240 qCCritical(LOG_VariableController())
241 << tr("Can't create duplicate of variable %1: variable not registered in the model")
241 << tr("Can't create duplicate of variable %1: variable not registered in the model")
242 .arg(variable->name());
242 .arg(variable->name());
243 return nullptr;
243 return nullptr;
244 }
244 }
245 }
245 }
246
246
247 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
247 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
248 {
248 {
249 if (!variable) {
249 if (!variable) {
250 qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
250 qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
251 return;
251 return;
252 }
252 }
253
253
254 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
254 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
255 // make some treatments before the deletion
255 // make some treatments before the deletion
256 emit variableAboutToBeDeleted(variable);
256 emit variableAboutToBeDeleted(variable);
257
257
258 // Deletes identifier
258 // Deletes identifier
259 impl->m_VariableToIdentifierMap.erase(variable);
259 impl->m_VariableToIdentifierMap.erase(variable);
260
260
261 // Deletes provider
261 // Deletes provider
262 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
262 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
263 qCDebug(LOG_VariableController())
263 qCDebug(LOG_VariableController())
264 << tr("Number of providers deleted for variable %1: %2")
264 << tr("Number of providers deleted for variable %1: %2")
265 .arg(variable->name(), QString::number(nbProvidersDeleted));
265 .arg(variable->name(), QString::number(nbProvidersDeleted));
266
266
267
267
268 // Deletes from model
268 // Deletes from model
269 impl->m_VariableModel->deleteVariable(variable);
269 impl->m_VariableModel->deleteVariable(variable);
270 }
270 }
271
271
272 void VariableController::deleteVariables(
272 void VariableController::deleteVariables(
273 const QVector<std::shared_ptr<Variable> > &variables) noexcept
273 const QVector<std::shared_ptr<Variable> > &variables) noexcept
274 {
274 {
275 for (auto variable : qAsConst(variables)) {
275 for (auto variable : qAsConst(variables)) {
276 deleteVariable(variable);
276 deleteVariable(variable);
277 }
277 }
278 }
278 }
279
279
280 std::shared_ptr<Variable>
280 std::shared_ptr<Variable>
281 VariableController::createVariable(const QString &name, const QVariantHash &metadata,
281 VariableController::createVariable(const QString &name, const QVariantHash &metadata,
282 std::shared_ptr<IDataProvider> provider) noexcept
282 std::shared_ptr<IDataProvider> provider) noexcept
283 {
283 {
284 if (!impl->m_TimeController) {
284 if (!impl->m_TimeController) {
285 qCCritical(LOG_VariableController())
285 qCCritical(LOG_VariableController())
286 << tr("Impossible to create variable: The time controller is null");
286 << tr("Impossible to create variable: The time controller is null");
287 return nullptr;
287 return nullptr;
288 }
288 }
289
289
290 auto range = impl->m_TimeController->dateTime();
290 auto range = impl->m_TimeController->dateTime();
291
291
292 if (auto newVariable = impl->m_VariableModel->createVariable(name, metadata)) {
292 if (auto newVariable = impl->m_VariableModel->createVariable(name, metadata)) {
293 auto varId = QUuid::createUuid();
293 auto varId = QUuid::createUuid();
294
294
295 // Create the handler
295 // Create the handler
296 auto varRequestHandler = std::make_unique<VariableRequestHandler>();
296 auto varRequestHandler = std::make_unique<VariableRequestHandler>();
297 varRequestHandler->m_VarId = varId;
297 varRequestHandler->m_VarId = varId;
298
298
299 impl->m_VarIdToVarRequestHandler.insert(
299 impl->m_VarIdToVarRequestHandler.insert(
300 std::make_pair(varId, std::move(varRequestHandler)));
300 std::make_pair(varId, std::move(varRequestHandler)));
301
301
302 // store the provider
302 // store the provider
303 impl->registerProvider(provider);
303 impl->registerProvider(provider);
304
304
305 // Associate the provider
305 // Associate the provider
306 impl->m_VariableToProviderMap[newVariable] = provider;
306 impl->m_VariableToProviderMap[newVariable] = provider;
307 impl->m_VariableToIdentifierMap[newVariable] = varId;
307 impl->m_VariableToIdentifierMap[newVariable] = varId;
308
308
309 this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{newVariable}, range, false);
309 this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{newVariable}, range, false);
310
310
311 // auto varRequestId = QUuid::createUuid();
311 // auto varRequestId = QUuid::createUuid();
312 // qCInfo(LOG_VariableController()) << "createVariable: " << varId << varRequestId;
312 // qCInfo(LOG_VariableController()) << "createVariable: " << varId << varRequestId;
313 // impl->processRequest(newVariable, range, varRequestId);
313 // impl->processRequest(newVariable, range, varRequestId);
314 // impl->updateVariableRequest(varRequestId);
314 // impl->updateVariableRequest(varRequestId);
315
315
316 return newVariable;
316 return newVariable;
317 }
317 }
318 }
318 }
319
319
320 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
320 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
321 {
321 {
322 // NOTE: Even if acquisition request is aborting, the graphe range will be changed
322 // NOTE: Even if acquisition request is aborting, the graphe range will be changed
323 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
323 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
324 << QThread::currentThread()->objectName();
324 << QThread::currentThread()->objectName();
325 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
325 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
326 auto variables = QVector<std::shared_ptr<Variable> >{};
327
326
328 for (const auto &selectedRow : qAsConst(selectedRows)) {
327 // NOTE we only permit the time modification for one varai
329 if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
328 if (selectedRows.size() == 1) {
330 variables << selectedVariable;
329 auto variables = QVector<std::shared_ptr<Variable> >{};
330
331 // DEPRECATED
332 // for (const auto &selectedRow : qAsConst(selectedRows)) {
333 // if (auto selectedVariable =
334 // impl->m_VariableModel->variable(selectedRow.row())) {
335 // variables << selectedVariable;
336
337 // // notify that rescale operation has to be done
338 // emit rangeChanged(selectedVariable, dateTime);
339 // }
340 // }
341 // if (!variables.isEmpty()) {
342 // this->onRequestDataLoading(variables, dateTime, synchro);
343 // }
344 if (auto selectedVariable
345 = impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
346
347 auto itVar = impl->m_VariableToIdentifierMap.find(selectedVariable);
348 if (itVar == impl->m_VariableToIdentifierMap.cend()) {
349 qCCritical(LOG_VariableController())
350 << tr("Impossible to onDateTimeOnSelection request for unknown variable");
351 return;
352 }
331
353
332 // notify that rescale operation has to be done
354 // notify that rescale operation has to be done
333 emit rangeChanged(selectedVariable, dateTime);
355 emit rangeChanged(selectedVariable, dateTime);
356
357 auto synchro = impl->m_VariableIdGroupIdMap.find(itVar->second)
358 != impl->m_VariableIdGroupIdMap.cend();
359
360 this->onRequestDataLoading(QVector<std::shared_ptr<Variable> >{selectedVariable},
361 dateTime, synchro);
334 }
362 }
335 }
363 }
336
364 else if (selectedRows.size() > 1) {
337 if (!variables.isEmpty()) {
365 qCCritical(LOG_VariableController())
338 this->onRequestDataLoading(variables, dateTime, true);
366 << tr("Impossible to set time for more than 1 variable in the same time");
367 }
368 else {
369 qCWarning(LOG_VariableController())
370 << tr("There is no variable selected to set the time one");
339 }
371 }
340 }
372 }
341
373
342 void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
374 void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
343 const SqpRange &cacheRangeRequested,
375 const SqpRange &cacheRangeRequested,
344 QVector<AcquisitionDataPacket> dataAcquired)
376 QVector<AcquisitionDataPacket> dataAcquired)
345 {
377 {
346 qCDebug(LOG_VariableController()) << tr("onDataProvided") << QThread::currentThread();
378 qCDebug(LOG_VariableController()) << tr("onDataProvided") << QThread::currentThread();
347 auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
379 auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
348 auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries);
380 auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries);
349 if (!varRequestId.isNull()) {
381 if (!varRequestId.isNull()) {
350 impl->updateVariables(varRequestId);
382 impl->updateVariables(varRequestId);
351 }
383 }
352 }
384 }
353
385
354 void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
386 void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
355 {
387 {
356 qCDebug(LOG_VariableController())
388 qCDebug(LOG_VariableController())
357 << "TORM: variableController::onVariableRetrieveDataInProgress"
389 << "TORM: variableController::onVariableRetrieveDataInProgress"
358 << QThread::currentThread()->objectName() << progress;
390 << QThread::currentThread()->objectName() << progress;
359 if (auto var = impl->findVariable(identifier)) {
391 if (auto var = impl->findVariable(identifier)) {
360 impl->m_VariableModel->setDataProgress(var, progress);
392 impl->m_VariableModel->setDataProgress(var, progress);
361 }
393 }
362 else {
394 else {
363 qCCritical(LOG_VariableController())
395 qCCritical(LOG_VariableController())
364 << tr("Impossible to notify progression of a null variable");
396 << tr("Impossible to notify progression of a null variable");
365 }
397 }
366 }
398 }
367
399
368 void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
400 void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
369 {
401 {
370 qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortProgressRequested"
402 qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortProgressRequested"
371 << QThread::currentThread()->objectName() << variable->name();
403 << QThread::currentThread()->objectName() << variable->name();
372
404
373 auto itVar = impl->m_VariableToIdentifierMap.find(variable);
405 auto itVar = impl->m_VariableToIdentifierMap.find(variable);
374 if (itVar == impl->m_VariableToIdentifierMap.cend()) {
406 if (itVar == impl->m_VariableToIdentifierMap.cend()) {
375 qCCritical(LOG_VariableController())
407 qCCritical(LOG_VariableController())
376 << tr("Impossible to onAbortProgressRequested request for unknown variable");
408 << tr("Impossible to onAbortProgressRequested request for unknown variable");
377 return;
409 return;
378 }
410 }
379
411
380 auto varId = itVar->second;
412 auto varId = itVar->second;
381
413
382 auto itVarHandler = impl->m_VarIdToVarRequestHandler.find(varId);
414 auto itVarHandler = impl->m_VarIdToVarRequestHandler.find(varId);
383 if (itVarHandler == impl->m_VarIdToVarRequestHandler.cend()) {
415 if (itVarHandler == impl->m_VarIdToVarRequestHandler.cend()) {
384 qCCritical(LOG_VariableController())
416 qCCritical(LOG_VariableController())
385 << tr("Impossible to onAbortProgressRequested for variable with unknown handler");
417 << tr("Impossible to onAbortProgressRequested for variable with unknown handler");
386 return;
418 return;
387 }
419 }
388
420
389 auto varHandler = itVarHandler->second.get();
421 auto varHandler = itVarHandler->second.get();
390
422
391 // case where a variable has a running request
423 // case where a variable has a running request
392 if (varHandler->m_State != VariableRequestHandlerState::OFF) {
424 if (varHandler->m_State != VariableRequestHandlerState::OFF) {
393 impl->cancelVariableRequest(varHandler->m_RunningVarRequest.m_VariableGroupId);
425 impl->cancelVariableRequest(varHandler->m_RunningVarRequest.m_VariableGroupId);
394 }
426 }
395 }
427 }
396
428
397 void VariableController::onAbortAcquisitionRequested(QUuid vIdentifier)
429 void VariableController::onAbortAcquisitionRequested(QUuid vIdentifier)
398 {
430 {
399 qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortAcquisitionRequested"
431 qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortAcquisitionRequested"
400 << QThread::currentThread()->objectName() << vIdentifier;
432 << QThread::currentThread()->objectName() << vIdentifier;
401
433
402 if (auto var = impl->findVariable(vIdentifier)) {
434 if (auto var = impl->findVariable(vIdentifier)) {
403 this->onAbortProgressRequested(var);
435 this->onAbortProgressRequested(var);
404 }
436 }
405 else {
437 else {
406 qCCritical(LOG_VariableController())
438 qCCritical(LOG_VariableController())
407 << tr("Impossible to abort Acquisition Requestof a null variable");
439 << tr("Impossible to abort Acquisition Requestof a null variable");
408 }
440 }
409 }
441 }
410
442
411 void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
443 void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
412 {
444 {
413 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
445 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
414 << QThread::currentThread()->objectName()
446 << QThread::currentThread()->objectName()
415 << synchronizationGroupId;
447 << synchronizationGroupId;
416 auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>();
448 auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>();
417 impl->m_GroupIdToVariableSynchronizationGroupMap.insert(
449 impl->m_GroupIdToVariableSynchronizationGroupMap.insert(
418 std::make_pair(synchronizationGroupId, vSynchroGroup));
450 std::make_pair(synchronizationGroupId, vSynchroGroup));
419 }
451 }
420
452
421 void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId)
453 void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId)
422 {
454 {
423 impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId);
455 impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId);
424 }
456 }
425
457
426 void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
458 void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
427 QUuid synchronizationGroupId)
459 QUuid synchronizationGroupId)
428
460
429 {
461 {
430 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
462 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
431 << synchronizationGroupId;
463 << synchronizationGroupId;
432 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
464 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
433 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
465 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
434 auto groupIdToVSGIt
466 auto groupIdToVSGIt
435 = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
467 = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
436 if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
468 if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
437 impl->m_VariableIdGroupIdMap.insert(
469 impl->m_VariableIdGroupIdMap.insert(
438 std::make_pair(varToVarIdIt->second, synchronizationGroupId));
470 std::make_pair(varToVarIdIt->second, synchronizationGroupId));
439 groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
471 groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
440 }
472 }
441 else {
473 else {
442 qCCritical(LOG_VariableController())
474 qCCritical(LOG_VariableController())
443 << tr("Impossible to synchronize a variable with an unknown sycnhronization group")
475 << tr("Impossible to synchronize a variable with an unknown sycnhronization group")
444 << variable->name();
476 << variable->name();
445 }
477 }
446 }
478 }
447 else {
479 else {
448 qCCritical(LOG_VariableController())
480 qCCritical(LOG_VariableController())
449 << tr("Impossible to synchronize a variable with no identifier") << variable->name();
481 << tr("Impossible to synchronize a variable with no identifier") << variable->name();
450 }
482 }
451 }
483 }
452
484
453 void VariableController::desynchronize(std::shared_ptr<Variable> variable,
485 void VariableController::desynchronize(std::shared_ptr<Variable> variable,
454 QUuid synchronizationGroupId)
486 QUuid synchronizationGroupId)
455 {
487 {
456 // Gets variable id
488 // Gets variable id
457 auto variableIt = impl->m_VariableToIdentifierMap.find(variable);
489 auto variableIt = impl->m_VariableToIdentifierMap.find(variable);
458 if (variableIt == impl->m_VariableToIdentifierMap.cend()) {
490 if (variableIt == impl->m_VariableToIdentifierMap.cend()) {
459 qCCritical(LOG_VariableController())
491 qCCritical(LOG_VariableController())
460 << tr("Can't desynchronize variable %1: variable identifier not found")
492 << tr("Can't desynchronize variable %1: variable identifier not found")
461 .arg(variable->name());
493 .arg(variable->name());
462 return;
494 return;
463 }
495 }
464
496
465 // Gets synchronization group
497 // Gets synchronization group
466 auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
498 auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
467 if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
499 if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
468 qCCritical(LOG_VariableController())
500 qCCritical(LOG_VariableController())
469 << tr("Can't desynchronize variable %1: unknown synchronization group")
501 << tr("Can't desynchronize variable %1: unknown synchronization group")
470 .arg(variable->name());
502 .arg(variable->name());
471 return;
503 return;
472 }
504 }
473
505
474 auto variableId = variableIt->second;
506 auto variableId = variableIt->second;
475
507
476 // Removes variable from synchronization group
508 // Removes variable from synchronization group
477 auto synchronizationGroup = groupIt->second;
509 auto synchronizationGroup = groupIt->second;
478 synchronizationGroup->removeVariableId(variableId);
510 synchronizationGroup->removeVariableId(variableId);
479
511
480 // Removes link between variable and synchronization group
512 // Removes link between variable and synchronization group
481 impl->m_VariableIdGroupIdMap.erase(variableId);
513 impl->m_VariableIdGroupIdMap.erase(variableId);
482 }
514 }
483
515
484 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
516 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
485 const SqpRange &range, bool synchronise)
517 const SqpRange &range, bool synchronise)
486 {
518 {
487 // variables is assumed synchronized
519 // variables is assumed synchronized
488 // TODO: Asser variables synchronization
520 // TODO: Asser variables synchronization
489 // we want to load data of the variable for the dateTime.
521 // we want to load data of the variable for the dateTime.
490 if (variables.isEmpty()) {
522 if (variables.isEmpty()) {
491 return;
523 return;
492 }
524 }
493
525
494 auto varRequestId = QUuid::createUuid();
526 auto varRequestId = QUuid::createUuid();
495 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
527 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
496 << QThread::currentThread()->objectName() << varRequestId
528 << QThread::currentThread()->objectName() << varRequestId
497 << range;
529 << range << synchronise;
498
530
499 if (!synchronise) {
531 if (!synchronise) {
500 auto varIds = std::list<QUuid>{};
532 auto varIds = std::list<QUuid>{};
501 for (const auto &var : variables) {
533 for (const auto &var : variables) {
502 auto vId = impl->m_VariableToIdentifierMap.at(var);
534 auto vId = impl->m_VariableToIdentifierMap.at(var);
503 varIds.push_back(vId);
535 varIds.push_back(vId);
504 }
536 }
505 impl->m_VarGroupIdToVarIds.insert(std::make_pair(varRequestId, varIds));
537 impl->m_VarGroupIdToVarIds.insert(std::make_pair(varRequestId, varIds));
506 for (const auto &var : variables) {
538 for (const auto &var : variables) {
507 qCInfo(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId
539 qCInfo(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId
508 << varIds.size();
540 << varIds.size();
509 impl->processRequest(var, range, varRequestId);
541 impl->processRequest(var, range, varRequestId);
510 }
542 }
511 }
543 }
512 else {
544 else {
513 auto vId = impl->m_VariableToIdentifierMap.at(variables.first());
545 auto vId = impl->m_VariableToIdentifierMap.at(variables.first());
514 auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId);
546 auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId);
515 if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) {
547 if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) {
516 auto groupId = varIdToGroupIdIt->second;
548 auto groupId = varIdToGroupIdIt->second;
517
549
518 auto vSynchronizationGroup
550 auto vSynchronizationGroup
519 = impl->m_GroupIdToVariableSynchronizationGroupMap.at(groupId);
551 = impl->m_GroupIdToVariableSynchronizationGroupMap.at(groupId);
520 auto vSyncIds = vSynchronizationGroup->getIds();
552 auto vSyncIds = vSynchronizationGroup->getIds();
521
553
522 auto varIds = std::list<QUuid>{};
554 auto varIds = std::list<QUuid>{};
523 for (auto vId : vSyncIds) {
555 for (auto vId : vSyncIds) {
524 varIds.push_back(vId);
556 varIds.push_back(vId);
525 }
557 }
526 impl->m_VarGroupIdToVarIds.insert(std::make_pair(varRequestId, varIds));
558 impl->m_VarGroupIdToVarIds.insert(std::make_pair(varRequestId, varIds));
527
559
528 for (auto vId : vSyncIds) {
560 for (auto vId : vSyncIds) {
529 auto var = impl->findVariable(vId);
561 auto var = impl->findVariable(vId);
530
562
531 // Don't process already processed var
563 // Don't process already processed var
532 if (var != nullptr) {
564 if (var != nullptr) {
533 qCDebug(LOG_VariableController()) << "processRequest synchro for" << var->name()
565 qCDebug(LOG_VariableController()) << "processRequest synchro for" << var->name()
534 << varRequestId;
566 << varRequestId;
535 auto vSyncRangeRequested
567 auto vSyncRangeRequested
536 = variables.contains(var)
568 = variables.contains(var)
537 ? range
569 ? range
538 : computeSynchroRangeRequested(var->range(), range,
570 : computeSynchroRangeRequested(var->range(), range,
539 variables.first()->range());
571 variables.first()->range());
540 qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested;
572 qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested;
541 impl->processRequest(var, vSyncRangeRequested, varRequestId);
573 impl->processRequest(var, vSyncRangeRequested, varRequestId);
542 }
574 }
543 else {
575 else {
544 qCCritical(LOG_VariableController())
576 qCCritical(LOG_VariableController())
545
577
546 << tr("Impossible to synchronize a null variable");
578 << tr("Impossible to synchronize a null variable");
547 }
579 }
548 }
580 }
549 }
581 }
550 }
582 }
551
583
552 impl->updateVariables(varRequestId);
584 impl->updateVariables(varRequestId);
553 }
585 }
554
586
555
587
556 void VariableController::initialize()
588 void VariableController::initialize()
557 {
589 {
558 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
590 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
559 impl->m_WorkingMutex.lock();
591 impl->m_WorkingMutex.lock();
560 qCDebug(LOG_VariableController()) << tr("VariableController init END");
592 qCDebug(LOG_VariableController()) << tr("VariableController init END");
561 }
593 }
562
594
563 void VariableController::finalize()
595 void VariableController::finalize()
564 {
596 {
565 impl->m_WorkingMutex.unlock();
597 impl->m_WorkingMutex.unlock();
566 }
598 }
567
599
568 void VariableController::waitForFinish()
600 void VariableController::waitForFinish()
569 {
601 {
570 QMutexLocker locker{&impl->m_WorkingMutex};
602 QMutexLocker locker{&impl->m_WorkingMutex};
571 }
603 }
572
604
573 AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange)
605 AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange)
574 {
606 {
575 // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd
607 // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd
576 auto zoomType = AcquisitionZoomType::Unknown;
608 auto zoomType = AcquisitionZoomType::Unknown;
577 if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) {
609 if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) {
578 qCDebug(LOG_VariableController()) << "zoomtype: ZoomOut";
610 qCDebug(LOG_VariableController()) << "zoomtype: ZoomOut";
579 zoomType = AcquisitionZoomType::ZoomOut;
611 zoomType = AcquisitionZoomType::ZoomOut;
580 }
612 }
581 else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
613 else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
582 qCDebug(LOG_VariableController()) << "zoomtype: PanRight";
614 qCDebug(LOG_VariableController()) << "zoomtype: PanRight";
583 zoomType = AcquisitionZoomType::PanRight;
615 zoomType = AcquisitionZoomType::PanRight;
584 }
616 }
585 else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
617 else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
586 qCDebug(LOG_VariableController()) << "zoomtype: PanLeft";
618 qCDebug(LOG_VariableController()) << "zoomtype: PanLeft";
587 zoomType = AcquisitionZoomType::PanLeft;
619 zoomType = AcquisitionZoomType::PanLeft;
588 }
620 }
589 else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
621 else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
590 qCDebug(LOG_VariableController()) << "zoomtype: ZoomIn";
622 qCDebug(LOG_VariableController()) << "zoomtype: ZoomIn";
591 zoomType = AcquisitionZoomType::ZoomIn;
623 zoomType = AcquisitionZoomType::ZoomIn;
592 }
624 }
593 else {
625 else {
594 qCDebug(LOG_VariableController()) << "getZoomType: Unknown type detected";
626 qCDebug(LOG_VariableController()) << "getZoomType: Unknown type detected";
595 }
627 }
596 return zoomType;
628 return zoomType;
597 }
629 }
598
630
599 void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
631 void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
600 const SqpRange &rangeRequested,
632 const SqpRange &rangeRequested,
601 QUuid varRequestId)
633 QUuid varRequestId)
602 {
634 {
603 auto itVar = m_VariableToIdentifierMap.find(var);
635 auto itVar = m_VariableToIdentifierMap.find(var);
604 if (itVar == m_VariableToIdentifierMap.cend()) {
636 if (itVar == m_VariableToIdentifierMap.cend()) {
605 qCCritical(LOG_VariableController())
637 qCCritical(LOG_VariableController())
606 << tr("Impossible to process request for unknown variable");
638 << tr("Impossible to process request for unknown variable");
607 return;
639 return;
608 }
640 }
609
641
610 auto varId = itVar->second;
642 auto varId = itVar->second;
611
643
612 auto itVarHandler = m_VarIdToVarRequestHandler.find(varId);
644 auto itVarHandler = m_VarIdToVarRequestHandler.find(varId);
613 if (itVarHandler == m_VarIdToVarRequestHandler.cend()) {
645 if (itVarHandler == m_VarIdToVarRequestHandler.cend()) {
614 qCCritical(LOG_VariableController())
646 qCCritical(LOG_VariableController())
615 << tr("Impossible to process request for variable with unknown handler");
647 << tr("Impossible to process request for variable with unknown handler");
616 return;
648 return;
617 }
649 }
618
650
619 auto oldRange = var->range();
651 auto oldRange = var->range();
620
652
621 auto varHandler = itVarHandler->second.get();
653 auto varHandler = itVarHandler->second.get();
622
654
623 if (varHandler->m_State != VariableRequestHandlerState::OFF) {
655 if (varHandler->m_State != VariableRequestHandlerState::OFF) {
624 oldRange = varHandler->m_RunningVarRequest.m_RangeRequested;
656 oldRange = varHandler->m_RunningVarRequest.m_RangeRequested;
625 }
657 }
626
658
627 auto varRequest = VariableRequest{};
659 auto varRequest = VariableRequest{};
628 varRequest.m_VariableGroupId = varRequestId;
660 varRequest.m_VariableGroupId = varRequestId;
629 auto varStrategyRangesRequested
661 auto varStrategyRangesRequested
630 = m_VariableCacheStrategy->computeRange(oldRange, rangeRequested);
662 = m_VariableCacheStrategy->computeRange(oldRange, rangeRequested);
631 varRequest.m_RangeRequested = varStrategyRangesRequested.first;
663 varRequest.m_RangeRequested = varStrategyRangesRequested.first;
632 varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
664 varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second;
633
665
634 switch (varHandler->m_State) {
666 switch (varHandler->m_State) {
635 case VariableRequestHandlerState::OFF: {
667 case VariableRequestHandlerState::OFF: {
636 qCDebug(LOG_VariableController()) << tr("Process Request OFF")
668 qCDebug(LOG_VariableController()) << tr("Process Request OFF")
637 << varRequest.m_RangeRequested
669 << varRequest.m_RangeRequested
638 << varRequest.m_CacheRangeRequested;
670 << varRequest.m_CacheRangeRequested;
639 varHandler->m_RunningVarRequest = varRequest;
671 varHandler->m_RunningVarRequest = varRequest;
640 varHandler->m_State = VariableRequestHandlerState::RUNNING;
672 varHandler->m_State = VariableRequestHandlerState::RUNNING;
641 executeVarRequest(var, varRequest);
673 executeVarRequest(var, varRequest);
642 break;
674 break;
643 }
675 }
644 case VariableRequestHandlerState::RUNNING: {
676 case VariableRequestHandlerState::RUNNING: {
645 qCDebug(LOG_VariableController()) << tr("Process Request RUNNING")
677 qCDebug(LOG_VariableController()) << tr("Process Request RUNNING")
646 << varRequest.m_RangeRequested
678 << varRequest.m_RangeRequested
647 << varRequest.m_CacheRangeRequested;
679 << varRequest.m_CacheRangeRequested;
648 varHandler->m_State = VariableRequestHandlerState::PENDING;
680 varHandler->m_State = VariableRequestHandlerState::PENDING;
649 varHandler->m_PendingVarRequest = varRequest;
681 varHandler->m_PendingVarRequest = varRequest;
650 break;
682 break;
651 }
683 }
652 case VariableRequestHandlerState::PENDING: {
684 case VariableRequestHandlerState::PENDING: {
653 qCDebug(LOG_VariableController()) << tr("Process Request PENDING")
685 qCDebug(LOG_VariableController()) << tr("Process Request PENDING")
654 << varRequest.m_RangeRequested
686 << varRequest.m_RangeRequested
655 << varRequest.m_CacheRangeRequested;
687 << varRequest.m_CacheRangeRequested;
656 auto variableGroupIdToCancel = varHandler->m_PendingVarRequest.m_VariableGroupId;
688 auto variableGroupIdToCancel = varHandler->m_PendingVarRequest.m_VariableGroupId;
657 varHandler->m_PendingVarRequest = varRequest;
689 varHandler->m_PendingVarRequest = varRequest;
658 cancelVariableRequest(variableGroupIdToCancel);
690 cancelVariableRequest(variableGroupIdToCancel);
659
691
660 break;
692 break;
661 }
693 }
662 default:
694 default:
663 qCCritical(LOG_VariableController())
695 qCCritical(LOG_VariableController())
664 << QObject::tr("Unknown VariableRequestHandlerState");
696 << QObject::tr("Unknown VariableRequestHandlerState");
665 }
697 }
666 }
698 }
667
699
668 std::shared_ptr<Variable>
700 std::shared_ptr<Variable>
669 VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier)
701 VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier)
670 {
702 {
671 std::shared_ptr<Variable> var;
703 std::shared_ptr<Variable> var;
672 auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; };
704 auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; };
673
705
674 auto end = m_VariableToIdentifierMap.cend();
706 auto end = m_VariableToIdentifierMap.cend();
675 auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply);
707 auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply);
676 if (it != end) {
708 if (it != end) {
677 var = it->first;
709 var = it->first;
678 }
710 }
679 else {
711 else {
680 qCCritical(LOG_VariableController())
712 qCCritical(LOG_VariableController())
681 << tr("Impossible to find the variable with the identifier: ") << vIdentifier;
713 << tr("Impossible to find the variable with the identifier: ") << vIdentifier;
682 }
714 }
683
715
684 return var;
716 return var;
685 }
717 }
686
718
687 std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
719 std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
688 const QVector<AcquisitionDataPacket> acqDataPacketVector)
720 const QVector<AcquisitionDataPacket> acqDataPacketVector)
689 {
721 {
690 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
722 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
691 << acqDataPacketVector.size();
723 << acqDataPacketVector.size();
692 std::shared_ptr<IDataSeries> dataSeries;
724 std::shared_ptr<IDataSeries> dataSeries;
693 if (!acqDataPacketVector.isEmpty()) {
725 if (!acqDataPacketVector.isEmpty()) {
694 dataSeries = acqDataPacketVector[0].m_DateSeries;
726 dataSeries = acqDataPacketVector[0].m_DateSeries;
695 for (int i = 1; i < acqDataPacketVector.size(); ++i) {
727 for (int i = 1; i < acqDataPacketVector.size(); ++i) {
696 dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
728 dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
697 }
729 }
698 }
730 }
699 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
731 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
700 << acqDataPacketVector.size();
732 << acqDataPacketVector.size();
701 return dataSeries;
733 return dataSeries;
702 }
734 }
703
735
704 void VariableController::VariableControllerPrivate::registerProvider(
736 void VariableController::VariableControllerPrivate::registerProvider(
705 std::shared_ptr<IDataProvider> provider)
737 std::shared_ptr<IDataProvider> provider)
706 {
738 {
707 if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
739 if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
708 qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
740 qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
709 << provider->objectName();
741 << provider->objectName();
710 m_ProviderSet.insert(provider);
742 m_ProviderSet.insert(provider);
711 connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
743 connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
712 &VariableAcquisitionWorker::onVariableDataAcquired);
744 &VariableAcquisitionWorker::onVariableDataAcquired);
713 connect(provider.get(), &IDataProvider::dataProvidedProgress,
745 connect(provider.get(), &IDataProvider::dataProvidedProgress,
714 m_VariableAcquisitionWorker.get(),
746 m_VariableAcquisitionWorker.get(),
715 &VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
747 &VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
716 connect(provider.get(), &IDataProvider::dataProvidedFailed,
748 connect(provider.get(), &IDataProvider::dataProvidedFailed,
717 m_VariableAcquisitionWorker.get(),
749 m_VariableAcquisitionWorker.get(),
718 &VariableAcquisitionWorker::onVariableAcquisitionFailed);
750 &VariableAcquisitionWorker::onVariableAcquisitionFailed);
719 }
751 }
720 else {
752 else {
721 qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
753 qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
722 }
754 }
723 }
755 }
724
756
725 QUuid VariableController::VariableControllerPrivate::acceptVariableRequest(
757 QUuid VariableController::VariableControllerPrivate::acceptVariableRequest(
726 QUuid varId, std::shared_ptr<IDataSeries> dataSeries)
758 QUuid varId, std::shared_ptr<IDataSeries> dataSeries)
727 {
759 {
728 auto itVarHandler = m_VarIdToVarRequestHandler.find(varId);
760 auto itVarHandler = m_VarIdToVarRequestHandler.find(varId);
729 if (itVarHandler == m_VarIdToVarRequestHandler.cend()) {
761 if (itVarHandler == m_VarIdToVarRequestHandler.cend()) {
730 return QUuid();
762 return QUuid();
731 }
763 }
732
764
733 auto varHandler = itVarHandler->second.get();
765 auto varHandler = itVarHandler->second.get();
734 if (varHandler->m_State == VariableRequestHandlerState::OFF) {
766 if (varHandler->m_State == VariableRequestHandlerState::OFF) {
735 // TODO log impossible case !!!
767 // TODO log impossible case !!!
736 }
768 }
737
769
738 varHandler->m_RunningVarRequest.m_DataSeries = dataSeries;
770 varHandler->m_RunningVarRequest.m_DataSeries = dataSeries;
739 varHandler->m_CanUpdate = true;
771 varHandler->m_CanUpdate = true;
740
772
741 // Element traitΓ©, on a dΓ©jΓ  toutes les donnΓ©es necessaires
773 // Element traitΓ©, on a dΓ©jΓ  toutes les donnΓ©es necessaires
742 auto varGroupId = varHandler->m_RunningVarRequest.m_VariableGroupId;
774 auto varGroupId = varHandler->m_RunningVarRequest.m_VariableGroupId;
743 qCDebug(LOG_VariableController()) << "Variable::acceptVariableRequest" << varGroupId
775 qCDebug(LOG_VariableController()) << "Variable::acceptVariableRequest" << varGroupId
744 << m_VarGroupIdToVarIds.size();
776 << m_VarGroupIdToVarIds.size();
745
777
746 return varHandler->m_RunningVarRequest.m_VariableGroupId;
778 return varHandler->m_RunningVarRequest.m_VariableGroupId;
747 }
779 }
748
780
749 void VariableController::VariableControllerPrivate::updateVariables(QUuid varRequestId)
781 void VariableController::VariableControllerPrivate::updateVariables(QUuid varRequestId)
750 {
782 {
751 qCDebug(LOG_VariableController()) << "VariableControllerPrivate::updateVariables"
783 qCDebug(LOG_VariableController()) << "VariableControllerPrivate::updateVariables"
752 << QThread::currentThread()->objectName() << varRequestId;
784 << QThread::currentThread()->objectName() << varRequestId;
753
785
754 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
786 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
755 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
787 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
756 qCWarning(LOG_VariableController())
788 qCWarning(LOG_VariableController())
757 << tr("Impossible to updateVariables of unknown variables") << varRequestId;
789 << tr("Impossible to updateVariables of unknown variables") << varRequestId;
758 return;
790 return;
759 }
791 }
760
792
761 auto &varIds = varGroupIdToVarIdsIt->second;
793 auto &varIds = varGroupIdToVarIdsIt->second;
762 auto varIdsEnd = varIds.end();
794 auto varIdsEnd = varIds.end();
763 bool processVariableUpdate = true;
795 bool processVariableUpdate = true;
764 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd) && processVariableUpdate;
796 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd) && processVariableUpdate;
765 ++varIdsIt) {
797 ++varIdsIt) {
766 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
798 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
767 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
799 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
768 processVariableUpdate &= itVarHandler->second->m_CanUpdate;
800 processVariableUpdate &= itVarHandler->second->m_CanUpdate;
769 }
801 }
770 }
802 }
771
803
772 if (processVariableUpdate) {
804 if (processVariableUpdate) {
773 qCDebug(LOG_VariableController()) << "Final update OK for the var request" << varIds.size();
805 qCDebug(LOG_VariableController()) << "Final update OK for the var request" << varIds.size();
774 for (auto varIdsIt = varIds.begin(); varIdsIt != varIdsEnd; ++varIdsIt) {
806 for (auto varIdsIt = varIds.begin(); varIdsIt != varIdsEnd; ++varIdsIt) {
775 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
807 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
776 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
808 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
777 if (auto var = findVariable(*varIdsIt)) {
809 if (auto var = findVariable(*varIdsIt)) {
778 auto &varRequest = itVarHandler->second->m_RunningVarRequest;
810 auto &varRequest = itVarHandler->second->m_RunningVarRequest;
779 var->setRange(varRequest.m_RangeRequested);
811 var->setRange(varRequest.m_RangeRequested);
780 var->setCacheRange(varRequest.m_CacheRangeRequested);
812 var->setCacheRange(varRequest.m_CacheRangeRequested);
781 qCDebug(LOG_VariableController()) << tr("1: onDataProvided")
813 qCDebug(LOG_VariableController()) << tr("1: onDataProvided")
782 << varRequest.m_RangeRequested
814 << varRequest.m_RangeRequested
783 << varRequest.m_CacheRangeRequested;
815 << varRequest.m_CacheRangeRequested;
784 qCDebug(LOG_VariableController()) << tr("2: onDataProvided var points before")
816 qCDebug(LOG_VariableController()) << tr("2: onDataProvided var points before")
785 << var->nbPoints()
817 << var->nbPoints()
786 << varRequest.m_DataSeries->nbPoints();
818 << varRequest.m_DataSeries->nbPoints();
787 var->mergeDataSeries(varRequest.m_DataSeries);
819 var->mergeDataSeries(varRequest.m_DataSeries);
788 qCDebug(LOG_VariableController()) << tr("3: onDataProvided var points after")
820 qCDebug(LOG_VariableController()) << tr("3: onDataProvided var points after")
789 << var->nbPoints();
821 << var->nbPoints();
790
822
791 emit var->updated();
823 emit var->updated();
792 qCDebug(LOG_VariableController()) << tr("Update OK");
824 qCDebug(LOG_VariableController()) << tr("Update OK");
793 }
825 }
794 else {
826 else {
795 qCCritical(LOG_VariableController())
827 qCCritical(LOG_VariableController())
796 << tr("Impossible to update data to a null variable");
828 << tr("Impossible to update data to a null variable");
797 }
829 }
798 }
830 }
799 }
831 }
800 updateVariableRequest(varRequestId);
832 updateVariableRequest(varRequestId);
801
833
802 // cleaning varRequestId
834 // cleaning varRequestId
803 qCDebug(LOG_VariableController()) << tr("m_VarGroupIdToVarIds erase") << varRequestId;
835 qCDebug(LOG_VariableController()) << tr("m_VarGroupIdToVarIds erase") << varRequestId;
804 m_VarGroupIdToVarIds.erase(varRequestId);
836 m_VarGroupIdToVarIds.erase(varRequestId);
805 }
837 }
806 }
838 }
807
839
808
840
809 void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId)
841 void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId)
810 {
842 {
811 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
843 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
812 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
844 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
813 // TODO LOG cannot update variable request since varGroupdId isn't here anymore
845 // TODO LOG cannot update variable request since varGroupdId isn't here anymore
814 return;
846 return;
815 }
847 }
816
848
817 auto &varIds = varGroupIdToVarIdsIt->second;
849 auto &varIds = varGroupIdToVarIdsIt->second;
818 auto varIdsEnd = varIds.end();
850 auto varIdsEnd = varIds.end();
819 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
851 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
820 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
852 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
821 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
853 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
822
854
823 auto varHandler = itVarHandler->second.get();
855 auto varHandler = itVarHandler->second.get();
824 varHandler->m_CanUpdate = false;
856 varHandler->m_CanUpdate = false;
825
857
826
858
827 switch (varHandler->m_State) {
859 switch (varHandler->m_State) {
828 case VariableRequestHandlerState::OFF: {
860 case VariableRequestHandlerState::OFF: {
829 qCCritical(LOG_VariableController())
861 qCCritical(LOG_VariableController())
830 << QObject::tr("Impossible to update a variable with handler in OFF state");
862 << QObject::tr("Impossible to update a variable with handler in OFF state");
831 } break;
863 } break;
832 case VariableRequestHandlerState::RUNNING: {
864 case VariableRequestHandlerState::RUNNING: {
833 varHandler->m_State = VariableRequestHandlerState::OFF;
865 varHandler->m_State = VariableRequestHandlerState::OFF;
834 varHandler->m_RunningVarRequest = VariableRequest{};
866 varHandler->m_RunningVarRequest = VariableRequest{};
835 break;
867 break;
836 }
868 }
837 case VariableRequestHandlerState::PENDING: {
869 case VariableRequestHandlerState::PENDING: {
838 varHandler->m_State = VariableRequestHandlerState::RUNNING;
870 varHandler->m_State = VariableRequestHandlerState::RUNNING;
839 varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest;
871 varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest;
840 varHandler->m_PendingVarRequest = VariableRequest{};
872 varHandler->m_PendingVarRequest = VariableRequest{};
841 auto var = findVariable(itVarHandler->first);
873 auto var = findVariable(itVarHandler->first);
842 executeVarRequest(var, varHandler->m_RunningVarRequest);
874 executeVarRequest(var, varHandler->m_RunningVarRequest);
843 break;
875 break;
844 }
876 }
845 default:
877 default:
846 qCCritical(LOG_VariableController())
878 qCCritical(LOG_VariableController())
847 << QObject::tr("Unknown VariableRequestHandlerState");
879 << QObject::tr("Unknown VariableRequestHandlerState");
848 }
880 }
849 }
881 }
850 }
882 }
851 }
883 }
852
884
853
885
854 void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId)
886 void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId)
855 {
887 {
856 qCDebug(LOG_VariableController()) << tr("cancelVariableRequest") << varRequestId;
888 qCDebug(LOG_VariableController()) << tr("cancelVariableRequest") << varRequestId;
857
889
858 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
890 auto varGroupIdToVarIdsIt = m_VarGroupIdToVarIds.find(varRequestId);
859 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
891 if (varGroupIdToVarIdsIt == m_VarGroupIdToVarIds.end()) {
860 qCCritical(LOG_VariableController())
892 qCCritical(LOG_VariableController())
861 << tr("Impossible to cancelVariableRequest for unknown varGroupdId") << varRequestId;
893 << tr("Impossible to cancelVariableRequest for unknown varGroupdId") << varRequestId;
862 return;
894 return;
863 }
895 }
864
896
865 auto &varIds = varGroupIdToVarIdsIt->second;
897 auto &varIds = varGroupIdToVarIdsIt->second;
866 auto varIdsEnd = varIds.end();
898 auto varIdsEnd = varIds.end();
867 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
899 for (auto varIdsIt = varIds.begin(); (varIdsIt != varIdsEnd); ++varIdsIt) {
868 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
900 auto itVarHandler = m_VarIdToVarRequestHandler.find(*varIdsIt);
869 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
901 if (itVarHandler != m_VarIdToVarRequestHandler.cend()) {
870
902
871 auto varHandler = itVarHandler->second.get();
903 auto varHandler = itVarHandler->second.get();
872 varHandler->m_CanUpdate = false;
904 varHandler->m_CanUpdate = false;
873 varHandler->m_VarId = QUuid{};
905 varHandler->m_VarId = QUuid{};
874 switch (varHandler->m_State) {
906 switch (varHandler->m_State) {
875 case VariableRequestHandlerState::OFF: {
907 case VariableRequestHandlerState::OFF: {
876 qCWarning(LOG_VariableController())
908 qCWarning(LOG_VariableController())
877 << QObject::tr("Impossible to cancel a variable with no running request");
909 << QObject::tr("Impossible to cancel a variable with no running request");
878 break;
910 break;
879 }
911 }
880 case VariableRequestHandlerState::RUNNING: {
912 case VariableRequestHandlerState::RUNNING: {
881
913
882 if (varHandler->m_RunningVarRequest.m_VariableGroupId == varRequestId) {
914 if (varHandler->m_RunningVarRequest.m_VariableGroupId == varRequestId) {
883 auto var = findVariable(itVarHandler->first);
915 auto var = findVariable(itVarHandler->first);
884 auto varProvider = m_VariableToProviderMap.at(var);
916 auto varProvider = m_VariableToProviderMap.at(var);
885 if (varProvider != nullptr) {
917 if (varProvider != nullptr) {
886 m_VariableAcquisitionWorker->abortProgressRequested(
918 m_VariableAcquisitionWorker->abortProgressRequested(
887 itVarHandler->first);
919 itVarHandler->first);
888 }
920 }
889 m_VariableModel->setDataProgress(var, 0.0);
921 m_VariableModel->setDataProgress(var, 0.0);
890 varHandler->m_State = VariableRequestHandlerState::OFF;
922 varHandler->m_State = VariableRequestHandlerState::OFF;
891 varHandler->m_RunningVarRequest = VariableRequest{};
923 varHandler->m_RunningVarRequest = VariableRequest{};
892 }
924 }
893 else {
925 else {
894 // TODO: log Impossible to cancel the running variable request beacause its
926 // TODO: log Impossible to cancel the running variable request beacause its
895 // varRequestId isn't not the canceled one
927 // varRequestId isn't not the canceled one
896 }
928 }
897 break;
929 break;
898 }
930 }
899 case VariableRequestHandlerState::PENDING: {
931 case VariableRequestHandlerState::PENDING: {
900 if (varHandler->m_RunningVarRequest.m_VariableGroupId == varRequestId) {
932 if (varHandler->m_RunningVarRequest.m_VariableGroupId == varRequestId) {
901 auto var = findVariable(itVarHandler->first);
933 auto var = findVariable(itVarHandler->first);
902 auto varProvider = m_VariableToProviderMap.at(var);
934 auto varProvider = m_VariableToProviderMap.at(var);
903 if (varProvider != nullptr) {
935 if (varProvider != nullptr) {
904 m_VariableAcquisitionWorker->abortProgressRequested(
936 m_VariableAcquisitionWorker->abortProgressRequested(
905 itVarHandler->first);
937 itVarHandler->first);
906 }
938 }
907 m_VariableModel->setDataProgress(var, 0.0);
939 m_VariableModel->setDataProgress(var, 0.0);
908 varHandler->m_State = VariableRequestHandlerState::RUNNING;
940 varHandler->m_State = VariableRequestHandlerState::RUNNING;
909 varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest;
941 varHandler->m_RunningVarRequest = varHandler->m_PendingVarRequest;
910 executeVarRequest(var, varHandler->m_RunningVarRequest);
942 executeVarRequest(var, varHandler->m_RunningVarRequest);
911 }
943 }
912 else if (varHandler->m_PendingVarRequest.m_VariableGroupId == varRequestId) {
944 else if (varHandler->m_PendingVarRequest.m_VariableGroupId == varRequestId) {
913 varHandler->m_State = VariableRequestHandlerState::RUNNING;
945 varHandler->m_State = VariableRequestHandlerState::RUNNING;
914 varHandler->m_PendingVarRequest = VariableRequest{};
946 varHandler->m_PendingVarRequest = VariableRequest{};
915 }
947 }
916 else {
948 else {
917 // TODO: log Impossible to cancel the variable request beacause its
949 // TODO: log Impossible to cancel the variable request beacause its
918 // varRequestId isn't not the canceled one
950 // varRequestId isn't not the canceled one
919 }
951 }
920 break;
952 break;
921 }
953 }
922 default:
954 default:
923 qCCritical(LOG_VariableController())
955 qCCritical(LOG_VariableController())
924 << QObject::tr("Unknown VariableRequestHandlerState");
956 << QObject::tr("Unknown VariableRequestHandlerState");
925 }
957 }
926 }
958 }
927 }
959 }
928 qCDebug(LOG_VariableController()) << tr("cancelVariableRequest: erase") << varRequestId;
960 qCDebug(LOG_VariableController()) << tr("cancelVariableRequest: erase") << varRequestId;
929 m_VarGroupIdToVarIds.erase(varRequestId);
961 m_VarGroupIdToVarIds.erase(varRequestId);
930 }
962 }
931
963
932 void VariableController::VariableControllerPrivate::executeVarRequest(std::shared_ptr<Variable> var,
964 void VariableController::VariableControllerPrivate::executeVarRequest(std::shared_ptr<Variable> var,
933 VariableRequest &varRequest)
965 VariableRequest &varRequest)
934 {
966 {
935 qCDebug(LOG_VariableController()) << tr("TORM: executeVarRequest");
967 qCDebug(LOG_VariableController()) << tr("TORM: executeVarRequest");
936
968
937 auto varId = m_VariableToIdentifierMap.at(var);
969 auto varId = m_VariableToIdentifierMap.at(var);
938
970
939 auto varCacheRange = var->cacheRange();
971 auto varCacheRange = var->cacheRange();
940 auto varCacheRangeRequested = varRequest.m_CacheRangeRequested;
972 auto varCacheRangeRequested = varRequest.m_CacheRangeRequested;
941 auto notInCacheRangeList
973 auto notInCacheRangeList
942 = Variable::provideNotInCacheRangeList(varCacheRange, varCacheRangeRequested);
974 = Variable::provideNotInCacheRangeList(varCacheRange, varCacheRangeRequested);
943 // auto inCacheRangeList
975 // auto inCacheRangeList
944 // = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
976 // = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
945
977
946 if (!notInCacheRangeList.empty()) {
978 if (!notInCacheRangeList.empty()) {
947
979
948 auto varProvider = m_VariableToProviderMap.at(var);
980 auto varProvider = m_VariableToProviderMap.at(var);
949 if (varProvider != nullptr) {
981 if (varProvider != nullptr) {
950 qCDebug(LOG_VariableController()) << "executeVarRequest " << varRequest.m_RangeRequested
982 qCDebug(LOG_VariableController()) << "executeVarRequest " << varRequest.m_RangeRequested
951 << varRequest.m_CacheRangeRequested;
983 << varRequest.m_CacheRangeRequested;
952 m_VariableAcquisitionWorker->pushVariableRequest(
984 m_VariableAcquisitionWorker->pushVariableRequest(
953 varRequest.m_VariableGroupId, varId, varRequest.m_RangeRequested,
985 varRequest.m_VariableGroupId, varId, varRequest.m_RangeRequested,
954 varRequest.m_CacheRangeRequested,
986 varRequest.m_CacheRangeRequested,
955 DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
987 DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
956 varProvider);
988 varProvider);
957 }
989 }
958 else {
990 else {
959 qCCritical(LOG_VariableController())
991 qCCritical(LOG_VariableController())
960 << "Impossible to provide data with a null provider";
992 << "Impossible to provide data with a null provider";
961 }
993 }
962
994
963 // if (!inCacheRangeList.empty()) {
995 // if (!inCacheRangeList.empty()) {
964 // emit q->updateVarDisplaying(var, inCacheRangeList.first());
996 // emit q->updateVarDisplaying(var, inCacheRangeList.first());
965 // }
997 // }
966 }
998 }
967 else {
999 else {
968 acceptVariableRequest(varId,
1000 acceptVariableRequest(varId,
969 var->dataSeries()->subDataSeries(varRequest.m_CacheRangeRequested));
1001 var->dataSeries()->subDataSeries(varRequest.m_CacheRangeRequested));
970 }
1002 }
971 }
1003 }
General Comments 3
Under Review
perrinel
author
Comment #2315
Edit
Delete
|

Auto status change to "Under Review"

Approved
perrinel
author
Comment #2316
Edit
Delete
|

Merge lasted acquisition developpement on main Sciqlop branch

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