GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r816:b41b5a9346eb

Implémentation timewidget

perrinel -

r816:b41b5a9346eb

parent child

Context file:

r816:b41b5a9346eb

core/include/Variable/VariableController.h +1 -1

             public slots:
                 /// Request the data loading of the variable whithin range
                 void onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables, const SqpRange &range,
-                                          const SqpRange &oldRange, bool synchronise);
+                                          bool synchronise);
                 /**
                  * Creates a new variable and adds it to the model
                  * @param name the name of the new variable

core/src/Variable/VariableController.cpp +8 -7

             void VariableController::onDateTimeOnSelection(const SqpRange &dateTime)
             {
-                // TODO check synchronisation and Rescale
+                // NOTE: Even if acquisition request is aborting, the graphe range will be changed
                 qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection"
                                                   << QThread::currentThread()->objectName();
                 auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
-                auto varRequestId = QUuid::createUuid();
+                auto variables = QVector<std::shared_ptr<Variable> >{};
                 for (const auto &selectedRow : qAsConst(selectedRows)) {
                     if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
-                        selectedVariable->setRange(dateTime);
+                        variables << selectedVariable;
-                        impl->processRequest(selectedVariable, dateTime, varRequestId);
                         // notify that rescale operation has to be done
                         emit rangeChanged(selectedVariable, dateTime);
                     }
                 }
-                impl->updateVariableRequest(varRequestId);
+                if (!variables.isEmpty()) {
+                    this->onRequestDataLoading(variables, dateTime, true);
+                }
             }
             void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested,
             }
             void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables,
-                                                          const SqpRange &range, const SqpRange &oldRange,
+                                                          const SqpRange &range, bool synchronise)
-                                                          bool synchronise)
             {
                 // NOTE: oldRange isn't really necessary since oldRange == variable->range().

core/tests/Variable/TestVariableSync.cpp +1 -2

                 void exec(VariableController &variableController) const override
                 {
                     if (auto variable = variableController.variableModel()->variable(m_Index)) {
-                        variableController.onRequestDataLoading({variable}, m_NewRange, variable->range(),
+                        variableController.onRequestDataLoading({variable}, m_NewRange, !m_Shift);
-                                                                !m_Shift);
                     }
                 }

gui/include/Visualization/VisualizationGraphWidget.h +1 -2

                 /// Removes a variable from the graph
                 void removeVariable(std::shared_ptr<Variable> variable) noexcept;
-                void setRange(std::shared_ptr<Variable> variable, const SqpRange &range);
                 void setYRange(const SqpRange &range);
                 SqpRange graphRange() const noexcept;
                 void setGraphRange(const SqpRange &range);
             signals:
                 void synchronize(const SqpRange &range, const SqpRange &oldRange);
                 void requestDataLoading(QVector<std::shared_ptr<Variable> > variable, const SqpRange &range,
-                                        const SqpRange &oldRange, bool synchronise);
+                                        bool synchronise);
                 /// Signal emitted when the variable is about to be removed from the graph
                 void variableAboutToBeRemoved(std::shared_ptr<Variable> var);

gui/src/Visualization/VisualizationGraphWidget.cpp +2 -16

                 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
-                auto varRange = variable->range();
                 this->enableAcquisition(false);
                 this->setGraphRange(range);
                 this->enableAcquisition(true);
-                emit requestDataLoading(QVector<std::shared_ptr<Variable> >() << variable, range, varRange,
+                emit requestDataLoading(QVector<std::shared_ptr<Variable> >() << variable, range, false);
-                                        false);
                 emit variableAdded(variable);
             }
                 ui->widget->replot();
             }
-            void VisualizationGraphWidget::setRange(std::shared_ptr<Variable> variable, const SqpRange &range)
-                // Note: in case of different axes that depends on variable, we could start with a code like
-                // that:
-                //    auto componentsIt = impl->m_VariableToPlotMultiMap.equal_range(variable);
-                //    for (auto it = componentsIt.first; it != componentsIt.second;) {
-                //    }
-                ui->widget->xAxis->setRange(range.m_TStart, range.m_TEnd);
-                ui->widget->replot();
             void VisualizationGraphWidget::setYRange(const SqpRange &range)
             {
                 ui->widget->yAxis->setRange(range.m_TStart, range.m_TEnd);
                          it != end; it = impl->m_VariableToPlotMultiMap.upper_bound(it->first)) {
                         variableUnderGraphVector.push_back(it->first);
                     }
-                    emit requestDataLoading(std::move(variableUnderGraphVector), graphRange, oldGraphRange,
+                    emit requestDataLoading(std::move(variableUnderGraphVector), graphRange,
                                             !impl->m_IsCalibration);
                     if (!impl->m_IsCalibration) {

gui/src/Visualization/operations/RescaleAxeOperation.cpp +3 -1

                 if (graphWidget) {
                     // If the widget contains the variable, rescale it
                     if (impl->m_Variable && graphWidget->contains(*impl->m_Variable)) {
-                        graphWidget->setRange(impl->m_Variable, impl->m_Range);
+                        graphWidget->enableAcquisition(false);
+                        graphWidget->setGraphRange(impl->m_Range);
+                        graphWidget->enableAcquisition(true);
                     }
                 }
                 else {

plugins/amda/tests/TestAmdaAcquisition.cpp +1 -2

                     auto nextSqpR
                         = SqpRange{DateUtils::secondsSinceEpoch(tStart), DateUtils::secondsSinceEpoch(tEnd)};
-                    vc.onRequestDataLoading(QVector<std::shared_ptr<Variable> >{} << var, nextSqpR,
+                    vc.onRequestDataLoading(QVector<std::shared_ptr<Variable> >{} << var, nextSqpR, true);
-                                            var->range(), true);
                     QEventLoop loop;
                     QTimer::singleShot(timeToWaitMs, &loop, &QEventLoop::quit);

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages