From 575eda7156d0ccd72d34f04a42a32c690b3c1ec3 2017-08-17 14:12:21
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-08-17 14:12:21
Subject: [PATCH] Add impletation for displaying data that are already in cache when
acquisition is requested
---

diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index 8b494cc..80ae762 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -36,35 +36,19 @@ QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis)
 }
 
 void updateScalarData(QCPAbstractPlottable *component, std::shared_ptr<ScalarSeries> scalarSeries,
-                      const SqpRange &dateTime)
+                      const SqpRange &range)
 {
     qCDebug(LOG_VisualizationGraphHelper()) << "TORM: updateScalarData"
                                             << QThread::currentThread()->objectName();
     if (auto qcpGraph = dynamic_cast<QCPGraph *>(component)) {
         scalarSeries->lockRead();
         {
-//            auto bounds = scalarSeries->subData(rang
-//            const auto &xData = scalarSeries->xAxisData()->cdata();
-//            const auto &valuesData = scalarSeries->valuesData()->cdata();
-
-//            auto xDataBegin = xData.cbegin();
-//            auto xDataEnd = xData.cend();
-
-//            qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points in cache"
-//                                                   << xData.count();
-
-//            auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
-//            qcpGraph->setData(sqpDataContainer);
-
-//            auto lowerIt = std::lower_bound(xDataBegin, xDataEnd, dateTime.m_TStart);
-//            auto upperIt = std::upper_bound(xDataBegin, xDataEnd, dateTime.m_TEnd);
-//            auto distance = std::distance(xDataBegin, lowerIt);
-
-//            auto valuesDataIt = valuesData.cbegin() + distance;
-//            for (auto xAxisDataIt = lowerIt; xAxisDataIt != upperIt;
-//                 ++xAxisDataIt, ++valuesDataIt) {
-//                sqpDataContainer->appendGraphData(QCPGraphData(*xAxisDataIt, *valuesDataIt));
-//            }
+            auto sqpDataContainer = QSharedPointer<SqpDataContainer>::create();
+            qcpGraph->setData(sqpDataContainer);
+            auto bounds = scalarSeries->subData(range.m_TStart, range.m_TEnd);
+            for (auto it = bounds.first; it != bounds.second; ++it) {
+                sqpDataContainer->appendGraphData(QCPGraphData(it->x(), it->value()));
+            }
 
             qCInfo(LOG_VisualizationGraphHelper()) << "TODEBUG: Current points displayed"
                                                    << sqpDataContainer->size();
diff --git a/plugins/amda/tests/TestAmdaResultParser.cpp b/plugins/amda/tests/TestAmdaResultParser.cpp
index 13241c2..5bb2133 100644
--- a/plugins/amda/tests/TestAmdaResultParser.cpp
+++ b/plugins/amda/tests/TestAmdaResultParser.cpp
@@ -258,11 +258,11 @@ void TestAmdaResultParser::testReadScalarTxt_data()
                                          QVector<QDateTime>{}, QVector<double>{}};
 
     // Invalid files
-    QTest::newRow("Invalid file (unexisting file)")
-        << QStringLiteral("UnexistingFile.txt") << ExpectedResults<ScalarSeries>{};
+    QTest::newRow("Invalid file (unexisting file)") << QStringLiteral("UnexistingFile.txt")
+                                                    << ExpectedResults<ScalarSeries>{};
 
-    QTest::newRow("Invalid file (file not found on server)")
-        << QStringLiteral("FileNotFound.txt") << ExpectedResults<ScalarSeries>{};
+    QTest::newRow("Invalid file (file not found on server)") << QStringLiteral("FileNotFound.txt")
+                                                             << ExpectedResults<ScalarSeries>{};
 }
 
 void TestAmdaResultParser::testReadScalarTxt()