GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1030:99f1718ec669

Updates access to y-axis properties of the data series (1)...

Alexandre Leroux -

r1030:99f1718ec669

parent child

Context file:

r1030:99f1718ec669

core/include/Data/DataSeries.h +7 -2

                 /// @sa IDataSeries::xAxisUnit()
                 Unit xAxisUnit() const override { return m_XAxisUnit; }
+                /// @sa IDataSeries::yAxisUnit()
+                Unit yAxisUnit() const override { return m_YAxis.unit(); }
                 /// @return the values dataset
                 std::shared_ptr<ArrayData<Dim> > valuesData() { return m_ValuesData; }
                 const std::shared_ptr<ArrayData<Dim> > valuesData() const { return m_ValuesData; }
                 int nbPoints() const override { return m_ValuesData->totalSize(); }
+                std::pair<double, double> yBounds() const override { return m_YAxis.bounds(); }
                 void clear()
                 {
                     m_XAxisData->clear();
                 }
                 /// @return the y-axis associated to the data series
-                /// @todo pass getter as protected and use iterators to access the y-axis data
+                const OptionalAxis &yAxis() const { return m_YAxis; }
-                OptionalAxis yAxis() const { return m_YAxis; }
+                OptionalAxis &yAxis() { return m_YAxis; }
                 // /////// //
                 // Mutexes //

core/include/Data/IDataSeries.h +6 0

                 virtual Unit xAxisUnit() const = 0;
+                /// @return the y-axis unit, if axis is defined, default unit otherwise
+                virtual Unit yAxisUnit() const = 0;
                 virtual Unit valuesUnit() const = 0;
                 virtual void merge(IDataSeries *dataSeries) = 0;
                 /// @return the total number of points contained in the data series
                 virtual int nbPoints() const = 0;
+                /// @return the bounds of the y-axis axis (if defined)
+                virtual std::pair<double, double> yBounds() const = 0;
                 // ///////// //
                 // Iterators //
                 // ///////// //

gui/src/Visualization/AxisRenderingUtils.cpp +1 -2

                 {
                     dataSeries.lockRead();
                     auto xAxisUnit = dataSeries.xAxisUnit();
-                    /// @todo ALX: use iterators here
+                    auto yAxisUnit = dataSeries.yAxisUnit();
-                    auto yAxisUnit = dataSeries.yAxis().unit();
                     auto valuesUnit = dataSeries.valuesUnit();
                     dataSeries.unlock();

gui/src/Visualization/VisualizationGraphHelper.cpp +1 -2

                 static void setPlotYAxisRange(T &dataSeries, const SqpRange &xAxisRange, QCustomPlot &plot)
                 {
                     double min, max;
-                    /// @todo ALX: use iterators here
+                    std::tie(min, max) = dataSeries.yBounds();
-                    std::tie(min, max) = dataSeries.yAxis().bounds();
                     if (!std::isnan(min) && !std::isnan(max)) {
                         plot.yAxis->setRange(QCPRange{min, max});

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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