HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/SciQLOPCore Commit - r42:303cd0ae5d46

Forwarded constness of value type for SqpIterator + PB11 stuff...

jeandet -

r42:303cd0ae5d46

parent child

Context file:

r42:303cd0ae5d46

include/Data/SqpIterator.h +2 -2

              * @tparam T the type of object handled in iterator
              * @sa http://www.cplusplus.com/reference/iterator/
              */
-            template <typename T>
+            template <typename T, bool isConst=false>
             class SCIQLOP_CORE_EXPORT SqpIterator {
             public:
                 using iterator_category = std::random_access_iterator_tag;
-                using value_type = const T;
+                using value_type = typename std::conditional<isConst, const T, T>::type;
                 using difference_type = std::ptrdiff_t;
                 using pointer = value_type *;
                 using reference = value_type &;

src/Data/SpectrogramSeries.cpp +5 0

             #include <Data/SpectrogramSeries.h>
+            #include <Data/DataSeriesUtils.h>
             SpectrogramSeries::SpectrogramSeries(std::vector<double> xAxisData, std::vector<double> yAxisData,
                                                  std::vector<double> valuesData, const Unit &xAxisUnit,
                                  std::move(yAxis)},
                       m_XResolution{resolution}
             {
+                if(std::isnan(m_XResolution))
+                {
+                    //m_XResolution = DataSeriesUtils::resolution(xAxisData->begin(), xAxisData->end()).m_Val;
+                }
             }
             std::unique_ptr<IDataSeries> SpectrogramSeries::clone() const

src/pybind11_wrappers/CoreWrappers.cpp +3 0

             #include <pybind11/numpy.h>
             #include <pybind11/chrono.h>
             #include <pybind11/functional.h>
+            #include <pybind11/stl.h>
             #include <string>
             #include <sstream>
                 py::class_<DataSeriesIteratorValue>(m,"DataSeriesIteratorValue")
                         .def_property_readonly("x", &DataSeriesIteratorValue::x)
+                        .def_property_readonly("y", &DataSeriesIteratorValue::y)
                         .def("value", py::overload_cast<>(&DataSeriesIteratorValue::value, py::const_))
                         .def("value", py::overload_cast<int>(&DataSeriesIteratorValue::value, py::const_))
                         .def("values", &DataSeriesIteratorValue::values);

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