##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Uses std::vector when retrieving Amda results
Alexandre Leroux -
r733:4f81c91b9535
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,217 +1,209
1 #include "AmdaResultParser.h"
1 #include "AmdaResultParser.h"
2
2
3 #include <Common/DateUtils.h>
3 #include <Common/DateUtils.h>
4 #include <Data/ScalarSeries.h>
4 #include <Data/ScalarSeries.h>
5 #include <Data/VectorSeries.h>
5 #include <Data/VectorSeries.h>
6
6
7 #include <QDateTime>
7 #include <QDateTime>
8 #include <QFile>
8 #include <QFile>
9 #include <QRegularExpression>
9 #include <QRegularExpression>
10
10
11 #include <cmath>
11 #include <cmath>
12
12
13 Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
13 Q_LOGGING_CATEGORY(LOG_AmdaResultParser, "AmdaResultParser")
14
14
15 namespace {
15 namespace {
16
16
17 /// Message in result file when the file was not found on server
17 /// Message in result file when the file was not found on server
18 const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
18 const auto FILE_NOT_FOUND_MESSAGE = QStringLiteral("Not Found");
19
19
20 /// Format for dates in result files
20 /// Format for dates in result files
21 const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
21 const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
22
22
23 /// Separator between values in a result line
23 /// Separator between values in a result line
24 const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
24 const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
25
25
26 /// Regex to find unit in a line. Examples of valid lines:
26 /// Regex to find unit in a line. Examples of valid lines:
27 /// ... - Units : nT - ...
27 /// ... - Units : nT - ...
28 /// ... -Units:nT- ...
28 /// ... -Units:nT- ...
29 /// ... -Units: mΒ²- ...
29 /// ... -Units: mΒ²- ...
30 /// ... - Units : m/s - ...
30 /// ... - Units : m/s - ...
31 const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
31 const auto UNIT_REGEX = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
32
32
33 /// Converts a string date to a double date
33 /// Converts a string date to a double date
34 /// @return a double that represents the date in seconds, NaN if the string date can't be converted
34 /// @return a double that represents the date in seconds, NaN if the string date can't be converted
35 double doubleDate(const QString &stringDate) noexcept
35 double doubleDate(const QString &stringDate) noexcept
36 {
36 {
37 auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
37 auto dateTime = QDateTime::fromString(stringDate, DATE_FORMAT);
38 dateTime.setTimeSpec(Qt::UTC);
38 dateTime.setTimeSpec(Qt::UTC);
39 return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
39 return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
40 : std::numeric_limits<double>::quiet_NaN();
40 : std::numeric_limits<double>::quiet_NaN();
41 }
41 }
42
42
43 /// Checks if a line is a comment line
43 /// Checks if a line is a comment line
44 bool isCommentLine(const QString &line)
44 bool isCommentLine(const QString &line)
45 {
45 {
46 return line.startsWith("#");
46 return line.startsWith("#");
47 }
47 }
48
48
49 /// @return the number of lines to be read depending on the type of value passed in parameter
49 /// @return the number of lines to be read depending on the type of value passed in parameter
50 int nbValues(AmdaResultParser::ValueType valueType) noexcept
50 int nbValues(AmdaResultParser::ValueType valueType) noexcept
51 {
51 {
52 switch (valueType) {
52 switch (valueType) {
53 case AmdaResultParser::ValueType::SCALAR:
53 case AmdaResultParser::ValueType::SCALAR:
54 return 1;
54 return 1;
55 case AmdaResultParser::ValueType::VECTOR:
55 case AmdaResultParser::ValueType::VECTOR:
56 return 3;
56 return 3;
57 case AmdaResultParser::ValueType::UNKNOWN:
57 case AmdaResultParser::ValueType::UNKNOWN:
58 // Invalid case
58 // Invalid case
59 break;
59 break;
60 }
60 }
61
61
62 // Invalid cases
62 // Invalid cases
63 qCCritical(LOG_AmdaResultParser())
63 qCCritical(LOG_AmdaResultParser())
64 << QObject::tr("Can't get the number of values to read: unsupported type");
64 << QObject::tr("Can't get the number of values to read: unsupported type");
65 return 0;
65 return 0;
66 }
66 }
67
67
68 /**
68 /**
69 * Reads stream to retrieve x-axis unit
69 * Reads stream to retrieve x-axis unit
70 * @param stream the stream to read
70 * @param stream the stream to read
71 * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
71 * @return the unit that has been read in the stream, a default unit (time unit with no label) if an
72 * error occured during reading
72 * error occured during reading
73 */
73 */
74 Unit readXAxisUnit(QTextStream &stream)
74 Unit readXAxisUnit(QTextStream &stream)
75 {
75 {
76 QString line{};
76 QString line{};
77
77
78 // Searches unit in the comment lines
78 // Searches unit in the comment lines
79 while (stream.readLineInto(&line) && isCommentLine(line)) {
79 while (stream.readLineInto(&line) && isCommentLine(line)) {
80 auto match = UNIT_REGEX.match(line);
80 auto match = UNIT_REGEX.match(line);
81 if (match.hasMatch()) {
81 if (match.hasMatch()) {
82 return Unit{match.captured(1), true};
82 return Unit{match.captured(1), true};
83 }
83 }
84 }
84 }
85
85
86 qCWarning(LOG_AmdaResultParser()) << QObject::tr("The unit could not be found in the file");
86 qCWarning(LOG_AmdaResultParser()) << QObject::tr("The unit could not be found in the file");
87
87
88 // Error cases
88 // Error cases
89 return Unit{{}, true};
89 return Unit{{}, true};
90 }
90 }
91
91
92 /**
92 /**
93 * Reads stream to retrieve results
93 * Reads stream to retrieve results
94 * @param stream the stream to read
94 * @param stream the stream to read
95 * @return the pair of vectors x-axis data/values data that has been read in the stream
95 * @return the pair of vectors x-axis data/values data that has been read in the stream
96 */
96 */
97 QPair<QVector<double>, QVector<QVector<double> > >
97 std::pair<std::vector<double>, std::vector<double> >
98 readResults(QTextStream &stream, AmdaResultParser::ValueType valueType)
98 readResults(QTextStream &stream, AmdaResultParser::ValueType valueType)
99 {
99 {
100 auto expectedNbValues = nbValues(valueType);
100 auto expectedNbValues = nbValues(valueType);
101
101
102 auto xData = QVector<double>{};
102 auto xData = std::vector<double>{};
103 auto valuesData = QVector<QVector<double> >(expectedNbValues);
103 auto valuesData = std::vector<double>{};
104
104
105 QString line{};
105 QString line{};
106
106
107 while (stream.readLineInto(&line)) {
107 while (stream.readLineInto(&line)) {
108 // Ignore comment lines
108 // Ignore comment lines
109 if (!isCommentLine(line)) {
109 if (!isCommentLine(line)) {
110 auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
110 auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
111 if (lineData.size() == expectedNbValues + 1) {
111 if (lineData.size() == expectedNbValues + 1) {
112 // X : the data is converted from date to double (in secs)
112 // X : the data is converted from date to double (in secs)
113 auto x = doubleDate(lineData.at(0));
113 auto x = doubleDate(lineData.at(0));
114
114
115 // Adds result only if x is valid. Then, if value is invalid, it is set to NaN
115 // Adds result only if x is valid. Then, if value is invalid, it is set to NaN
116 if (!std::isnan(x)) {
116 if (!std::isnan(x)) {
117 xData.push_back(x);
117 xData.push_back(x);
118
118
119 // Values
119 // Values
120 for (auto valueIndex = 0; valueIndex < expectedNbValues; ++valueIndex) {
120 for (auto valueIndex = 0; valueIndex < expectedNbValues; ++valueIndex) {
121 auto column = valueIndex + 1;
121 auto column = valueIndex + 1;
122
122
123 bool valueOk;
123 bool valueOk;
124 auto value = lineData.at(column).toDouble(&valueOk);
124 auto value = lineData.at(column).toDouble(&valueOk);
125
125
126 if (!valueOk) {
126 if (!valueOk) {
127 qCWarning(LOG_AmdaResultParser())
127 qCWarning(LOG_AmdaResultParser())
128 << QObject::tr(
128 << QObject::tr(
129 "Value from (line %1, column %2) is invalid and will be "
129 "Value from (line %1, column %2) is invalid and will be "
130 "converted to NaN")
130 "converted to NaN")
131 .arg(line, column);
131 .arg(line, column);
132 value = std::numeric_limits<double>::quiet_NaN();
132 value = std::numeric_limits<double>::quiet_NaN();
133 }
133 }
134 valuesData[valueIndex].append(value);
134 valuesData.push_back(value);
135 }
135 }
136 }
136 }
137 else {
137 else {
138 qCWarning(LOG_AmdaResultParser())
138 qCWarning(LOG_AmdaResultParser())
139 << QObject::tr("Can't retrieve results from line %1: x is invalid")
139 << QObject::tr("Can't retrieve results from line %1: x is invalid")
140 .arg(line);
140 .arg(line);
141 }
141 }
142 }
142 }
143 else {
143 else {
144 qCWarning(LOG_AmdaResultParser())
144 qCWarning(LOG_AmdaResultParser())
145 << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
145 << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
146 }
146 }
147 }
147 }
148 }
148 }
149
149
150 return qMakePair(std::move(xData), std::move(valuesData));
150 return std::make_pair(std::move(xData), std::move(valuesData));
151 }
151 }
152
152
153 } // namespace
153 } // namespace
154
154
155 std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath,
155 std::shared_ptr<IDataSeries> AmdaResultParser::readTxt(const QString &filePath,
156 ValueType valueType) noexcept
156 ValueType valueType) noexcept
157 {
157 {
158 if (valueType == ValueType::UNKNOWN) {
158 if (valueType == ValueType::UNKNOWN) {
159 qCCritical(LOG_AmdaResultParser())
159 qCCritical(LOG_AmdaResultParser())
160 << QObject::tr("Can't retrieve AMDA data: the type of values to be read is unknown");
160 << QObject::tr("Can't retrieve AMDA data: the type of values to be read is unknown");
161 return nullptr;
161 return nullptr;
162 }
162 }
163
163
164 QFile file{filePath};
164 QFile file{filePath};
165
165
166 if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
166 if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
167 qCCritical(LOG_AmdaResultParser())
167 qCCritical(LOG_AmdaResultParser())
168 << QObject::tr("Can't retrieve AMDA data from file %1: %2")
168 << QObject::tr("Can't retrieve AMDA data from file %1: %2")
169 .arg(filePath, file.errorString());
169 .arg(filePath, file.errorString());
170 return nullptr;
170 return nullptr;
171 }
171 }
172
172
173 QTextStream stream{&file};
173 QTextStream stream{&file};
174
174
175 // Checks if the file was found on the server
175 // Checks if the file was found on the server
176 auto firstLine = stream.readLine();
176 auto firstLine = stream.readLine();
177 if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
177 if (firstLine.compare(FILE_NOT_FOUND_MESSAGE) == 0) {
178 qCCritical(LOG_AmdaResultParser())
178 qCCritical(LOG_AmdaResultParser())
179 << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
179 << QObject::tr("Can't retrieve AMDA data from file %1: file was not found on server")
180 .arg(filePath);
180 .arg(filePath);
181 return nullptr;
181 return nullptr;
182 }
182 }
183
183
184 // Reads x-axis unit
184 // Reads x-axis unit
185 stream.seek(0); // returns to the beginning of the file
185 stream.seek(0); // returns to the beginning of the file
186 auto xAxisUnit = readXAxisUnit(stream);
186 auto xAxisUnit = readXAxisUnit(stream);
187
187
188 // Reads results
188 // Reads results
189 stream.seek(0); // returns to the beginning of the file
189 stream.seek(0); // returns to the beginning of the file
190 auto results = readResults(stream, valueType);
190 auto results = readResults(stream, valueType);
191
191
192 // Creates data series
192 // Creates data series
193 switch (valueType) {
193 switch (valueType) {
194 case ValueType::SCALAR:
194 case ValueType::SCALAR:
195 Q_ASSERT(results.second.size() == 1);
195 return std::make_shared<ScalarSeries>(std::move(results.first),
196 return std::make_shared<ScalarSeries>(
196 std::move(results.second), xAxisUnit, Unit{});
197 std::move(results.first.toStdVector()),
197 case ValueType::VECTOR:
198 std::move(results.second.takeFirst().toStdVector()), xAxisUnit, Unit{});
198 return std::make_shared<VectorSeries>(std::move(results.first),
199 case ValueType::VECTOR: {
199 std::move(results.second), xAxisUnit, Unit{});
200 Q_ASSERT(results.second.size() == 3);
201 auto xValues = results.second.takeFirst().toStdVector();
202 auto yValues = results.second.takeFirst().toStdVector();
203 auto zValues = results.second.takeFirst().toStdVector();
204 return std::make_shared<VectorSeries>(std::move(results.first.toStdVector()),
205 std::move(xValues), std::move(yValues),
206 std::move(zValues), xAxisUnit, Unit{});
207 }
208 case ValueType::UNKNOWN:
200 case ValueType::UNKNOWN:
209 // Invalid case
201 // Invalid case
210 break;
202 break;
211 }
203 }
212
204
213 // Invalid cases
205 // Invalid cases
214 qCCritical(LOG_AmdaResultParser())
206 qCCritical(LOG_AmdaResultParser())
215 << QObject::tr("Can't create data series: unsupported value type");
207 << QObject::tr("Can't create data series: unsupported value type");
216 return nullptr;
208 return nullptr;
217 }
209 }
General Comments 0
You need to be logged in to leave comments. Login now