HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1377:0f6ffbe66d5f

Many synchronization fixes, most operations works, only product drag from tree is broken...

jeandet -

r1377:0f6ffbe66d5f

parent child

Context file:

r1377:0f6ffbe66d5f

gui/include/Visualization/VisualizationGraphWidget.h +5 -3

             #include <Common/spimpl.h>
+            #include <Data/DateTimeRange.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationGraphWidget)
             class QCPRange;
             class QCustomPlot;
-            class DateTimeRange;
             class Variable;
             class VisualizationWidget;
             class VisualizationZoneWidget;
                 /// Sets the y-axis range based on the data of a variable
                 void setYRange(std::shared_ptr<Variable> variable);
                 DateTimeRange graphRange() const noexcept;
-                void setGraphRange(const DateTimeRange &range, bool updateVar = false);
+                void setGraphRange(const DateTimeRange &range, bool updateVar=false, bool forward=false);
                 void setAutoRangeOnVariableInitialization(bool value);
                 // Zones
                 void zoom(double factor, int center, Qt::Orientation orientation, bool forward=true);
                 void move(double factor, Qt::Orientation orientation, bool forward=true);
                 void move(double dx, double dy, bool forward=true);
+                void transform(const DateTimeRangeTransformation& tranformation, bool forward=true);
                 // IVisualizationWidget interface
                 void accept(IVisualizationWidgetVisitor *visitor) override;
                 void zoom_sig(double factor, int center, Qt::Orientation orientation, bool forward=true);
                 void move_sig(double factor, Qt::Orientation orientation, bool forward=true);
                 void move_sig(double dx, double dy, bool forward=true);
+                void transform_sig(const DateTimeRangeTransformation& tranformation, bool forward=true);
             protected:
                 void closeEvent(QCloseEvent *event) override;
                 class VisualizationGraphWidgetPrivate;
                 spimpl::unique_impl_ptr<VisualizationGraphWidgetPrivate> impl;
-                void _ugly_sync_(const QPoint& pos,const QPointF& axisPos);
             private slots:
                 /// Slot called when right clicking on the graph (displays a menu)
                 void onGraphMenuRequested(const QPoint &pos) noexcept;

gui/src/Visualization/VisualizationGraphWidget.cpp +41 -11

             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController2.h>
+            #include <Data/DateTimeRangeHelper.h>
             #include <unordered_map>
                     }
                 }
-                void setRange(const DateTimeRange &newRange)
+                void setRange(const DateTimeRange &newRange, bool updateVar=true)
                 {
-                    if (m_Flags.testFlag(GraphFlag::EnableAcquisition))
+                    this->m_plot->xAxis->setRange(newRange.m_TStart, newRange.m_TEnd);
+                    if(updateVar)
                     {
                         for (auto it = m_VariableToPlotMultiMap.begin(),
-                                  end = m_VariableToPlotMultiMap.end();
+                             end = m_VariableToPlotMultiMap.end();
                              it != end; it = m_VariableToPlotMultiMap.upper_bound(it->first))
                         {
                             sqpApp->variableController().asyncChangeRange(it->first, newRange);
                         }
                     }
+                    m_plot->replot(QCustomPlot::rpQueuedReplot);
                 }
                 void setRange(const QCPRange &newRange)
                     setRange(graphRange);
                 }
+                void rescaleY()
+                {
+                    m_plot->yAxis->rescale(true);
+                }
                 std::tuple<double,double> moveGraph(const QPoint& destination)
                 {
                     auto currentPos = m_plot->mapFromParent(destination);
                     auto newXRange = xAxis->range();
                     auto newYRange = yAxis->range();
                     setRange(xAxis->range());
-                    m_plot->replot(QCustomPlot::rpQueuedReplot);
                     //m_lastMousePos = currentPos;
                     return {newXRange.lower - oldXRange.lower, newYRange.lower - oldYRange.lower};
                 }
                     m_plot->replot(QCustomPlot::rpQueuedReplot);
                 }
+                void transform(const DateTimeRangeTransformation &tranformation)
+                {
+                    auto graphRange = m_plot->xAxis->range();
+                    DateTimeRange range{graphRange.lower, graphRange.upper};
+                    range = range.transform(tranformation);
+                    setRange(range);
+                    m_plot->replot(QCustomPlot::rpQueuedReplot);
+                }
                 void move(double dx, double dy)
                 {
                     auto xAxis = m_plot->axisRect()->rangeDragAxis(Qt::Horizontal);
                 return DateTimeRange{graphRange.lower, graphRange.upper};
             }
-            void VisualizationGraphWidget::setGraphRange(const DateTimeRange &range, bool updateVar)
+            void VisualizationGraphWidget::setGraphRange(const DateTimeRange &range, bool updateVar, bool forward)
             {
+                auto oldRange = graphRange();
-                if(updateVar)
+                impl->setRange(range, updateVar);
-                    impl->setRange(range);
+                if(forward)
-                impl->m_plot->xAxis->setRange(range.m_TStart, range.m_TEnd);
-                impl->m_plot->replot(QCustomPlot::rpQueuedReplot);
+                    auto newRange = graphRange();
+                    if(auto tf = DateTimeRangeHelper::computeTransformation(oldRange,newRange))
+                        emit this->transform_sig(tf.value(), false);
+                }
             }
                     emit this->move_sig(dx, dy, false);
             }
+            void VisualizationGraphWidget::transform(const DateTimeRangeTransformation &tranformation, bool forward)
+            {
+                impl->transform(tranformation);
+                if(forward)
+                    emit this->transform_sig(tranformation, false);
+            }
             void VisualizationGraphWidget::accept(IVisualizationWidgetVisitor *visitor)
             {
                 if (visitor) {
             {
                 if(impl->isDrawingZoomRect())
                 {
+                    auto oldRange = this->graphRange();
                     impl->applyZoomRect();
+                    auto newRange = this->graphRange();
+                    if(auto tf = DateTimeRangeHelper::computeTransformation(oldRange,newRange))
+                        emit this->transform_sig(tf.value(), false);
                 }
                 else if(impl->isDrawingZoneRect())
                 {
                     case Qt::Key_Shift:
                         break;
                     case Qt::Key_M:
-                        impl->m_plot->rescaleAxes();
+                        impl->rescaleY();
                         impl->m_plot->replot(QCustomPlot::rpQueuedReplot);
                         break;
                     case Qt::Key_Left:

gui/src/Visualization/VisualizationZoneWidget.cpp +3 -1

                 {
                     auto graph = qobject_cast<VisualizationGraphWidget *>(layout->itemAt(i)->widget());
                     connect(graphWidget, &VisualizationGraphWidget::zoom_sig, graph, &VisualizationGraphWidget::zoom);
+                    connect(graphWidget, &VisualizationGraphWidget::transform_sig, graph, &VisualizationGraphWidget::transform);
                     connect(graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
                             graph,       qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
                             graph,       qOverload<double,double,bool>(&VisualizationGraphWidget::move));
                     connect(graph, &VisualizationGraphWidget::zoom_sig, graphWidget, &VisualizationGraphWidget::zoom);
+                    connect(graph, &VisualizationGraphWidget::transform_sig, graphWidget, &VisualizationGraphWidget::transform);
                     connect(graph,       qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move_sig),
                             graphWidget, qOverload<double,Qt::Orientation,bool>(&VisualizationGraphWidget::move));
                 }
                 else if (mimeData->hasFormat(MIME_TYPE_TIME_RANGE)) {
                     auto range = TimeController::timeRangeForMimeData(mimeData->data(MIME_TYPE_TIME_RANGE));
-                    graphWidget->setGraphRange(range);
+                    graphWidget->setGraphRange(range, true, true);
                 }
                 else {
                     qCWarning(LOG_VisualizationZoneWidget())

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

                         // During rescale, acquisition for the graph is disabled but synchronization is still
                         // enabled
                         graphWidget->setFlags(GraphFlag::EnableSynchronization);
-                        graphWidget->setGraphRange(impl->m_Range);
+                        graphWidget->setGraphRange(impl->m_Range, true);
                         graphWidget->setFlags(GraphFlag::EnableAll);
                     }
                 }

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