HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1421:39383389f6c1

News TS impl seems to pass all tests \o/...

jeandet -

r1421:39383389f6c1

parent child

Context file:

r1421:39383389f6c1

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit a8a4e48c21af5a28ad3f56582db7bbec0fe76978		1	Subproject commit ae48b17833443bc2730a7511f964569dc7cdb1df

gui/src/Visualization/AxisRenderingUtils.cpp +5 -5

             template <typename T>
             struct AxisHelper : public IAxisHelper
             {
-                explicit AxisHelper(T* dataSeries) : m_DataSeries { dataSeries } {}
+                explicit AxisHelper(std::shared_ptr<T> dataSeries) : m_DataSeries { dataSeries } {}
                 void setProperties(QCustomPlot& plot, SqpColorScale& colorScale) override
                 {
                     }
                 }
-                T* m_DataSeries;
+                std::shared_ptr<T> m_DataSeries;
             };
             } // namespace
                 {
                     case DataSeriesType::SCALAR:
                         return std::make_unique<AxisHelper<ScalarTimeSerie>>(
-                            dynamic_cast<ScalarTimeSerie*>(variable.data()->base()));
+                            std::dynamic_pointer_cast<ScalarTimeSerie>(variable.data()));
                     case DataSeriesType::SPECTROGRAM:
                         return std::make_unique<AxisHelper<SpectrogramTimeSerie>>(
-                            dynamic_cast<SpectrogramTimeSerie*>(variable.data()->base()));
+                            std::dynamic_pointer_cast<SpectrogramTimeSerie>(variable.data()));
                     case DataSeriesType::VECTOR:
                         return std::make_unique<AxisHelper<VectorTimeSerie>>(
-                            dynamic_cast<VectorTimeSerie*>(variable.data()->base()));
+                            std::dynamic_pointer_cast<VectorTimeSerie>(variable.data()));
                     default:
                         // Creates default helper
                         break;

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

             template <typename T>
             struct PlottablesHelper : public IPlottablesHelper
             {
-                explicit PlottablesHelper(T* dataSeries) : m_DataSeries { dataSeries } {}
+                explicit PlottablesHelper(std::shared_ptr<T> dataSeries) : m_DataSeries { dataSeries } {}
                 PlottablesMap create(QCustomPlot& plot) const override
                 {
                     }
                 }
-                T* m_DataSeries;
+                std::shared_ptr<T> m_DataSeries;
             };
             /// Creates IPlottablesHelper according to the type of data series a variable holds
                 {
                     case DataSeriesType::SCALAR:
                         return std::make_unique<PlottablesHelper<ScalarTimeSerie>>(
-                            dynamic_cast<ScalarTimeSerie*>(variable->data()->base()));
+                            std::dynamic_pointer_cast<ScalarTimeSerie>(variable->data()));
                     case DataSeriesType::SPECTROGRAM:
                         return std::make_unique<PlottablesHelper<SpectrogramTimeSerie>>(
-                            dynamic_cast<SpectrogramTimeSerie*>(variable->data()->base()));
+                            std::dynamic_pointer_cast<SpectrogramTimeSerie>(variable->data()));
                     case DataSeriesType::VECTOR:
                         return std::make_unique<PlottablesHelper<VectorTimeSerie>>(
-                            dynamic_cast<VectorTimeSerie*>(variable->data()->base()));
+                            std::dynamic_pointer_cast<VectorTimeSerie>(variable->data()));
                     default:
                         // Creates default helper
                         break;

gui/tests/multiple_sync_graph/main.cpp +6 -6

                     auto r = variables.back()->range();
                     /*
-                     * Scrolling to the left implies going back in time
+                     * Scrolling to the left implies going forward in time
-                     * Scroll only implies keeping the same delta T -> shit only transformation
+                     * Scroll only implies keeping the same delta T -> shift only transformation
                      */
-                    QVERIFY(r.m_TEnd < range.m_TEnd);
+                    QVERIFY(r.m_TEnd > range.m_TEnd);
                     QVERIFY(SciQLop::numeric::almost_equal<double>(r.delta(), range.delta(), 1));
                 }
                     auto r = variables.back()->range();
                     /*
-                     * Scrolling to the right implies going forward in time
+                     * Scrolling to the right implies going back in time
-                     * Scroll only implies keeping the same delta T -> shit only transformation
+                     * Scroll only implies keeping the same delta T -> shift only transformation
                      */
-                    QVERIFY(r.m_TEnd > range.m_TEnd);
+                    QVERIFY(r.m_TEnd < range.m_TEnd);
                     QVERIFY(SciQLop::numeric::almost_equal<double>(r.delta(), range.delta(), 1));
                 }
             };

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