GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r551:221951fe7cca

Uses std::shared_ptr

Alexandre Leroux -

r551:221951fe7cca

parent child

Context file:

r551:221951fe7cca

Collapse all files

gui/include/Visualization/VisualizationGraphHelper.h +1 -1

                   */
                  static PlottablesMap create(std::shared_ptr<Variable> variable, QCustomPlot &plot) noexcept;
-                 static void updateData(PlottablesMap &plottables, IDataSeries *dataSeries,
+                 static void updateData(PlottablesMap &plottables, std::shared_ptr<IDataSeries> dataSeries,
                                         const SqpRange &dateTime);
              };

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

              };
              /// Creates IPlottablesHelper according to a data series
-             std::unique_ptr<IPlottablesHelper> createHelper(IDataSeries *dataSeries) noexcept
+             std::unique_ptr<IPlottablesHelper> createHelper(std::shared_ptr<IDataSeries> dataSeries) noexcept
              {
-                 if (auto scalarSeries = dynamic_cast<ScalarSeries *>(dataSeries)) {
+                 if (auto scalarSeries = std::dynamic_pointer_cast<ScalarSeries>(dataSeries)) {
                      return std::make_unique<PlottablesHelper<ScalarSeries> >(*scalarSeries);
                  }
-                 else if (auto vectorSeries = dynamic_cast<VectorSeries *>(dataSeries)) {
+                 else if (auto vectorSeries = std::dynamic_pointer_cast<VectorSeries>(dataSeries)) {
                      return std::make_unique<PlottablesHelper<VectorSeries> >(*vectorSeries);
                  }
                  else {
                                                             QCustomPlot &plot) noexcept
              {
                  if (variable) {
-                     auto helper = createHelper(variable->dataSeries().get());
+                     auto helper = createHelper(variable->dataSeries());
                      auto plottables = helper->create(plot);
                      return plottables;
                  }
                  }
              }
-             void VisualizationGraphHelper::updateData(PlottablesMap &plottables, IDataSeries *dataSeries,
+             void VisualizationGraphHelper::updateData(PlottablesMap &plottables,
+                                                       std::shared_ptr<IDataSeries> dataSeries,
                                                        const SqpRange &dateTime)
              {
                  auto helper = createHelper(dataSeries);

gui/src/Visualization/VisualizationGraphWidget.cpp +2 -2

                      qCDebug(LOG_VisualizationGraphWidget())
                          << "TORM: VisualizationGraphWidget::onDataCacheVariableUpdated E" << dateTime;
                      if (dateTime.contains(variable->range()) || dateTime.intersect(variable->range())) {
-                         VisualizationGraphHelper::updateData(variableEntry.second, variable->dataSeries().get(),
+                         VisualizationGraphHelper::updateData(variableEntry.second, variable->dataSeries(),
                                                               variable->range());
                      }
                  }
              {
                  auto it = impl->m_VariableToPlotMultiMap.find(variable);
                  if (it != impl->m_VariableToPlotMultiMap.end()) {
-                     VisualizationGraphHelper::updateData(it->second, variable->dataSeries().get(), range);
+                     VisualizationGraphHelper::updateData(it->second, variable->dataSeries(), range);
                  }
              }

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