@@ -27,8 +27,8 public: | |||||
27 |
|
27 | |||
28 |
|
28 | |||
29 | private: |
|
29 | private: | |
30 |
std::shared_ptr<IDataSeries> |
|
30 | std::shared_ptr<IDataSeries> | |
31 | const SqpRange &dataRangeRequested); |
|
31 | retrieveData(QUuid acqIdentifier, const SqpRange &dataRangeRequested, const QVariantHash &data); | |
32 |
|
32 | |||
33 | QHash<QUuid, bool> m_VariableToEnableProvider; |
|
33 | QHash<QUuid, bool> m_VariableToEnableProvider; | |
34 | }; |
|
34 | }; |
@@ -18,7 +18,8 std::shared_ptr<IDataProvider> CosinusProvider::clone() const | |||||
18 | } |
|
18 | } | |
19 |
|
19 | |||
20 | std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier, |
|
20 | std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier, | |
21 |
const SqpRange &dataRangeRequested |
|
21 | const SqpRange &dataRangeRequested, | |
|
22 | const QVariantHash &data) | |||
22 | { |
|
23 | { | |
23 | // TODO: Add Mutex |
|
24 | // TODO: Add Mutex | |
24 | auto dataIndex = 0; |
|
25 | auto dataIndex = 0; | |
@@ -92,7 +93,7 void CosinusProvider::requestDataLoading(QUuid acqIdentifier, | |||||
92 |
|
93 | |||
93 | for (const auto &dateTime : qAsConst(times)) { |
|
94 | for (const auto &dateTime : qAsConst(times)) { | |
94 | if (m_VariableToEnableProvider[acqIdentifier]) { |
|
95 | if (m_VariableToEnableProvider[acqIdentifier]) { | |
95 | auto scalarSeries = this->retrieveData(acqIdentifier, dateTime); |
|
96 | auto scalarSeries = this->retrieveData(acqIdentifier, dateTime, parameters.m_Data); | |
96 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided"; |
|
97 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided"; | |
97 | emit dataProvided(acqIdentifier, scalarSeries, dateTime); |
|
98 | emit dataProvided(acqIdentifier, scalarSeries, dateTime); | |
98 | } |
|
99 | } |
General Comments 0
You need to be logged in to leave comments.
Login now