From 076efd0d6728650981ff684faab937a7631ab61f 2017-07-03 09:25:27
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-07-03 09:25:27
Subject: [PATCH] onRangeChanged is now based on the good range (the new one)

setTimeRange is now connected to rescaleAxes and replot methods
---

diff --git a/gui/include/Visualization/VisualizationGraphWidget.h b/gui/include/Visualization/VisualizationGraphWidget.h
index da3e1bd..28673a8 100644
--- a/gui/include/Visualization/VisualizationGraphWidget.h
+++ b/gui/include/Visualization/VisualizationGraphWidget.h
@@ -53,7 +53,7 @@ private slots:
     /// 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;
diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index da5e732..6f7b859 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -59,10 +59,15 @@ void updateScalarData(QCPAbstractPlottable *component, ScalarSeries &scalarSerie
         xValue.resize(n);
         vValue.resize(n);
 
-        qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed"
-                                               << xValue.count();
+        qCInfo(LOG_VisualizationGraphHelper()) << "TORM: Current points displayed" << xValue.count()
+                                               << dateTime;
 
         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
@@ -97,7 +102,6 @@ QCPAbstractPlottable *createScalarSeriesComponent(ScalarSeries &scalarSeries, QC
 
         // Display all data
         component->rescaleAxes();
-
         plot.replot();
     }
     else {
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index ffe2f2f..3846b65 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -49,9 +49,9 @@ VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget 
     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 &)>(
-                                   &QCPAxis::rangeChanged),
-            this, &VisualizationGraphWidget::onRangeChanged);
+    connect(ui->widget->xAxis,
+            static_cast<void (QCPAxis::*)(const QCPRange &)>(&QCPAxis::rangeChanged), this,
+            &VisualizationGraphWidget::onRangeChanged);
 
     // Activates menu when right clicking on the graph
     ui->widget->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -168,18 +168,19 @@ void VisualizationGraphWidget::onGraphMenuRequested(const QPoint &pos) noexcept
     }
 }
 
-void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1, const QCPRange &t2)
+void VisualizationGraphWidget::onRangeChanged(const QCPRange &t1)
 {
 
-    qCDebug(LOG_VisualizationGraphWidget()) << tr("VisualizationGraphWidget::onRangeChanged");
+    qCInfo(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)) {
+            qCInfo(LOG_VisualizationGraphWidget()) << dateTime << variable->dateTime();
 
             auto variableDateTimeWithTolerance = dateTime;
             if (variable->intersect(dateTime)) {