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

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Handles bounds in spectrogram parser (2)...
Alexandre Leroux -
r1027:c79a0203d10c
parent child
Show More
Side by Side Unified
Context file:
r1027:c79a0203d10c Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,70 +1,76
1 1 #ifndef SCIQLOP_AMDARESULTPARSERDEFS_H
2 2 #define SCIQLOP_AMDARESULTPARSERDEFS_H
3 3
4 4 #include <QtCore/QRegularExpression>
5 5 #include <QtCore/QString>
6 6 #include <QtCore/QVariantHash>
7 7
8 8 // ////////// //
9 9 // Properties //
10 10 // ////////// //
11 11
12 12 /// Alias to represent properties read in the header of AMDA file
13 13 using Properties = QVariantHash;
14 14
15 15 extern const QString END_TIME_PROPERTY;
16 16 extern const QString FILL_VALUE_PROPERTY;
17 17 extern const QString MAX_BANDS_PROPERTY;
18 18 extern const QString MIN_BANDS_PROPERTY;
19 19 extern const QString MAX_SAMPLING_PROPERTY;
20 20 extern const QString MIN_SAMPLING_PROPERTY;
21 21 extern const QString START_TIME_PROPERTY;
22 22 extern const QString X_AXIS_UNIT_PROPERTY;
23 23 extern const QString Y_AXIS_UNIT_PROPERTY;
24 24 extern const QString VALUES_UNIT_PROPERTY;
25 25
26 26 // /////////////////// //
27 27 // Regular expressions //
28 28 // /////////////////// //
29 29
30 30 // AMDA V2
31 31 // /// Regex to find the header of the data in the file. This header indicates the end of comments
32 32 // in the file
33 33 // const auto DATA_HEADER_REGEX = QRegularExpression{QStringLiteral("#\\s*DATA\\s*:")};
34 34
35 35 // AMDA V2
36 36 // /// ... PARAMETER_UNITS : nT ...
37 37 // /// ... PARAMETER_UNITS:nT ...
38 38 // /// ... PARAMETER_UNITS: mΒ² ...
39 39 // /// ... PARAMETER_UNITS : m/s ...
40 40 // const auto UNIT_REGEX = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.+)")};
41 41
42 42 /// Regex to find x-axis unit in a line. Examples of valid lines:
43 43 /// ... - Units : nT - ...
44 44 /// ... -Units:nT- ...
45 45 /// ... -Units: mΒ²- ...
46 46 /// ... - Units : m/s - ...
47 47 extern const QRegularExpression DEFAULT_X_AXIS_UNIT_REGEX;
48 48
49 /// Regex to find end time of data in a line for a spectrogram
50 extern const QRegularExpression SPECTROGRAM_END_TIME_REGEX;
51
49 52 /// Regex to find fill value used in a line for a spectrogram
50 53 extern const QRegularExpression SPECTROGRAM_FILL_VALUE_REGEX;
51 54
52 55 /// Regex to find max bands in a line for a spectrogram
53 56 extern const QRegularExpression SPECTROGRAM_MAX_BANDS_REGEX;
54 57
55 58 /// Regex to find min bands in a line for a spectrogram
56 59 extern const QRegularExpression SPECTROGRAM_MIN_BANDS_REGEX;
57 60
58 61 /// Regex to find max x-axis sampling in a line for a spectrogram
59 62 extern const QRegularExpression SPECTROGRAM_MAX_SAMPLING_REGEX;
60 63
61 64 /// Regex to find min x-axis sampling in a line for a spectrogram
62 65 extern const QRegularExpression SPECTROGRAM_MIN_SAMPLING_REGEX;
63 66
67 /// Regex to find start time of data in a line for a spectrogram
68 extern const QRegularExpression SPECTROGRAM_START_TIME_REGEX;
69
64 70 /// Regex to find y-axis unit in a line for a spectrogram
65 71 extern const QRegularExpression SPECTROGRAM_Y_AXIS_UNIT_REGEX;
66 72
67 73 /// Regex to find values unit in a line for a spectrogram
68 74 extern const QRegularExpression SPECTROGRAM_VALUES_UNIT_REGEX;
69 75
70 76 #endif // SCIQLOP_AMDARESULTPARSERDEFS_H
Show file before | Show file after | Hide comments
@@ -1,36 +1,42
1 1 #include "AmdaResultParserDefs.h"
2 2
3 3 const QString END_TIME_PROPERTY = QStringLiteral("endTime");
4 4 const QString FILL_VALUE_PROPERTY = QStringLiteral("fillValue");
5 5 const QString MAX_BANDS_PROPERTY = QStringLiteral("maxBands");
6 6 const QString MIN_BANDS_PROPERTY = QStringLiteral("minBands");
7 7 const QString MAX_SAMPLING_PROPERTY = QStringLiteral("maxSampling");
8 8 const QString MIN_SAMPLING_PROPERTY = QStringLiteral("minSampling");
9 9 const QString START_TIME_PROPERTY = QStringLiteral("startTime");
10 10 const QString X_AXIS_UNIT_PROPERTY = QStringLiteral("xAxisUnit");
11 11 const QString Y_AXIS_UNIT_PROPERTY = QStringLiteral("yAxisUnit");
12 12 const QString VALUES_UNIT_PROPERTY = QStringLiteral("valuesUnit");
13 13
14 14 const QRegularExpression DEFAULT_X_AXIS_UNIT_REGEX
15 15 = QRegularExpression{QStringLiteral("-\\s*Units\\s*:\\s*(.+?)\\s*-")};
16 16
17 const QRegularExpression SPECTROGRAM_END_TIME_REGEX
18 = QRegularExpression{QStringLiteral("\\s*INTERVAL_STOP\\s*:\\s*(.*)")};
19
17 20 const QRegularExpression SPECTROGRAM_FILL_VALUE_REGEX
18 21 = QRegularExpression{QStringLiteral("\\s*PARAMETER_FILL_VALUE\\s*:\\s*(.*)")};
19 22
20 23 const QRegularExpression SPECTROGRAM_MAX_BANDS_REGEX
21 24 = QRegularExpression{QStringLiteral("\\s*PARAMETER_TABLE_MAX_VALUES\\[0\\]\\s*:\\s*(.*)")};
22 25
23 26 const QRegularExpression SPECTROGRAM_MIN_BANDS_REGEX
24 27 = QRegularExpression{QStringLiteral("\\s*PARAMETER_TABLE_MIN_VALUES\\[0\\]\\s*:\\s*(.*)")};
25 28
26 29 const QRegularExpression SPECTROGRAM_MAX_SAMPLING_REGEX
27 30 = QRegularExpression{QStringLiteral("\\s*DATASET_MAX_SAMPLING\\s*:\\s*(.*)")};
28 31
29 32 const QRegularExpression SPECTROGRAM_MIN_SAMPLING_REGEX
30 33 = QRegularExpression{QStringLiteral("\\s*DATASET_MIN_SAMPLING\\s*:\\s*(.*)")};
31 34
35 const QRegularExpression SPECTROGRAM_START_TIME_REGEX
36 = QRegularExpression{QStringLiteral("\\s*INTERVAL_START\\s*:\\s*(.*)")};
37
32 38 const QRegularExpression SPECTROGRAM_Y_AXIS_UNIT_REGEX
33 39 = QRegularExpression{QStringLiteral("\\s*PARAMETER_TABLE_UNITS\\[0\\]\\s*:\\s*(.*)")};
34 40
35 41 const QRegularExpression SPECTROGRAM_VALUES_UNIT_REGEX
36 42 = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.*)")};
Show file before | Show file after | Hide comments
@@ -1,401 +1,422
1 1 #include "AmdaResultParserHelper.h"
2 2
3 3 #include <Common/DateUtils.h>
4 4 #include <Common/SortUtils.h>
5 5
6 6 #include <Data/DataSeriesUtils.h>
7 7 #include <Data/ScalarSeries.h>
8 8 #include <Data/SpectrogramSeries.h>
9 9 #include <Data/Unit.h>
10 10 #include <Data/VectorSeries.h>
11 11
12 12 #include <QtCore/QDateTime>
13 13 #include <QtCore/QRegularExpression>
14 14
15 15 #include <functional>
16 16
17 17 Q_LOGGING_CATEGORY(LOG_AmdaResultParserHelper, "AmdaResultParserHelper")
18 18
19 19 namespace {
20 20
21 21 // ///////// //
22 22 // Constants //
23 23 // ///////// //
24 24
25 25 /// Separator between values in a result line
26 26 const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
27 27
28 28 /// Format for dates in result files
29 29 const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
30 30
31 31 // /////// //
32 32 // Methods //
33 33 // /////// //
34 34
35 35 /**
36 36 * Checks that the properties contain a specific unit and that this unit is valid
37 37 * @param properties the properties map in which to search unit
38 38 * @param key the key to search for the unit in the properties
39 39 * @param errorMessage the error message to log in case the unit is invalid
40 40 * @return true if the unit is valid, false it it's invalid or was not found in the properties
41 41 */
42 42 bool checkUnit(const Properties &properties, const QString &key, const QString &errorMessage)
43 43 {
44 44 auto unit = properties.value(key).value<Unit>();
45 45 if (unit.m_Name.isEmpty()) {
46 46 qCWarning(LOG_AmdaResultParserHelper()) << errorMessage;
47 47 return false;
48 48 }
49 49
50 50 return true;
51 51 }
52 52
53 53 QDateTime dateTimeFromString(const QString &stringDate) noexcept
54 54 {
55 55 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
56 56 return QDateTime::fromString(stringDate, Qt::ISODateWithMs);
57 57 #else
58 58 return QDateTime::fromString(stringDate, DATE_FORMAT);
59 59 #endif
60 60 }
61 61
62 62 /// Converts a string date to a double date
63 63 /// @return a double that represents the date in seconds, NaN if the string date can't be converted
64 64 double doubleDate(const QString &stringDate) noexcept
65 65 {
66 66 // Format: yyyy-MM-ddThh:mm:ss.zzz
67 67 auto dateTime = dateTimeFromString(stringDate);
68 68 dateTime.setTimeSpec(Qt::UTC);
69 69 return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
70 70 : std::numeric_limits<double>::quiet_NaN();
71 71 }
72 72
73 73 /**
74 74 * Reads a line from the AMDA file and tries to extract a x-axis data and value data from it
75 75 * @param xAxisData the vector in which to store the x-axis data extracted
76 76 * @param valuesData the vector in which to store the value extracted
77 77 * @param line the line to read to extract the property
78 78 * @param valuesIndexes indexes of insertion of read values. For example, if the line contains three
79 79 * columns of values, and valuesIndexes are {2, 0, 1}, the value of the third column will be read
80 80 * and inserted first, then the value of the first column, and finally the value of the second
81 81 * column.
82 82 * @param fillValue value that tags an invalid data. For example, if fillValue is -1 and a read
83 83 * value is -1, then this value is considered as invalid and converted to NaN
84 84 */
85 85 void tryReadResult(std::vector<double> &xAxisData, std::vector<double> &valuesData,
86 86 const QString &line, const std::vector<int> &valuesIndexes,
87 87 double fillValue = std::numeric_limits<double>::quiet_NaN())
88 88 {
89 89 auto lineData = line.split(RESULT_LINE_SEPARATOR, QString::SkipEmptyParts);
90 90
91 91 // Checks that the line contains expected number of values + x-axis value
92 92 if (static_cast<size_t>(lineData.size()) == valuesIndexes.size() + 1) {
93 93 // X : the data is converted from date to double (in secs)
94 94 auto x = doubleDate(lineData.at(0));
95 95
96 96 // Adds result only if x is valid. Then, if value is invalid, it is set to NaN
97 97 if (!std::isnan(x)) {
98 98 xAxisData.push_back(x);
99 99
100 100 // Values
101 101 for (auto valueIndex : valuesIndexes) {
102 102 bool valueOk;
103 103 // we use valueIndex + 1 to skip column 0 (x-axis value)
104 104 auto value = lineData.at(valueIndex + 1).toDouble(&valueOk);
105 105
106 106 if (!valueOk) {
107 107 qCWarning(LOG_AmdaResultParserHelper())
108 108 << QObject::tr(
109 109 "Value from (line %1, column %2) is invalid and will be "
110 110 "converted to NaN")
111 111 .arg(line, valueIndex);
112 112 value = std::numeric_limits<double>::quiet_NaN();
113 113 }
114 114
115 115 // Handles fill value
116 116 if (!std::isnan(fillValue) && !std::isnan(value) && fillValue == value) {
117 117 value = std::numeric_limits<double>::quiet_NaN();
118 118 }
119 119
120 120 valuesData.push_back(value);
121 121 }
122 122 }
123 123 else {
124 124 qCWarning(LOG_AmdaResultParserHelper())
125 125 << QObject::tr("Can't retrieve results from line %1: x is invalid").arg(line);
126 126 }
127 127 }
128 128 else {
129 129 qCWarning(LOG_AmdaResultParserHelper())
130 130 << QObject::tr("Can't retrieve results from line %1: invalid line").arg(line);
131 131 }
132 132 }
133 133
134 134 /**
135 135 * Reads a line from the AMDA file and tries to extract a property from it
136 136 * @param properties the properties map in which to put the property extracted from the line
137 137 * @param key the key to which the property is added in the properties map
138 138 * @param line the line to read to extract the property
139 139 * @param regex the expected regex to extract the property. If the line matches this regex, the
140 140 * property is generated
141 141 * @param fun the function used to generate the property
142 142 * @return true if the property could be generated, false if the line does not match the regex, or
143 143 * if a property has already been generated for the key
144 144 */
145 145 template <typename GeneratePropertyFun>
146 146 bool tryReadProperty(Properties &properties, const QString &key, const QString &line,
147 147 const QRegularExpression &regex, GeneratePropertyFun fun)
148 148 {
149 149 if (properties.contains(key)) {
150 150 return false;
151 151 }
152 152
153 153 auto match = regex.match(line);
154 154 if (match.hasMatch()) {
155 155 properties.insert(key, fun(match));
156 156 }
157 157
158 158 return match.hasMatch();
159 159 }
160 160
161 161 /**
162 * Reads a line from the AMDA file and tries to extract a data from it. Date is converted to double
163 * @sa tryReadProperty()
164 */
165 bool tryReadDate(Properties &properties, const QString &key, const QString &line,
166 const QRegularExpression &regex, bool timeUnit = false)
167 {
168 return tryReadProperty(properties, key, line, regex, [timeUnit](const auto &match) {
169 return QVariant::fromValue(doubleDate(match.captured(1)));
170 });
171 }
172
173 /**
162 174 * Reads a line from the AMDA file and tries to extract a double from it
163 175 * @sa tryReadProperty()
164 176 */
165 177 bool tryReadDouble(Properties &properties, const QString &key, const QString &line,
166 178 const QRegularExpression &regex)
167 179 {
168 180 return tryReadProperty(properties, key, line, regex, [](const auto &match) {
169 181 bool ok;
170 182
171 183 // If the value can't be converted to double, it is set to NaN
172 184 auto doubleValue = match.captured(1).toDouble(&ok);
173 185 if (!ok) {
174 186 doubleValue = std::numeric_limits<double>::quiet_NaN();
175 187 }
176 188
177 189 return QVariant::fromValue(doubleValue);
178 190 });
179 191 }
180 192
181 193 /**
182 194 * Reads a line from the AMDA file and tries to extract a vector of doubles from it
183 195 * @param sep the separator of double values in the line
184 196 * @sa tryReadProperty()
185 197 */
186 198 bool tryReadDoubles(Properties &properties, const QString &key, const QString &line,
187 199 const QRegularExpression &regex, const QString &sep = QStringLiteral(","))
188 200 {
189 201 return tryReadProperty(properties, key, line, regex, [sep](const auto &match) {
190 202 std::vector<double> doubleValues{};
191 203
192 204 // If the value can't be converted to double, it is set to NaN
193 205 auto values = match.captured(1).split(sep);
194 206 for (auto value : values) {
195 207 bool ok;
196 208
197 209 auto doubleValue = value.toDouble(&ok);
198 210 if (!ok) {
199 211 doubleValue = std::numeric_limits<double>::quiet_NaN();
200 212 }
201 213
202 214 doubleValues.push_back(doubleValue);
203 215 }
204 216
205 217 return QVariant::fromValue(doubleValues);
206 218 });
207 219 }
208 220
209 221 /**
210 222 * Reads a line from the AMDA file and tries to extract a unit from it
211 223 * @sa tryReadProperty()
212 224 */
213 225 bool tryReadUnit(Properties &properties, const QString &key, const QString &line,
214 226 const QRegularExpression &regex, bool timeUnit = false)
215 227 {
216 228 return tryReadProperty(properties, key, line, regex, [timeUnit](const auto &match) {
217 229 return QVariant::fromValue(Unit{match.captured(1), timeUnit});
218 230 });
219 231 }
220 232
221 233 } // namespace
222 234
223 235 // ////////////////// //
224 236 // ScalarParserHelper //
225 237 // ////////////////// //
226 238
227 239 bool ScalarParserHelper::checkProperties()
228 240 {
229 241 return checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY,
230 242 QObject::tr("The x-axis unit could not be found in the file"));
231 243 }
232 244
233 245 std::shared_ptr<IDataSeries> ScalarParserHelper::createSeries()
234 246 {
235 247 return std::make_shared<ScalarSeries>(std::move(m_XAxisData), std::move(m_ValuesData),
236 248 m_Properties.value(X_AXIS_UNIT_PROPERTY).value<Unit>(),
237 249 m_Properties.value(VALUES_UNIT_PROPERTY).value<Unit>());
238 250 }
239 251
240 252 void ScalarParserHelper::readPropertyLine(const QString &line)
241 253 {
242 254 tryReadUnit(m_Properties, X_AXIS_UNIT_PROPERTY, line, DEFAULT_X_AXIS_UNIT_REGEX, true);
243 255 }
244 256
245 257 void ScalarParserHelper::readResultLine(const QString &line)
246 258 {
247 259 tryReadResult(m_XAxisData, m_ValuesData, line, valuesIndexes());
248 260 }
249 261
250 262 std::vector<int> ScalarParserHelper::valuesIndexes() const
251 263 {
252 264 // Only one value to read
253 265 static auto result = std::vector<int>{0};
254 266 return result;
255 267 }
256 268
257 269 // /////////////////////// //
258 270 // SpectrogramParserHelper //
259 271 // /////////////////////// //
260 272
261 273 bool SpectrogramParserHelper::checkProperties()
262 274 {
263 275 // Generates y-axis data from bands extracted (take the middle of the intervals)
264 276 auto minBands = m_Properties.value(MIN_BANDS_PROPERTY).value<std::vector<double> >();
265 277 auto maxBands = m_Properties.value(MAX_BANDS_PROPERTY).value<std::vector<double> >();
266 278
267 279 if (minBands.size() != maxBands.size()) {
268 280 qCWarning(LOG_AmdaResultParserHelper()) << QObject::tr(
269 281 "Can't generate y-axis data from bands extracted: bands intervals are invalid");
270 282 return false;
271 283 }
272 284
273 285 std::transform(
274 286 minBands.begin(), minBands.end(), maxBands.begin(), std::back_inserter(m_YAxisData),
275 287 [](const auto &minValue, const auto &maxValue) { return (minValue + maxValue) / 2.; });
276 288
277 289 // Generates values indexes, i.e. the order in which each value will be retrieved (in ascending
278 290 // order of the associated bands)
279 291 m_ValuesIndexes = SortUtils::sortPermutation(m_YAxisData, std::less<double>());
280 292
281 293 // Sorts y-axis data accoding to the ascending order
282 294 m_YAxisData = SortUtils::sort(m_YAxisData, 1, m_ValuesIndexes);
283 295
284 296 // Sets fill value
285 297 m_FillValue = m_Properties.value(FILL_VALUE_PROPERTY).value<double>();
286 298
287 299 return true;
288 300 }
289 301
290 302 std::shared_ptr<IDataSeries> SpectrogramParserHelper::createSeries()
291 303 {
292 304 // Before creating the series, we handle its data holes
293 305 handleDataHoles();
294 306
295 307 return std::make_shared<SpectrogramSeries>(
296 308 std::move(m_XAxisData), std::move(m_YAxisData), std::move(m_ValuesData),
297 309 Unit{"t", true}, // x-axis unit is always a time unit
298 310 m_Properties.value(Y_AXIS_UNIT_PROPERTY).value<Unit>(),
299 311 m_Properties.value(VALUES_UNIT_PROPERTY).value<Unit>());
300 312 }
301 313
302 314 void SpectrogramParserHelper::readPropertyLine(const QString &line)
303 315 {
304 316 // Set of functions to test on the line to generate a property. If a function is valid (i.e. a
305 317 // property has been generated for the line), the line is treated as processed and the other
306 318 // functions are not called
307 319 std::vector<std::function<bool()> > functions{
308 320 // values unit
309 321 [&] {
310 322 return tryReadUnit(m_Properties, VALUES_UNIT_PROPERTY, line,
311 323 SPECTROGRAM_VALUES_UNIT_REGEX);
312 324 },
313 325 // y-axis unit
314 326 [&] {
315 327 return tryReadUnit(m_Properties, Y_AXIS_UNIT_PROPERTY, line,
316 328 SPECTROGRAM_Y_AXIS_UNIT_REGEX);
317 329 },
318 330 // min sampling
319 331 [&] {
320 332 return tryReadDouble(m_Properties, MIN_SAMPLING_PROPERTY, line,
321 333 SPECTROGRAM_MIN_SAMPLING_REGEX);
322 334 },
323 335 // max sampling
324 336 [&] {
325 337 return tryReadDouble(m_Properties, MAX_SAMPLING_PROPERTY, line,
326 338 SPECTROGRAM_MAX_SAMPLING_REGEX);
327 339 },
328 340 // fill value
329 341 [&] {
330 342 return tryReadDouble(m_Properties, FILL_VALUE_PROPERTY, line,
331 343 SPECTROGRAM_FILL_VALUE_REGEX);
332 344 },
333 345 // min bounds of each band
334 346 [&] {
335 347 return tryReadDoubles(m_Properties, MIN_BANDS_PROPERTY, line,
336 348 SPECTROGRAM_MIN_BANDS_REGEX);
337 349 },
338 350 // max bounds of each band
339 351 [&] {
340 352 return tryReadDoubles(m_Properties, MAX_BANDS_PROPERTY, line,
341 353 SPECTROGRAM_MAX_BANDS_REGEX);
354 },
355 // start time of data
356 [&] {
357 return tryReadDate(m_Properties, START_TIME_PROPERTY, line,
358 SPECTROGRAM_START_TIME_REGEX);
359 },
360 // end time of data
361 [&] {
362 return tryReadDate(m_Properties, END_TIME_PROPERTY, line, SPECTROGRAM_END_TIME_REGEX);
342 363 }};
343 364
344 365 for (auto function : functions) {
345 366 // Stops at the first function that is valid
346 367 if (function()) {
347 368 return;
348 369 }
349 370 }
350 371 }
351 372
352 373 void SpectrogramParserHelper::readResultLine(const QString &line)
353 374 {
354 375 tryReadResult(m_XAxisData, m_ValuesData, line, m_ValuesIndexes, m_FillValue);
355 376 }
356 377
357 378 void SpectrogramParserHelper::handleDataHoles()
358 379 {
359 380 // Fills data holes according to the max resolution found in the AMDA file
360 381 auto resolution = m_Properties.value(MAX_SAMPLING_PROPERTY).value<double>();
361 382 auto fillValue = m_Properties.value(FILL_VALUE_PROPERTY).value<double>();
362 383 auto minBound = m_Properties.value(START_TIME_PROPERTY).value<double>();
363 384 auto maxBound = m_Properties.value(END_TIME_PROPERTY).value<double>();
364 385
365 386 DataSeriesUtils::fillDataHoles(m_XAxisData, m_ValuesData, resolution, fillValue, minBound,
366 387 maxBound);
367 388 }
368 389
369 390 // ////////////////// //
370 391 // VectorParserHelper //
371 392 // ////////////////// //
372 393
373 394 bool VectorParserHelper::checkProperties()
374 395 {
375 396 return checkUnit(m_Properties, X_AXIS_UNIT_PROPERTY,
376 397 QObject::tr("The x-axis unit could not be found in the file"));
377 398 }
378 399
379 400 std::shared_ptr<IDataSeries> VectorParserHelper::createSeries()
380 401 {
381 402 return std::make_shared<VectorSeries>(std::move(m_XAxisData), std::move(m_ValuesData),
382 403 m_Properties.value(X_AXIS_UNIT_PROPERTY).value<Unit>(),
383 404 m_Properties.value(VALUES_UNIT_PROPERTY).value<Unit>());
384 405 }
385 406
386 407 void VectorParserHelper::readPropertyLine(const QString &line)
387 408 {
388 409 tryReadUnit(m_Properties, X_AXIS_UNIT_PROPERTY, line, DEFAULT_X_AXIS_UNIT_REGEX, true);
389 410 }
390 411
391 412 void VectorParserHelper::readResultLine(const QString &line)
392 413 {
393 414 tryReadResult(m_XAxisData, m_ValuesData, line, valuesIndexes());
394 415 }
395 416
396 417 std::vector<int> VectorParserHelper::valuesIndexes() const
397 418 {
398 419 // 3 values to read, in order in the file (x, y, z)
399 420 static auto result = std::vector<int>{0, 1, 2};
400 421 return result;
401 422 }
General Comments 0
You need to be logged in to leave comments. Login now