@@ -12,11 +12,13 | |||||
12 | /// Alias to represent properties read in the header of AMDA file |
|
12 | /// Alias to represent properties read in the header of AMDA file | |
13 | using Properties = QVariantHash; |
|
13 | using Properties = QVariantHash; | |
14 |
|
14 | |||
|
15 | extern const QString END_TIME_PROPERTY; | |||
15 | extern const QString FILL_VALUE_PROPERTY; |
|
16 | extern const QString FILL_VALUE_PROPERTY; | |
16 | extern const QString MAX_BANDS_PROPERTY; |
|
17 | extern const QString MAX_BANDS_PROPERTY; | |
17 | extern const QString MIN_BANDS_PROPERTY; |
|
18 | extern const QString MIN_BANDS_PROPERTY; | |
18 | extern const QString MAX_SAMPLING_PROPERTY; |
|
19 | extern const QString MAX_SAMPLING_PROPERTY; | |
19 | extern const QString MIN_SAMPLING_PROPERTY; |
|
20 | extern const QString MIN_SAMPLING_PROPERTY; | |
|
21 | extern const QString START_TIME_PROPERTY; | |||
20 | extern const QString X_AXIS_UNIT_PROPERTY; |
|
22 | extern const QString X_AXIS_UNIT_PROPERTY; | |
21 | extern const QString Y_AXIS_UNIT_PROPERTY; |
|
23 | extern const QString Y_AXIS_UNIT_PROPERTY; | |
22 | extern const QString VALUES_UNIT_PROPERTY; |
|
24 | extern const QString VALUES_UNIT_PROPERTY; |
@@ -1,10 +1,12 | |||||
1 | #include "AmdaResultParserDefs.h" |
|
1 | #include "AmdaResultParserDefs.h" | |
2 |
|
2 | |||
|
3 | const QString END_TIME_PROPERTY = QStringLiteral("endTime"); | |||
3 | const QString FILL_VALUE_PROPERTY = QStringLiteral("fillValue"); |
|
4 | const QString FILL_VALUE_PROPERTY = QStringLiteral("fillValue"); | |
4 | const QString MAX_BANDS_PROPERTY = QStringLiteral("maxBands"); |
|
5 | const QString MAX_BANDS_PROPERTY = QStringLiteral("maxBands"); | |
5 | const QString MIN_BANDS_PROPERTY = QStringLiteral("minBands"); |
|
6 | const QString MIN_BANDS_PROPERTY = QStringLiteral("minBands"); | |
6 | const QString MAX_SAMPLING_PROPERTY = QStringLiteral("maxSampling"); |
|
7 | const QString MAX_SAMPLING_PROPERTY = QStringLiteral("maxSampling"); | |
7 | const QString MIN_SAMPLING_PROPERTY = QStringLiteral("minSampling"); |
|
8 | const QString MIN_SAMPLING_PROPERTY = QStringLiteral("minSampling"); | |
|
9 | const QString START_TIME_PROPERTY = QStringLiteral("startTime"); | |||
8 | const QString X_AXIS_UNIT_PROPERTY = QStringLiteral("xAxisUnit"); |
|
10 | const QString X_AXIS_UNIT_PROPERTY = QStringLiteral("xAxisUnit"); | |
9 | const QString Y_AXIS_UNIT_PROPERTY = QStringLiteral("yAxisUnit"); |
|
11 | const QString Y_AXIS_UNIT_PROPERTY = QStringLiteral("yAxisUnit"); | |
10 | const QString VALUES_UNIT_PROPERTY = QStringLiteral("valuesUnit"); |
|
12 | const QString VALUES_UNIT_PROPERTY = QStringLiteral("valuesUnit"); |
@@ -359,8 +359,11 void SpectrogramParserHelper::handleDataHoles() | |||||
359 | // Fills data holes according to the max resolution found in the AMDA file |
|
359 | // Fills data holes according to the max resolution found in the AMDA file | |
360 | auto resolution = m_Properties.value(MAX_SAMPLING_PROPERTY).value<double>(); |
|
360 | auto resolution = m_Properties.value(MAX_SAMPLING_PROPERTY).value<double>(); | |
361 | auto fillValue = m_Properties.value(FILL_VALUE_PROPERTY).value<double>(); |
|
361 | auto fillValue = m_Properties.value(FILL_VALUE_PROPERTY).value<double>(); | |
|
362 | auto minBound = m_Properties.value(START_TIME_PROPERTY).value<double>(); | |||
|
363 | auto maxBound = m_Properties.value(END_TIME_PROPERTY).value<double>(); | |||
362 |
|
364 | |||
363 |
DataSeriesUtils::fillDataHoles(m_XAxisData, m_ValuesData, resolution, fillValue |
|
365 | DataSeriesUtils::fillDataHoles(m_XAxisData, m_ValuesData, resolution, fillValue, minBound, | |
|
366 | maxBound); | |||
364 | } |
|
367 | } | |
365 |
|
368 | |||
366 | // ////////////////// // |
|
369 | // ////////////////// // |
General Comments 0
You need to be logged in to leave comments.
Login now