GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r317:e774472e365b

Merge branch 'feature/TimeVariableAtDisplay' into develop

perrinel -

r317:e774472e365b

parent child

Context file:

r317:e774472e365b

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

                 virtual ~VisualizationGraphWidget();
                 void addVariable(std::shared_ptr<Variable> variable);
+                void addVariableUsingGraph(std::shared_ptr<Variable> variable);
                 /// Removes a variable from the graph
                 void removeVariable(std::shared_ptr<Variable> variable) noexcept;
                 /// Slot called when right clicking on the graph (displays a menu)
                 void onGraphMenuRequested(const QPoint &pos) noexcept;
-                void onRangeChanged(const QCPRange &t1, const QCPRange &t2);
+                void onRangeChanged(const QCPRange &t1);
                 /// Slot called when a mouse wheel was made, to perform some processing before the zoom is done
                 void onMouseWheel(QWheelEvent *event) noexcept;

gui/src/Visualization/VisualizationGraphHelper.cpp +5 -1

                                                            << xValue.count();
                     qcpGraph->setData(xValue, vValue);
+                    // Display all data
+                    // component->parentPlot()->xAxis->setRange(dateTime.m_TStart, dateTime.m_TEnd);
+                    component->rescaleAxes();
+                    component->parentPlot()->replot();
                 }
                 else {
                     /// @todo DEBUG
                     // Display all data
                     component->rescaleAxes();
                     plot.replot();
                 }
                 else {

gui/src/Visualization/VisualizationGraphWidget.cpp +33 -6

                 ui->widget->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
                 ui->widget->axisRect()->setRangeDrag(Qt::Horizontal);
                 connect(ui->widget, &QCustomPlot::mouseWheel, this, &VisualizationGraphWidget::onMouseWheel);
-                connect(ui->widget->xAxis, static_cast<void (QCPAxis::*)(const QCPRange &, const QCPRange &)>(
+                connect(ui->widget->xAxis,
-                                               &QCPAxis::rangeChanged),
+                        static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this,
-                        this, &VisualizationGraphWidget::onRangeChanged);
+                        &VisualizationGraphWidget::onRangeChanged);
                 // Activates menu when right clicking on the graph
                 ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
                 connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
             }
+            void VisualizationGraphWidget::addVariableUsingGraph(std::shared_ptr<Variable> variable)
+            {
+                // when adding a variable, we need to set its time range to the current graph range
+                auto grapheRange = ui->widget->xAxis->range();
+                auto dateTime = SqpDateTime{grapheRange.lower, grapheRange.upper};
+                variable->setDateTime(dateTime);
+                auto variableDateTimeWithTolerance = dateTime;
+                // add 10% tolerance for each side
+                auto tolerance = 0.1 * (dateTime.m_TEnd - dateTime.m_TStart);
+                variableDateTimeWithTolerance.m_TStart -= tolerance;
+                variableDateTimeWithTolerance.m_TEnd += tolerance;
+                // Uses delegate to create the qcpplot components according to the variable
+                auto createdPlottables = VisualizationGraphHelper::create(variable, *ui->widget);
+                for (auto createdPlottable : qAsConst(createdPlottables)) {
+                    impl->m_VariableToPlotMultiMap.insert({variable, createdPlottable});
+                }
+                connect(variable.get(), SIGNAL(updated()), this, SLOT(onDataCacheVariableUpdated()));
+                // CHangement detected, we need to ask controller to request data loading
+                emit requestDataLoading(variable, variableDateTimeWithTolerance);
+            }
             void VisualizationGraphWidget::removeVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 // Each component associated to the variable :
                 }
             }
-            void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
+            void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
             {
                 qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged");
                 for (auto it = impl->m_VariableToPlotMultiMap.cbegin();
                      it != impl->m_VariableToPlotMultiMap.cend(); ++it) {
                     auto variable = it->first;
-                    auto dateTime = SqpDateTime{t2.lower, t2.upper};
+                    auto dateTime = SqpDateTime{t1.lower, t1.upper};
                     if (!variable->contains(dateTime)) {

gui/src/Visualization/operations/GenerateVariableMenuOperation.cpp +1 -1

                 if (graphWidget) {
                     impl->visitLeaf(
                         *graphWidget, QObject::tr("Open in %1").arg(graphWidget->name()),
-                        [ var = impl->m_Variable, graphWidget ]() { graphWidget->addVariable(var); });
+                        [ var = impl->m_Variable, graphWidget ]() { graphWidget->addVariableUsingGraph(var); });
                 }
                 else {
                     qCCritical(LOG_GenerateVariableMenuOperation(),

General Comments 0

Write
Preview

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

No TODOs yet

	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