GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r915:487930a9dd9f

Updates generation of spectrogram in the mock plugin to set values' unit

Alexandre Leroux -

r915:487930a9dd9f

parent child

Context file:

r915:487930a9dd9f

Collapse all files

plugins/mockplugin/src/CosinusProvider.cpp +17 -19

                 virtual int componentCount() const = 0;
                 /// @return the data series created for the type
                 virtual std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData,
-                                                                      std::vector<double> valuesData,
+                                                                      std::vector<double> valuesData) const = 0;
-                                                                      Unit xAxisUnit,
-                                                                      Unit valuesUnit) const = 0;
                 /// Generates values (one value per component)
                 /// @param x the x-axis data used to generate values
                 /// @param values the vector in which to insert the generated values
                 int componentCount() const override { return 1; }
                 std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData,
-                                                              std::vector<double> valuesData, Unit xAxisUnit,
+                                                              std::vector<double> valuesData) const override
-                                                              Unit valuesUnit) const override
                 {
                     return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData),
-                                                          xAxisUnit, valuesUnit);
+                                                          Unit{QStringLiteral("t"), true}, Unit{});
                 }
                 void generateValues(double x, std::vector<double> &values, int dataIndex) const override
             struct SpectrogramCosinus : public ICosinusType {
                 /// Ctor with y-axis
-                explicit SpectrogramCosinus(std::vector<double> yAxisData, Unit yAxisUnit)
+                explicit SpectrogramCosinus(std::vector<double> yAxisData, Unit yAxisUnit, Unit valuesUnit)
-                        : m_YAxisData{std::move(yAxisData)}, m_YAxisUnit{std::move(yAxisUnit)}
+                        : m_YAxisData{std::move(yAxisData)},
+                          m_YAxisUnit{std::move(yAxisUnit)},
+                          m_ValuesUnit{std::move(valuesUnit)}
                 {
                 }
                 int componentCount() const override { return m_YAxisData.size(); }
                 std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData,
-                                                              std::vector<double> valuesData, Unit xAxisUnit,
+                                                              std::vector<double> valuesData) const override
-                                                              Unit valuesUnit) const override
                 {
-                    return std::make_shared<SpectrogramSeries>(std::move(xAxisData), m_YAxisData,
+                    return std::make_shared<SpectrogramSeries>(
-                                                               std::move(valuesData), xAxisUnit, m_YAxisUnit,
+                        std::move(xAxisData), m_YAxisData, std::move(valuesData),
-                                                               valuesUnit);
+                        Unit{QStringLiteral("t"), true}, m_YAxisUnit, m_ValuesUnit);
                 }
                 void generateValues(double x, std::vector<double> &values, int dataIndex) const override
                 std::vector<double> m_YAxisData;
                 Unit m_YAxisUnit;
+                Unit m_ValuesUnit;
             };
             struct VectorCosinus : public ICosinusType {
                 int componentCount() const override { return 3; }
                 std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData,
-                                                              std::vector<double> valuesData, Unit xAxisUnit,
+                                                              std::vector<double> valuesData) const override
-                                                              Unit valuesUnit) const override
                 {
                     return std::make_shared<VectorSeries>(std::move(xAxisData), std::move(valuesData),
-                                                          xAxisUnit, valuesUnit);
+                                                          Unit{QStringLiteral("t"), true}, Unit{});
                 }
                 void generateValues(double x, std::vector<double> &values, int dataIndex) const override
                     std::vector<double> yAxisData(SPECTROGRAM_NUMBER_BANDS);
                     std::iota(yAxisData.begin(), yAxisData.end(), 0.);
-                    return std::make_unique<SpectrogramCosinus>(std::move(yAxisData), Unit{"eV"});
+                    return std::make_unique<SpectrogramCosinus>(std::move(yAxisData), Unit{"eV"},
+                                                                Unit{"eV/(cm^2-s-sr-eV)"});
                 }
                 else if (type.compare(QStringLiteral("vector"), Qt::CaseInsensitive) == 0) {
                     return std::make_unique<VectorCosinus>();
                     // We can close progression beacause all data has been retrieved
                     emit dataProvidedProgress(acqIdentifier, 100);
                 }
-                return type->createDataSeries(std::move(xAxisData), std::move(valuesData),
+                return type->createDataSeries(std::move(xAxisData), std::move(valuesData));
-                                              Unit{QStringLiteral("t"), true}, Unit{});
             }
             void CosinusProvider::requestDataLoading(QUuid acqIdentifier,

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