##// END OF EJS Templates
Add displaying of cache data available when new acquisition is requested
perrinel -
r835:c7820b3cad42
parent child
Show More
@@ -324,11 +324,9 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
324 << QThread::currentThread()->objectName();
324 << QThread::currentThread()->objectName();
325 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
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 if (selectedRows.size() == 1) {
329 auto variables = QVector<std::shared_ptr<Variable> >{};
330
331 // DEPRECATED
328 // DEPRECATED
329 // auto variables = QVector<std::shared_ptr<Variable> >{};
332 // for (const auto &selectedRow : qAsConst(selectedRows)) {
330 // for (const auto &selectedRow : qAsConst(selectedRows)) {
333 // if (auto selectedVariable =
331 // if (auto selectedVariable =
334 // impl->m_VariableModel->variable(selectedRow.row())) {
332 // impl->m_VariableModel->variable(selectedRow.row())) {
@@ -341,6 +339,8 void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
341 // if (!variables.isEmpty()) {
339 // if (!variables.isEmpty()) {
342 // this->onRequestDataLoading(variables, dateTime, synchro);
340 // this->onRequestDataLoading(variables, dateTime, synchro);
343 // }
341 // }
342 if (selectedRows.size() == 1) {
343
344 if (auto selectedVariable
344 if (auto selectedVariable
345 = impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
345 = impl->m_VariableModel->variable(qAsConst(selectedRows).first().row())) {
346
346
@@ -972,8 +972,8 void VariableController::VariableControllerPrivate::executeVarRequest(std::share
972 auto varCacheRangeRequested = varRequest.m_CacheRangeRequested;
972 auto varCacheRangeRequested = varRequest.m_CacheRangeRequested;
973 auto notInCacheRangeList
973 auto notInCacheRangeList
974 = Variable::provideNotInCacheRangeList(varCacheRange, varCacheRangeRequested);
974 = Variable::provideNotInCacheRangeList(varCacheRange, varCacheRangeRequested);
975 // auto inCacheRangeList
975 auto inCacheRangeList
976 // = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
976 = Variable::provideInCacheRangeList(varCacheRange, varCacheRangeRequested);
977
977
978 if (!notInCacheRangeList.empty()) {
978 if (!notInCacheRangeList.empty()) {
979
979
@@ -992,9 +992,9 void VariableController::VariableControllerPrivate::executeVarRequest(std::share
992 << "Impossible to provide data with a null provider";
992 << "Impossible to provide data with a null provider";
993 }
993 }
994
994
995 // if (!inCacheRangeList.empty()) {
995 if (!inCacheRangeList.empty()) {
996 // emit q->updateVarDisplaying(var, inCacheRangeList.first());
996 emit q->updateVarDisplaying(var, inCacheRangeList.first());
997 // }
997 }
998 }
998 }
999 else {
999 else {
1000 acceptVariableRequest(varId,
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