From 2da9b0f28a10a7fcd7a4ddbd88c2450b1666023e 2017-11-17 08:18:13 From: Alexandre Leroux Date: 2017-11-17 08:18:13 Subject: [PATCH] Spectrograms implementation (1) - Adds ValueType for spectrograms - Inits helper and calls it in the parser --- diff --git a/plugins/amda/include/AmdaResultParser.h b/plugins/amda/include/AmdaResultParser.h index 0d590d5..b078f97 100644 --- a/plugins/amda/include/AmdaResultParser.h +++ b/plugins/amda/include/AmdaResultParser.h @@ -12,7 +12,7 @@ class IDataSeries; Q_DECLARE_LOGGING_CATEGORY(LOG_AmdaResultParser) struct SCIQLOP_AMDA_EXPORT AmdaResultParser { - enum class ValueType { SCALAR, VECTOR, UNKNOWN }; + enum class ValueType { SCALAR, SPECTROGRAM, VECTOR, UNKNOWN }; static std::shared_ptr readTxt(const QString &filePath, ValueType valueType) noexcept; diff --git a/plugins/amda/include/AmdaResultParserHelper.h b/plugins/amda/include/AmdaResultParserHelper.h index b25d063..606cd00 100644 --- a/plugins/amda/include/AmdaResultParserHelper.h +++ b/plugins/amda/include/AmdaResultParserHelper.h @@ -65,6 +65,17 @@ private: }; /** + * Implementation of @sa IAmdaResultParserHelper for spectrograms + */ +class SpectrogramParserHelper : public IAmdaResultParserHelper { +public: + bool checkProperties() override; + std::shared_ptr createSeries() override; + void readPropertyLine(const QString &line) override; + void readResultLine(const QString &line) override; +}; + +/** * Implementation of @sa IAmdaResultParserHelper for vectors */ class VectorParserHelper : public IAmdaResultParserHelper { diff --git a/plugins/amda/src/AmdaProvider.cpp b/plugins/amda/src/AmdaProvider.cpp index ab72309..1d91a89 100644 --- a/plugins/amda/src/AmdaProvider.cpp +++ b/plugins/amda/src/AmdaProvider.cpp @@ -61,6 +61,9 @@ AmdaResultParser::ValueType valueType(const QString &valueType) if (valueType == QStringLiteral("scalar")) { return AmdaResultParser::ValueType::SCALAR; } + else if (valueType == QStringLiteral("spectrogram")) { + return AmdaResultParser::ValueType::SPECTROGRAM; + } else if (valueType == QStringLiteral("vector")) { return AmdaResultParser::ValueType::VECTOR; } diff --git a/plugins/amda/src/AmdaResultParser.cpp b/plugins/amda/src/AmdaResultParser.cpp index fce4151..7259f3c 100644 --- a/plugins/amda/src/AmdaResultParser.cpp +++ b/plugins/amda/src/AmdaResultParser.cpp @@ -29,6 +29,8 @@ std::unique_ptr createHelper(AmdaResultParser::ValueTyp switch (valueType) { case AmdaResultParser::ValueType::SCALAR: return std::make_unique(); + case AmdaResultParser::ValueType::SPECTROGRAM: + return std::make_unique(); case AmdaResultParser::ValueType::VECTOR: return std::make_unique(); case AmdaResultParser::ValueType::UNKNOWN: diff --git a/plugins/amda/src/AmdaResultParserHelper.cpp b/plugins/amda/src/AmdaResultParserHelper.cpp index da7c057..446e98e 100644 --- a/plugins/amda/src/AmdaResultParserHelper.cpp +++ b/plugins/amda/src/AmdaResultParserHelper.cpp @@ -201,6 +201,30 @@ std::vector ScalarParserHelper::valuesIndexes() const return result; } +// /////////////////////// // +// SpectrogramParserHelper // +// /////////////////////// // + +bool SpectrogramParserHelper::checkProperties() +{ + /// @todo ALX +} + +std::shared_ptr SpectrogramParserHelper::createSeries() +{ + /// @todo ALX +} + +void SpectrogramParserHelper::readPropertyLine(const QString &line) +{ + /// @todo ALX +} + +void SpectrogramParserHelper::readResultLine(const QString &line) +{ + /// @todo ALX +} + // ////////////////// // // VectorParserHelper // // ////////////////// //