##// END OF EJS Templates
Add displaying of cache data available when new acquisition is requested
perrinel -
r835:c7820b3cad42
parent child
Show More
@@ -324,23 +324,23 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
324 324 << QThread::currentThread()->objectName();
325 325 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
326 326
327 // NOTE we only permit the time modification for one varai
327 // NOTE we only permit the time modification for one variable
328 // DEPRECATED
329 // auto variables = QVector<std::shared_ptr<Variable> >{};
330 // for (const auto &selectedRow : qAsConst(selectedRows)) {
331 // if (auto selectedVariable =
332 // impl->m_VariableModel->variable(selectedRow.row())) {
333 // variables << selectedVariable;
334
335 // // notify that rescale operation has to be done
336 // emit rangeChanged(selectedVariable, dateTime);
337 // }
338 // }
339 // if (!variables.isEmpty()) {
340 // this->onRequestDataLoading(variables, dateTime, synchro);
341 // }
328 342 if (selectedRows.size() == 1) {
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 // }
343
344 344 if (auto selectedVariable
345 345 = impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
346 346
@@ -525,8 +525,8 void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable>
525 525
526 526 auto varRequestId = QUuid::createUuid();
527 527 qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading"
528 << QThread::currentThread()->objectName() << varRequestId
529 << range << synchronise;
528 << QThread::currentThread()->objectName() << varRequestId
529 << range << synchronise;
530 530
531 531 if (!synchronise) {
532 532 auto varIds = std::list<QUuid>{};
@@ -972,8 +972,8 void VariableController::VariableControllerPrivate::executeVarRequest(std::share
972 972 auto varCacheRangeRequested = varRequest.m_CacheRangeRequested;
973 973 auto notInCacheRangeList
974 974 = Variable::provideNotInCacheRangeList(varCacheRange, varCacheRangeRequested);
975 // auto inCacheRangeList
976 // = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
975 auto inCacheRangeList
976 = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
977 977
978 978 if (!notInCacheRangeList.empty()) {
979 979
@@ -992,9 +992,9 void VariableController::VariableControllerPrivate::executeVarRequest(std::share
992 992 << "Impossible to provide data with a null provider";
993 993 }
994 994
995 // if (!inCacheRangeList.empty()) {
996 // emit q->updateVarDisplaying(var, inCacheRangeList.first());
997 // }
995 if (!inCacheRangeList.empty()) {
996 emit q->updateVarDisplaying(var, inCacheRangeList.first());
997 }
998 998 }
999 999 else {
1000 1000 acceptVariableRequest(varId,
General Comments 3
Under Review
author

Auto status change to "Under Review"

Approved
author

Merge lasted acquisition developpement on main Sciqlop branch

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