From c6cf2dba079da680390ae2de0522a39964c5e629 2019-06-06 19:41:16 From: Alexis Jeandet Date: 2019-06-06 19:41:16 Subject: [PATCH] Added Y log tag for Spectrograms Signed-off-by: Alexis Jeandet --- diff --git a/include/Data/SpectrogramTimeSerie.h b/include/Data/SpectrogramTimeSerie.h index c2d2d2b..45bfeae 100644 --- a/include/Data/SpectrogramTimeSerie.h +++ b/include/Data/SpectrogramTimeSerie.h @@ -12,6 +12,7 @@ class SCIQLOP_CORE_EXPORT SpectrogramTimeSerie public: double min_sampling = std::nan(""); double max_sampling = std::nan(""); + bool y_is_log = true; using item_t = decltype(std::declval< TimeSeries::TimeSerie>()[0]); @@ -26,10 +27,11 @@ public: SpectrogramTimeSerie::container_type< SpectrogramTimeSerie::raw_value_type>&& values, std::vector& shape, double min_sampling, - double max_sampling) + double max_sampling, bool y_is_log = true) : TimeSeries::TimeSerie(t, values, shape), - min_sampling{min_sampling}, max_sampling{max_sampling} + min_sampling{min_sampling}, max_sampling{max_sampling}, y_is_log{ + y_is_log} { _axes[1] = y; } diff --git a/src/pybind11_wrappers/CoreWrappers.cpp b/src/pybind11_wrappers/CoreWrappers.cpp index 0bc86e2..221b14b 100644 --- a/src/pybind11_wrappers/CoreWrappers.cpp +++ b/src/pybind11_wrappers/CoreWrappers.cpp @@ -233,7 +233,7 @@ PYBIND11_MODULE(pysciqlopcore, m) .def(py::init>()) .def(py::init([](py::array_t t, py::array_t y, py::array_t values, double min_sampling, - double max_sampling) { + double max_sampling, bool y_is_log) { if(t.size() >= values.size() and t.size() != 0) SCIQLOP_ERROR(decltype(py::self), "Doesn't look like a Spectrogram"); if(y.size() != values.shape(1)) @@ -250,7 +250,7 @@ PYBIND11_MODULE(pysciqlopcore, m) shape.push_back(values.shape(1)); return SpectrogramTimeSerie(std::move(_t), std::move(_y), std::move(_values), shape, min_sampling, - max_sampling); + max_sampling, y_is_log); })) .def("__getitem__", [](SpectrogramTimeSerie& ts,