GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1304:23206e07bbc2

Reads variable's metadata to retrieve the type of data series (scalar, vector, spectrogram)

Alexandre Leroux -

r1304:23206e07bbc2

parent child

Context file:

r1304:23206e07bbc2

Collapse all files

core/include/Variable/Variable.h +4 0

             #include "CoreGlobal.h"
             #include <Data/DataSeriesIterator.h>
+            #include <Data/DataSeriesType.h>
             #include <Data/SqpRange.h>
             #include <QLoggingCategory>
                 /// @return the data of the variable, nullptr if there is no data
                 std::shared_ptr<IDataSeries> dataSeries() const noexcept;
+                /// @return the type of data that the variable holds
+                DataSeriesType type() const noexcept;
                 QVariantHash metadata() const noexcept;
                 bool contains(const SqpRange &range) const noexcept;

core/src/Variable/Variable.cpp +37 -2

             Q_LOGGING_CATEGORY(LOG_Variable, "Variable")
+            namespace {
+            /**
+             * Searches in metadata for a value that can be converted to DataSeriesType
+             * @param metadata the metadata where to search
+             * @return the value converted to a DataSeriesType if it was found, UNKNOWN type otherwise
+             * @sa DataSeriesType
+             */
+            DataSeriesType findDataSeriesType(const QVariantHash &metadata)
+            {
+                auto dataSeriesType = DataSeriesType::UNKNOWN;
+                // Go through the metadata and stop at the first value that could be converted to DataSeriesType
+                for (auto it = metadata.cbegin(), end = metadata.cend();
+                     it != end && dataSeriesType == DataSeriesType::UNKNOWN; ++it) {
+                    dataSeriesType = DataSeriesTypeUtils::fromString(it.value().toString());
+                }
+                return dataSeriesType;
+            }
+            } // namespace
             struct Variable::VariablePrivate {
                 explicit VariablePrivate(const QString &name, const QVariantHash &metadata)
                         : m_Name{name},
                           m_Metadata{metadata},
                           m_DataSeries{nullptr},
                           m_RealRange{INVALID_RANGE},
-                          m_NbPoints{0}
+                          m_NbPoints{0},
+                          m_Type{findDataSeriesType(m_Metadata)}
                 {
                 }
                           m_Metadata{other.m_Metadata},
                           m_DataSeries{other.m_DataSeries != nullptr ? other.m_DataSeries->clone() : nullptr},
                           m_RealRange{other.m_RealRange},
-                          m_NbPoints{other.m_NbPoints}
+                          m_NbPoints{other.m_NbPoints},
+                          m_Type{findDataSeriesType(m_Metadata)}
                 {
                 }
                 std::shared_ptr<IDataSeries> m_DataSeries;
                 SqpRange m_RealRange;
                 int m_NbPoints;
+                DataSeriesType m_Type;
                 QReadWriteLock m_Lock;
             };
                 return dataSeries;
             }
+            DataSeriesType Variable::type() const noexcept
+            {
+                impl->lockRead();
+                auto type = impl->m_Type;
+                impl->unlock();
+                return type;
+            }
             QVariantHash Variable::metadata() const noexcept
             {
                 impl->lockRead();

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