##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Correction for MR
perrinel -
r546:c13ea1918c0c
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,543 +1,541
1 1 #include <Variable/Variable.h>
2 2 #include <Variable/VariableAcquisitionWorker.h>
3 3 #include <Variable/VariableCacheController.h>
4 4 #include <Variable/VariableCacheStrategy.h>
5 5 #include <Variable/VariableController.h>
6 6 #include <Variable/VariableModel.h>
7 7 #include <Variable/VariableSynchronizationGroup.h>
8 8
9 9 #include <Data/DataProviderParameters.h>
10 10 #include <Data/IDataProvider.h>
11 11 #include <Data/IDataSeries.h>
12 12 #include <Time/TimeController.h>
13 13
14 14 #include <QMutex>
15 15 #include <QThread>
16 16 #include <QUuid>
17 17 #include <QtCore/QItemSelectionModel>
18 18
19 19 #include <set>
20 20 #include <unordered_map>
21 21
22 22 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
23 23
24 24 namespace {
25 25
26 26 SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange,
27 27 const SqpRange &oldGraphRange)
28 28 {
29 29 auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange);
30 30
31 31 auto varRangeRequested = varRange;
32 32 switch (zoomType) {
33 33 case AcquisitionZoomType::ZoomIn: {
34 34 auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart;
35 35 auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd;
36 36 varRangeRequested.m_TStart += deltaLeft;
37 37 varRangeRequested.m_TEnd -= deltaRight;
38 38 break;
39 39 }
40 40
41 41 case AcquisitionZoomType::ZoomOut: {
42 42 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
43 43 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
44 44 varRangeRequested.m_TStart -= deltaLeft;
45 45 varRangeRequested.m_TEnd += deltaRight;
46 46 break;
47 47 }
48 48 case AcquisitionZoomType::PanRight: {
49 49 auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd;
50 50 varRangeRequested.m_TStart += deltaRight;
51 51 varRangeRequested.m_TEnd += deltaRight;
52 52 break;
53 53 }
54 54 case AcquisitionZoomType::PanLeft: {
55 55 auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart;
56 56 varRangeRequested.m_TStart -= deltaLeft;
57 57 varRangeRequested.m_TEnd -= deltaLeft;
58 58 break;
59 59 }
60 60 case AcquisitionZoomType::Unknown: {
61 61 qCCritical(LOG_VariableController())
62 62 << VariableController::tr("Impossible to synchronize: zoom type unknown");
63 63 break;
64 64 }
65 65 default:
66 66 qCCritical(LOG_VariableController()) << VariableController::tr(
67 67 "Impossible to synchronize: zoom type not take into account");
68 68 // No action
69 69 break;
70 70 }
71 71
72 72 return varRangeRequested;
73 73 }
74 74 }
75 75
76 76 struct VariableController::VariableControllerPrivate {
77 77 explicit VariableControllerPrivate(VariableController *parent)
78 78 : m_WorkingMutex{},
79 79 m_VariableModel{new VariableModel{parent}},
80 80 m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
81 81 m_VariableCacheController{std::make_unique<VariableCacheController>()},
82 82 m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()},
83 83 m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}
84 84 {
85 85
86 86 m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread);
87 87 m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread");
88 88 }
89 89
90 90
91 91 virtual ~VariableControllerPrivate()
92 92 {
93 93 qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction");
94 94 m_VariableAcquisitionWorkerThread.quit();
95 95 m_VariableAcquisitionWorkerThread.wait();
96 96 }
97 97
98 98
99 99 void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested);
100 100
101 101 QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable,
102 102 const SqpRange &dateTime);
103 103
104 104 std::shared_ptr<Variable> findVariable(QUuid vIdentifier);
105 105 std::shared_ptr<IDataSeries>
106 106 retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector);
107 107
108 108 void registerProvider(std::shared_ptr<IDataProvider> provider);
109 109
110 110 QMutex m_WorkingMutex;
111 111 /// Variable model. The VariableController has the ownership
112 112 VariableModel *m_VariableModel;
113 113 QItemSelectionModel *m_VariableSelectionModel;
114 114
115 115
116 116 TimeController *m_TimeController{nullptr};
117 117 std::unique_ptr<VariableCacheController> m_VariableCacheController;
118 118 std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy;
119 119 std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker;
120 120 QThread m_VariableAcquisitionWorkerThread;
121 121
122 122 std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> >
123 123 m_VariableToProviderMap;
124 124 std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap;
125 125 std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> >
126 126 m_GroupIdToVariableSynchronizationGroupMap;
127 127 std::map<QUuid, QUuid> m_VariableIdGroupIdMap;
128 128 std::set<std::shared_ptr<IDataProvider> > m_ProviderSet;
129 129 };
130 130
131 131
132 132 VariableController::VariableController(QObject *parent)
133 133 : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)}
134 134 {
135 135 qCDebug(LOG_VariableController()) << tr("VariableController construction")
136 136 << QThread::currentThread();
137 137
138 138 connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this,
139 139 &VariableController::onAbortProgressRequested);
140 140
141 141 connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this,
142 142 &VariableController::onDataProvided);
143 143 connect(impl->m_VariableAcquisitionWorker.get(),
144 144 &VariableAcquisitionWorker::variableRequestInProgress, this,
145 145 &VariableController::onVariableRetrieveDataInProgress);
146 146
147 147 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started,
148 148 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize);
149 149 connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished,
150 150 impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize);
151 151
152 152
153 153 impl->m_VariableAcquisitionWorkerThread.start();
154 154 }
155 155
156 156 VariableController::~VariableController()
157 157 {
158 158 qCDebug(LOG_VariableController()) << tr("VariableController destruction")
159 159 << QThread::currentThread();
160 160 this->waitForFinish();
161 161 }
162 162
163 163 VariableModel *VariableController::variableModel() noexcept
164 164 {
165 165 return impl->m_VariableModel;
166 166 }
167 167
168 168 QItemSelectionModel *VariableController::variableSelectionModel() noexcept
169 169 {
170 170 return impl->m_VariableSelectionModel;
171 171 }
172 172
173 173 void VariableController::setTimeController(TimeController *timeController) noexcept
174 174 {
175 175 impl->m_TimeController = timeController;
176 176 }
177 177
178 178 void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept
179 179 {
180 180 if (!variable) {
181 181 qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null";
182 182 return;
183 183 }
184 184
185 185 // Spreads in SciQlop that the variable will be deleted, so that potential receivers can
186 186 // make some treatments before the deletion
187 187 emit variableAboutToBeDeleted(variable);
188 188
189 189 // Deletes identifier
190 190 impl->m_VariableToIdentifierMap.erase(variable);
191 191
192 192 // Deletes provider
193 193 auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable);
194 194 qCDebug(LOG_VariableController())
195 195 << tr("Number of providers deleted for variable %1: %2")
196 196 .arg(variable->name(), QString::number(nbProvidersDeleted));
197 197
198 198 // Clears cache
199 199 impl->m_VariableCacheController->clear(variable);
200 200
201 201 // Deletes from model
202 202 impl->m_VariableModel->deleteVariable(variable);
203 203 }
204 204
205 205 void VariableController::deleteVariables(
206 206 const QVector<std::shared_ptr<Variable> > &variables) noexcept
207 207 {
208 208 for (auto variable : qAsConst(variables)) {
209 209 deleteVariable(variable);
210 210 }
211 211 }
212 212
213 213 void VariableController::abortProgress(std::shared_ptr<Variable> variable)
214 214 {
215 215 }
216 216
217 217 void VariableController::createVariable(const QString &name, const QVariantHash &metadata,
218 218 std::shared_ptr<IDataProvider> provider) noexcept
219 219 {
220 220
221 221 if (!impl->m_TimeController) {
222 222 qCCritical(LOG_VariableController())
223 223 << tr("Impossible to create variable: The time controller is null");
224 224 return;
225 225 }
226 226
227 227 auto range = impl->m_TimeController->dateTime();
228 228
229 229 if (auto newVariable = impl->m_VariableModel->createVariable(name, range, metadata)) {
230 230 auto identifier = QUuid::createUuid();
231 231
232 232 // store the provider
233 233 impl->registerProvider(provider);
234 234
235 235 // Associate the provider
236 236 impl->m_VariableToProviderMap[newVariable] = provider;
237 237 impl->m_VariableToIdentifierMap[newVariable] = identifier;
238 238
239 239
240 240 impl->processRequest(newVariable, range);
241 241 }
242 242 }
243 243
244 244 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
245 245 {
246 246 // TODO check synchronisation
247 247 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
248 248 << QThread::currentThread()->objectName();
249 249 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
250 250
251 251 for (const auto &selectedRow : qAsConst(selectedRows)) {
252 252 if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
253 253 selectedVariable->setRange(dateTime);
254 254 impl->processRequest(selectedVariable, dateTime);
255 255
256 256 // notify that rescale operation has to be done
257 257 emit rangeChanged(selectedVariable, dateTime);
258 258 }
259 259 }
260 260 }
261 261
262 262 void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
263 263 const SqpRange &cacheRangeRequested,
264 264 QVector<AcquisitionDataPacket> dataAcquired)
265 265 {
266 auto var = impl->findVariable(vIdentifier);
267 if (var != nullptr) {
266 if (auto var = impl->findVariable(vIdentifier)) {
268 267 var->setRange(rangeRequested);
269 268 var->setCacheRange(cacheRangeRequested);
270 269 qCDebug(LOG_VariableController()) << tr("1: onDataProvided") << rangeRequested;
271 270 qCDebug(LOG_VariableController()) << tr("2: onDataProvided") << cacheRangeRequested;
272 271
273 272 auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired);
274 273 qCDebug(LOG_VariableController()) << tr("3: onDataProvided")
275 274 << retrievedDataSeries->range();
276 275 var->mergeDataSeries(retrievedDataSeries);
277 276 qCDebug(LOG_VariableController()) << tr("4: onDataProvided");
278 277 emit var->updated();
279 278 }
280 279 else {
281 280 qCCritical(LOG_VariableController()) << tr("Impossible to provide data to a null variable");
282 281 }
283 282 }
284 283
285 284 void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress)
286 285 {
287 auto var = impl->findVariable(identifier);
288 if (var != nullptr) {
286 if (auto var = impl->findVariable(identifier)) {
289 287 impl->m_VariableModel->setDataProgress(var, progress);
290 288 }
291 289 else {
292 290 qCCritical(LOG_VariableController())
293 291 << tr("Impossible to notify progression of a null variable");
294 292 }
295 293 }
296 294
297 295 void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable)
298 296 {
299 297 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAbortProgressRequested"
300 298 << QThread::currentThread()->objectName();
301 299
302 300 auto it = impl->m_VariableToIdentifierMap.find(variable);
303 301 if (it != impl->m_VariableToIdentifierMap.cend()) {
304 302 impl->m_VariableToProviderMap.at(variable)->requestDataAborting(it->second);
305 303 }
306 304 else {
307 305 qCWarning(LOG_VariableController())
308 306 << tr("Aborting progression of inexistant variable detected !!!")
309 307 << QThread::currentThread()->objectName();
310 308 }
311 309 }
312 310
313 311 void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId)
314 312 {
315 313 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId"
316 314 << QThread::currentThread()->objectName()
317 315 << synchronizationGroupId;
318 316 auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>();
319 317 impl->m_GroupIdToVariableSynchronizationGroupMap.insert(
320 318 std::make_pair(synchronizationGroupId, vSynchroGroup));
321 319 }
322 320
323 321 void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId)
324 322 {
325 323 impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId);
326 324 }
327 325
328 326 void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable,
329 327 QUuid synchronizationGroupId)
330 328
331 329 {
332 330 qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized"
333 331 << synchronizationGroupId;
334 auto vToVIdit = impl->m_VariableToIdentifierMap.find(variable);
335 if (vToVIdit != impl->m_VariableToIdentifierMap.cend()) {
336 auto itSynchroGroup
332 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable);
333 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
334 auto groupIdToVSGIt
337 335 = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId);
338 if (itSynchroGroup != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
336 if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) {
339 337 impl->m_VariableIdGroupIdMap.insert(
340 std::make_pair(vToVIdit->second, synchronizationGroupId));
341 itSynchroGroup->second->addVariableId(vToVIdit->second);
338 std::make_pair(varToVarIdIt->second, synchronizationGroupId));
339 groupIdToVSGIt->second->addVariableId(varToVarIdIt->second);
342 340 }
343 341 else {
344 342 qCCritical(LOG_VariableController())
345 343 << tr("Impossible to synchronize a variable with an unknown sycnhronization group")
346 344 << variable->name();
347 345 }
348 346 }
349 347 else {
350 348 qCCritical(LOG_VariableController())
351 349 << tr("Impossible to synchronize a variable with no identifier") << variable->name();
352 350 }
353 351 }
354 352
355 353
356 354 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
357 355 const SqpRange &range, const SqpRange &oldRange,
358 356 bool synchronise)
359 357 {
360 358 // NOTE: oldRange isn't really necessary since oldRange == variable->range().
361 359
362 qCInfo(LOG_VariableController()) << "VariableController::onRequestDataLoading"
360 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
363 361 << QThread::currentThread()->objectName();
364 362 // we want to load data of the variable for the dateTime.
365 363 // First we check if the cache contains some of them.
366 364 // For the other, we ask the provider to give them.
367 365
368 foreach (auto var, variables) {
366 for (const auto &var : variables) {
369 367 qCDebug(LOG_VariableController()) << "processRequest for" << var->name();
370 368 impl->processRequest(var, range);
371 369 }
372 370
373 371 if (synchronise) {
374 372 // Get the group ids
375 373 qCDebug(LOG_VariableController())
376 << "VariableController::onRequestDataLoading for synchro var ENABLE";
374 << "TORM VariableController::onRequestDataLoading for synchro var ENABLE";
377 375 auto groupIds = std::set<QUuid>();
378 foreach (auto var, variables) {
376 for (const auto &var : variables) {
379 377 auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var);
380 378 if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) {
381 379 auto vId = varToVarIdIt->second;
382 380 auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId);
383 381 if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) {
384 382 auto gId = varIdToGroupIdIt->second;
385 383 if (groupIds.find(gId) == groupIds.cend()) {
386 384 qCDebug(LOG_VariableController()) << "Synchro detect group " << gId;
387 385 groupIds.insert(gId);
388 386 }
389 387 }
390 388 }
391 389 }
392 390
393 391 // We assume here all group ids exist
394 foreach (auto gId, groupIds) {
392 for (const auto &gId : groupIds) {
395 393 auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId);
396 394 auto vSyncIds = vSynchronizationGroup->getIds();
397 395 qCDebug(LOG_VariableController()) << "Var in synchro group ";
398 396 for (auto vId : vSyncIds) {
399 397 auto var = impl->findVariable(vId);
400 398
401 399 // Don't process already processed var
402 400 if (!variables.contains(var)) {
403 401 if (var != nullptr) {
404 402 qCDebug(LOG_VariableController()) << "processRequest synchro for"
405 403 << var->name();
406 404 auto vSyncRangeRequested
407 405 = computeSynchroRangeRequested(var->range(), range, oldRange);
408 406 impl->processRequest(var, vSyncRangeRequested);
409 407 }
410 408 else {
411 409 qCCritical(LOG_VariableController())
412 410
413 411 << tr("Impossible to synchronize a null variable");
414 412 }
415 413 }
416 414 }
417 415 }
418 416 }
419 417 }
420 418
421 419
422 420 void VariableController::initialize()
423 421 {
424 422 qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread();
425 423 impl->m_WorkingMutex.lock();
426 424 qCDebug(LOG_VariableController()) << tr("VariableController init END");
427 425 }
428 426
429 427 void VariableController::finalize()
430 428 {
431 429 impl->m_WorkingMutex.unlock();
432 430 }
433 431
434 432 void VariableController::waitForFinish()
435 433 {
436 434 QMutexLocker locker{&impl->m_WorkingMutex};
437 435 }
438 436
439 437 AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange)
440 438 {
441 439 // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd
442 440 auto zoomType = AcquisitionZoomType::Unknown;
443 441 if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) {
444 442 zoomType = AcquisitionZoomType::ZoomOut;
445 443 }
446 444 else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) {
447 445 zoomType = AcquisitionZoomType::PanRight;
448 446 }
449 447 else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) {
450 448 zoomType = AcquisitionZoomType::PanLeft;
451 449 }
452 450 else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) {
453 451 zoomType = AcquisitionZoomType::ZoomIn;
454 452 }
455 453 else {
456 454 qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected";
457 455 }
458 456 return zoomType;
459 457 }
460 458
461 459 void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var,
462 460 const SqpRange &rangeRequested)
463 461 {
464 462
465 463 auto varRangesRequested
466 464 = m_VariableCacheStrategy->computeCacheRange(var->range(), rangeRequested);
467 465 auto notInCacheRangeList = var->provideNotInCacheRangeList(varRangesRequested.second);
468 466
469 467 if (!notInCacheRangeList.empty()) {
470 468 auto identifier = m_VariableToIdentifierMap.at(var);
471 469 auto varProvider = m_VariableToProviderMap.at(var);
472 470 if (varProvider != nullptr) {
473 471 m_VariableAcquisitionWorker->pushVariableRequest(
474 472 identifier, varRangesRequested.first, varRangesRequested.second,
475 473 DataProviderParameters{std::move(notInCacheRangeList), var->metadata()},
476 474 varProvider);
477 475 }
478 476 else {
479 477 qCCritical(LOG_VariableController())
480 478 << "Impossible to provide data with a null provider";
481 479 }
482 480 }
483 481 else {
484 482 var->setRange(rangeRequested);
485 483 var->setCacheRange(varRangesRequested.second);
486 484 var->setDataSeries(var->dataSeries()->subData(varRangesRequested.second));
487 485 emit var->updated();
488 486 }
489 487 }
490 488
491 489 std::shared_ptr<Variable>
492 490 VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier)
493 491 {
494 492 std::shared_ptr<Variable> var;
495 493 auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; };
496 494
497 495 auto end = m_VariableToIdentifierMap.cend();
498 496 auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply);
499 497 if (it != end) {
500 498 var = it->first;
501 499 }
502 500 else {
503 501 qCCritical(LOG_VariableController())
504 502 << tr("Impossible to find the variable with the identifier: ") << vIdentifier;
505 503 }
506 504
507 505 return var;
508 506 }
509 507
510 508 std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries(
511 509 const QVector<AcquisitionDataPacket> acqDataPacketVector)
512 510 {
513 511 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size")
514 512 << acqDataPacketVector.size();
515 513 std::shared_ptr<IDataSeries> dataSeries;
516 514 if (!acqDataPacketVector.isEmpty()) {
517 515 dataSeries = acqDataPacketVector[0].m_DateSeries;
518 516 for (int i = 1; i < acqDataPacketVector.size(); ++i) {
519 517 dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get());
520 518 }
521 519 }
522 520 qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END")
523 521 << acqDataPacketVector.size();
524 522 return dataSeries;
525 523 }
526 524
527 525 void VariableController::VariableControllerPrivate::registerProvider(
528 526 std::shared_ptr<IDataProvider> provider)
529 527 {
530 528 if (m_ProviderSet.find(provider) == m_ProviderSet.end()) {
531 529 qCDebug(LOG_VariableController()) << tr("Registering of a new provider")
532 530 << provider->objectName();
533 531 m_ProviderSet.insert(provider);
534 532 connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(),
535 533 &VariableAcquisitionWorker::onVariableDataAcquired);
536 534 connect(provider.get(), &IDataProvider::dataProvidedProgress,
537 535 m_VariableAcquisitionWorker.get(),
538 536 &VariableAcquisitionWorker::onVariableRetrieveDataInProgress);
539 537 }
540 538 else {
541 539 qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists ");
542 540 }
543 541 }
Show file before | Show file after | Hide comments
@@ -1,148 +1,150
1 1 #include "AmdaProvider.h"
2 2 #include "AmdaDefs.h"
3 3 #include "AmdaResultParser.h"
4 4
5 5 #include <Common/DateUtils.h>
6 6 #include <Data/DataProviderParameters.h>
7 7 #include <Network/NetworkController.h>
8 8 #include <SqpApplication.h>
9 9 #include <Variable/Variable.h>
10 10
11 11 #include <QNetworkAccessManager>
12 12 #include <QNetworkReply>
13 13 #include <QTemporaryFile>
14 14 #include <QThread>
15 15
16 16 Q_LOGGING_CATEGORY(LOG_AmdaProvider, "AmdaProvider")
17 17
18 18 namespace {
19 19
20 20 /// URL format for a request on AMDA server. The parameters are as follows:
21 21 /// - %1: start date
22 22 /// - %2: end date
23 23 /// - %3: parameter id
24 24 const auto AMDA_URL_FORMAT = QStringLiteral(
25 25 "http://amda.irap.omp.eu/php/rest/"
26 26 "getParameter.php?startTime=%1&stopTime=%2&parameterID=%3&outputFormat=ASCII&"
27 27 "timeFormat=ISO8601&gzip=0");
28 28
29 29 /// Dates format passed in the URL (e.g 2013-09-23T09:00)
30 30 const auto AMDA_TIME_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss");
31 31
32 32 /// Formats a time to a date that can be passed in URL
33 33 QString dateFormat(double sqpRange) noexcept
34 34 {
35 35 auto dateTime = DateUtils::dateTime(sqpRange);
36 36 return dateTime.toString(AMDA_TIME_FORMAT);
37 37 }
38 38
39 39 } // namespace
40 40
41 41 AmdaProvider::AmdaProvider()
42 42 {
43 43 qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::AmdaProvider") << QThread::currentThread();
44 44 if (auto app = sqpApp) {
45 45 auto &networkController = app->networkController();
46 46 connect(this, SIGNAL(requestConstructed(QNetworkRequest, QUuid,
47 47 std::function<void(QNetworkReply *, QUuid)>)),
48 48 &networkController,
49 49 SLOT(onProcessRequested(QNetworkRequest, QUuid,
50 50 std::function<void(QNetworkReply *, QUuid)>)));
51 51
52 52
53 53 connect(&sqpApp->networkController(), SIGNAL(replyDownloadProgress(QUuid, double)), this,
54 54 SIGNAL(dataProvidedProgress(QUuid, double)));
55 55 }
56 56 }
57 57
58 58 void AmdaProvider::requestDataLoading(QUuid acqIdentifier, const DataProviderParameters &parameters)
59 59 {
60 60 // NOTE: Try to use multithread if possible
61 61 const auto times = parameters.m_Times;
62 62 const auto data = parameters.m_Data;
63 63 for (const auto &dateTime : qAsConst(times)) {
64 64 this->retrieveData(acqIdentifier, dateTime, data);
65 QThread::msleep(200);
65
66 // TORM
67 // QThread::msleep(200);
66 68 }
67 69 }
68 70
69 71 void AmdaProvider::requestDataAborting(QUuid acqIdentifier)
70 72 {
71 73 if (auto app = sqpApp) {
72 74 auto &networkController = app->networkController();
73 75 networkController.onReplyCanceled(acqIdentifier);
74 76 }
75 77 }
76 78
77 79 void AmdaProvider::retrieveData(QUuid token, const SqpRange &dateTime, const QVariantHash &data)
78 80 {
79 81 // Retrieves product ID from data: if the value is invalid, no request is made
80 82 auto productId = data.value(AMDA_XML_ID_KEY).toString();
81 83 if (productId.isNull()) {
82 84 qCCritical(LOG_AmdaProvider()) << tr("Can't retrieve data: unknown product id");
83 85 return;
84 86 }
85 87 qCDebug(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData") << dateTime;
86 88
87 89 // /////////// //
88 90 // Creates URL //
89 91 // /////////// //
90 92
91 93 auto startDate = dateFormat(dateTime.m_TStart);
92 94 auto endDate = dateFormat(dateTime.m_TEnd);
93 95
94 96 auto url = QUrl{QString{AMDA_URL_FORMAT}.arg(startDate, endDate, productId)};
95 qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData url:") << url;
97 qCInfo(LOG_AmdaProvider()) << tr("TORM AmdaProvider::retrieveData url:") << url;
96 98 auto tempFile = std::make_shared<QTemporaryFile>();
97 99
98 100 // LAMBDA
99 101 auto httpDownloadFinished
100 102 = [this, dateTime, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
101 103
102 104 // Don't do anything if the reply was abort
103 105 if (reply->error() != QNetworkReply::OperationCanceledError) {
104 106
105 107 if (tempFile) {
106 108 auto replyReadAll = reply->readAll();
107 109 if (!replyReadAll.isEmpty()) {
108 110 tempFile->write(replyReadAll);
109 111 }
110 112 tempFile->close();
111 113
112 114 // Parse results file
113 115 if (auto dataSeries = AmdaResultParser::readTxt(tempFile->fileName())) {
114 116 emit dataProvided(dataId, dataSeries, dateTime);
115 117 }
116 118 else {
117 119 /// @todo ALX : debug
118 120 }
119 121 }
120 122 }
121 123
122 124 };
123 125 auto httpFinishedLambda
124 126 = [this, httpDownloadFinished, tempFile](QNetworkReply *reply, QUuid dataId) noexcept {
125 127
126 128 // Don't do anything if the reply was abort
127 129 if (reply->error() != QNetworkReply::OperationCanceledError) {
128 130 auto downloadFileUrl = QUrl{QString{reply->readAll()}};
129 131
130 132
131 qCInfo(LOG_AmdaProvider()) << tr("AmdaProvider::retrieveData downloadFileUrl:")
132 << downloadFileUrl;
133 qCInfo(LOG_AmdaProvider())
134 << tr("TORM AmdaProvider::retrieveData downloadFileUrl:") << downloadFileUrl;
133 135 // Executes request for downloading file //
134 136
135 137 // Creates destination file
136 138 if (tempFile->open()) {
137 139 // Executes request
138 140 emit requestConstructed(QNetworkRequest{downloadFileUrl}, dataId,
139 141 httpDownloadFinished);
140 142 }
141 143 }
142 144 };
143 145
144 146 // //////////////// //
145 147 // Executes request //
146 148 // //////////////// //
147 149 emit requestConstructed(QNetworkRequest{url}, token, httpFinishedLambda);
148 150 }
General Comments 0
You need to be logged in to leave comments. Login now