From ad1efe843595e8ad0b2fcb7a90913275183ec6ce 2017-08-24 12:50:36
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-08-24 12:50:36
Subject: [PATCH] Add thread protection for DataSeries
Set Y range to varRange instead of graghRange where no data has been computed yet
Set cosinus freq to 1htz

---

diff --git a/core/src/Variable/VariableModel.cpp b/core/src/Variable/VariableModel.cpp
index 0093876..22c4374 100644
--- a/core/src/Variable/VariableModel.cpp
+++ b/core/src/Variable/VariableModel.cpp
@@ -158,10 +158,13 @@ QVariant VariableModel::data(const QModelIndex &index, int role) const
             /// that contains the time value to display
             auto dateTimeVariant = [variable](const auto &getValueFun) {
                 if (auto dataSeries = variable->dataSeries()) {
+                    dataSeries->lockRead();
                     auto it = getValueFun(*dataSeries);
-                    return (it != dataSeries->cend())
+                    auto resVariant = (it != dataSeries->cend())
                                ? DateUtils::dateTime(it->x()).toString(DATETIME_FORMAT)
                                : QVariant{};
+                    dataSeries->unlock();
+                    return resVariant;
                 }
                 else {
                     return QVariant{};
diff --git a/gui/src/Visualization/VisualizationGraphHelper.cpp b/gui/src/Visualization/VisualizationGraphHelper.cpp
index 64edc65..bdd5a70 100644
--- a/gui/src/Visualization/VisualizationGraphHelper.cpp
+++ b/gui/src/Visualization/VisualizationGraphHelper.cpp
@@ -38,7 +38,7 @@ QSharedPointer<QCPAxisTicker> axisTicker(bool isTimeAxis)
     }
 }
 
-/// Sets axes properties according to the properties of a data series
+/// Sets axes properties according to the properties of a data series. Not thread safe
 template <int Dim>
 void setAxesProperties(const DataSeries<Dim> &dataSeries, QCustomPlot &plot) noexcept
 {
@@ -85,7 +85,9 @@ struct PlottablesCreator<T,
         PlottablesMap result{};
 
         // Gets the number of components of the data series
+        dataSeries.lockRead();
         auto componentCount = dataSeries.valuesData()->componentCount();
+        dataSeries.unlock();
 
         auto colors = ColorUtils::colors(Qt::blue, Qt::red, componentCount);
 
@@ -98,7 +100,9 @@ struct PlottablesCreator<T,
         }
 
         // Axes properties
+        dataSeries.lockRead();
         setAxesProperties(dataSeries, plot);
+        dataSeries.unlock();
 
         plot.replot();
 
@@ -133,7 +137,6 @@ struct PlottablesUpdater<T,
     static void updatePlottables(T &dataSeries, PlottablesMap &plottables, const SqpRange &range,
                                  bool rescaleAxes)
     {
-        dataSeries.lockRead();
 
         // For each plottable to update, resets its data
         std::map<int, QSharedPointer<SqpDataContainer> > dataContainers{};
@@ -145,6 +148,7 @@ struct PlottablesUpdater<T,
                 dataContainers.insert({plottable.first, dataContainer});
             }
         }
+        dataSeries.lockRead();
 
         // - Gets the data of the series included in the current range
         // - Updates each plottable by adding, for each data item, a point that takes x-axis data
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index c49b616..8e72de1 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -192,7 +192,8 @@ VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
 
     // get y using variable range
     if (auto dataSeries = variable->dataSeries()) {
-        auto valuesBounds = dataSeries->valuesBounds(range.m_TStart, range.m_TEnd);
+        dataSeries->lockRead();
+        auto valuesBounds = dataSeries->valuesBounds(variable->range().m_TStart, variable->range().m_TEnd);
         auto end = dataSeries->cend();
         if (valuesBounds.first != end && valuesBounds.second != end) {
             auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; };
@@ -202,6 +203,7 @@ VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<V
 
             graphWidget->setYRange(SqpRange{minValue, maxValue});
         }
+        dataSeries->unlock();
     }
 
     return graphWidget;
diff --git a/plugins/mockplugin/src/CosinusProvider.cpp b/plugins/mockplugin/src/CosinusProvider.cpp
index cbf2073..4781d41 100644
--- a/plugins/mockplugin/src/CosinusProvider.cpp
+++ b/plugins/mockplugin/src/CosinusProvider.cpp
@@ -18,7 +18,7 @@ std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier,
     auto dataIndex = 0;
 
     // Gets the timerange from the parameters
-    double freq = 100.0;
+    double freq = 1.0;
     double start = std::ceil(dataRangeRequested.m_TStart * freq); // 100 htz
     double end = std::floor(dataRangeRequested.m_TEnd * freq);    // 100 htz