HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r393:dc7f981a773b

Reads x-axis unit in result file

Alexandre Leroux -

r393:dc7f981a773b

parent child

Context file:

r393:dc7f981a773b

Collapse all files

plugins/amda/src/AmdaResultParser.cpp +43 -4

             #include <QDateTime>
             #include <QFile>
+            #include <QRegularExpression>
             Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
             /// Format for dates in result files
             const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
+            /// Regex to find unit in a line. Examples of valid lines:
+            /// ... - Units : nT - ...
+            /// ... -Units:nT- ...
+            /// ... -Units:   m²- ...
+            /// ... - Units : m/s - ...
+            const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
             /// @todo ALX
             double doubleDate(const QString &stringDate) noexcept
             {
                 return dateTime.toMSecsSinceEpoch() / 1000.;
             }
+            /**
+             * Reads stream to retrieve x-axis unit
+             * @param stream the stream to read
+             * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
+             * error occured during reading
+             */
+            Unit readXAxisUnit(QTextStream &stream)
+            {
+                QString line{};
+                if (stream.readLineInto(&line)) {
+                    auto match = UNIT_REGEX.match(line);
+                    if (match.hasMatch()) {
+                        return Unit{match.captured(1), true};
+                    }
+                    else {
+                        qCWarning(LOG_AmdaResultParser())
+                            << QObject::tr("Can't read unit: invalid line %1").arg(line);
+                    }
+                }
+                else {
+                    qCWarning(LOG_AmdaResultParser()) << QObject::tr("Can't read unit: end of file");
+                }
+                // Error cases
+                return Unit{{}, true};
+            }
             } // namespace
             std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath) noexcept
                 QTextStream stream{&file};
-                // Ignore comment lines (3 lines)
+                // Ignore first two lines (comments lines)
-                stream.readLine();
                 stream.readLine();
                 stream.readLine();
                 QString line{};
+                // Reads x-axis unit
+                auto xAxisUnit = readXAxisUnit(stream);
+                // Reads results
                 auto lineRegex = QRegExp{QStringLiteral("\\s+")};
                 while (stream.readLineInto(&line)) {
                     auto lineData = line.split(lineRegex, QString::SkipEmptyParts);
                     }
                 }
-                /// @todo ALX : handle units
+                return std::make_shared<ScalarSeries>(std::move(xData), std::move(valuesData), xAxisUnit,
-                return std::make_shared<ScalarSeries>(std::move(xData), std::move(valuesData), Unit{"nT", true},
                                                       Unit{});
             }

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