@@ -1,840 +1,896 | |||||
1 | #include <Variable/Variable.h> |
|
1 | #include <Variable/Variable.h> | |
2 | #include <Variable/VariableAcquisitionWorker.h> |
|
2 | #include <Variable/VariableAcquisitionWorker.h> | |
3 | #include <Variable/VariableCacheStrategy.h> |
|
3 | #include <Variable/VariableCacheStrategy.h> | |
4 | #include <Variable/VariableCacheStrategyFactory.h> |
|
4 | #include <Variable/VariableCacheStrategyFactory.h> | |
5 | #include <Variable/VariableController.h> |
|
5 | #include <Variable/VariableController.h> | |
6 | #include <Variable/VariableModel.h> |
|
6 | #include <Variable/VariableModel.h> | |
7 | #include <Variable/VariableSynchronizationGroup.h> |
|
7 | #include <Variable/VariableSynchronizationGroup.h> | |
8 |
|
8 | |||
9 | #include <Data/DataProviderParameters.h> |
|
9 | #include <Data/DataProviderParameters.h> | |
10 | #include <Data/IDataProvider.h> |
|
10 | #include <Data/IDataProvider.h> | |
11 | #include <Data/IDataSeries.h> |
|
11 | #include <Data/IDataSeries.h> | |
12 | #include <Data/VariableRequest.h> |
|
12 | #include <Data/VariableRequest.h> | |
13 | #include <Time/TimeController.h> |
|
13 | #include <Time/TimeController.h> | |
14 |
|
14 | |||
15 | #include <QMutex> |
|
15 | #include <QMutex> | |
16 | #include <QThread> |
|
16 | #include <QThread> | |
17 | #include <QUuid> |
|
17 | #include <QUuid> | |
18 | #include <QtCore/QItemSelectionModel> |
|
18 | #include <QtCore/QItemSelectionModel> | |
19 |
|
19 | |||
20 | #include <deque> |
|
20 | #include <deque> | |
21 | #include <set> |
|
21 | #include <set> | |
22 | #include <unordered_map> |
|
22 | #include <unordered_map> | |
23 |
|
23 | |||
24 | Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController") |
|
24 | Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController") | |
25 |
|
25 | |||
26 | namespace { |
|
26 | namespace { | |
27 |
|
27 | |||
28 | SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange, |
|
28 | SqpRange computeSynchroRangeRequested(const SqpRange &varRange, const SqpRange &graphRange, | |
29 | const SqpRange &oldGraphRange) |
|
29 | const SqpRange &oldGraphRange) | |
30 | { |
|
30 | { | |
31 | auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange); |
|
31 | auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange); | |
32 |
|
32 | |||
33 | auto varRangeRequested = varRange; |
|
33 | auto varRangeRequested = varRange; | |
34 | switch (zoomType) { |
|
34 | switch (zoomType) { | |
35 | case AcquisitionZoomType::ZoomIn: { |
|
35 | case AcquisitionZoomType::ZoomIn: { | |
36 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; |
|
36 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; | |
37 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; |
|
37 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; | |
38 | varRangeRequested.m_TStart += deltaLeft; |
|
38 | varRangeRequested.m_TStart += deltaLeft; | |
39 | varRangeRequested.m_TEnd -= deltaRight; |
|
39 | varRangeRequested.m_TEnd -= deltaRight; | |
40 | break; |
|
40 | break; | |
41 | } |
|
41 | } | |
42 |
|
42 | |||
43 | case AcquisitionZoomType::ZoomOut: { |
|
43 | case AcquisitionZoomType::ZoomOut: { | |
44 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
44 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
45 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
45 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
46 | varRangeRequested.m_TStart -= deltaLeft; |
|
46 | varRangeRequested.m_TStart -= deltaLeft; | |
47 | varRangeRequested.m_TEnd += deltaRight; |
|
47 | varRangeRequested.m_TEnd += deltaRight; | |
48 | break; |
|
48 | break; | |
49 | } |
|
49 | } | |
50 | case AcquisitionZoomType::PanRight: { |
|
50 | case AcquisitionZoomType::PanRight: { | |
|
51 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; | |||
51 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
52 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
52 |
varRangeRequested.m_TStart += delta |
|
53 | varRangeRequested.m_TStart += deltaLeft; | |
53 | varRangeRequested.m_TEnd += deltaRight; |
|
54 | varRangeRequested.m_TEnd += deltaRight; | |
54 | break; |
|
55 | break; | |
55 | } |
|
56 | } | |
56 | case AcquisitionZoomType::PanLeft: { |
|
57 | case AcquisitionZoomType::PanLeft: { | |
57 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
58 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
|
59 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; | |||
58 | varRangeRequested.m_TStart -= deltaLeft; |
|
60 | varRangeRequested.m_TStart -= deltaLeft; | |
59 |
varRangeRequested.m_TEnd -= delta |
|
61 | varRangeRequested.m_TEnd -= deltaRight; | |
60 | break; |
|
62 | break; | |
61 | } |
|
63 | } | |
62 | case AcquisitionZoomType::Unknown: { |
|
64 | case AcquisitionZoomType::Unknown: { | |
63 | qCCritical(LOG_VariableController()) |
|
65 | qCCritical(LOG_VariableController()) | |
64 | << VariableController::tr("Impossible to synchronize: zoom type unknown"); |
|
66 | << VariableController::tr("Impossible to synchronize: zoom type unknown"); | |
65 | break; |
|
67 | break; | |
66 | } |
|
68 | } | |
67 | default: |
|
69 | default: | |
68 | qCCritical(LOG_VariableController()) << VariableController::tr( |
|
70 | qCCritical(LOG_VariableController()) << VariableController::tr( | |
69 | "Impossible to synchronize: zoom type not take into account"); |
|
71 | "Impossible to synchronize: zoom type not take into account"); | |
70 | // No action |
|
72 | // No action | |
71 | break; |
|
73 | break; | |
72 | } |
|
74 | } | |
73 |
|
75 | |||
74 | return varRangeRequested; |
|
76 | return varRangeRequested; | |
75 | } |
|
77 | } | |
76 | } |
|
78 | } | |
77 |
|
79 | |||
78 | struct VariableController::VariableControllerPrivate { |
|
80 | struct VariableController::VariableControllerPrivate { | |
79 | explicit VariableControllerPrivate(VariableController *parent) |
|
81 | explicit VariableControllerPrivate(VariableController *parent) | |
80 | : m_WorkingMutex{}, |
|
82 | : m_WorkingMutex{}, | |
81 | m_VariableModel{new VariableModel{parent}}, |
|
83 | m_VariableModel{new VariableModel{parent}}, | |
82 | m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}}, |
|
84 | m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}}, | |
83 | // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()}, |
|
85 | // m_VariableCacheStrategy{std::make_unique<VariableCacheStrategy>()}, | |
84 | m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy( |
|
86 | m_VariableCacheStrategy{VariableCacheStrategyFactory::createCacheStrategy( | |
85 | CacheStrategy::SingleThreshold)}, |
|
87 | CacheStrategy::SingleThreshold)}, | |
86 | m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}, |
|
88 | m_VariableAcquisitionWorker{std::make_unique<VariableAcquisitionWorker>()}, | |
87 | q{parent} |
|
89 | q{parent} | |
88 | { |
|
90 | { | |
89 |
|
91 | |||
90 | m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread); |
|
92 | m_VariableAcquisitionWorker->moveToThread(&m_VariableAcquisitionWorkerThread); | |
91 | m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread"); |
|
93 | m_VariableAcquisitionWorkerThread.setObjectName("VariableAcquisitionWorkerThread"); | |
92 | } |
|
94 | } | |
93 |
|
95 | |||
94 |
|
96 | |||
95 | virtual ~VariableControllerPrivate() |
|
97 | virtual ~VariableControllerPrivate() | |
96 | { |
|
98 | { | |
97 | qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction"); |
|
99 | qCDebug(LOG_VariableController()) << tr("VariableControllerPrivate destruction"); | |
98 | m_VariableAcquisitionWorkerThread.quit(); |
|
100 | m_VariableAcquisitionWorkerThread.quit(); | |
99 | m_VariableAcquisitionWorkerThread.wait(); |
|
101 | m_VariableAcquisitionWorkerThread.wait(); | |
100 | } |
|
102 | } | |
101 |
|
103 | |||
102 |
|
104 | |||
103 | void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested, |
|
105 | void processRequest(std::shared_ptr<Variable> var, const SqpRange &rangeRequested, | |
104 | QUuid varRequestId); |
|
106 | QUuid varRequestId); | |
105 |
|
107 | |||
106 | QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable, |
|
108 | QVector<SqpRange> provideNotInCacheDateTimeList(std::shared_ptr<Variable> variable, | |
107 | const SqpRange &dateTime); |
|
109 | const SqpRange &dateTime); | |
108 |
|
110 | |||
109 | std::shared_ptr<Variable> findVariable(QUuid vIdentifier); |
|
111 | std::shared_ptr<Variable> findVariable(QUuid vIdentifier); | |
110 | std::shared_ptr<IDataSeries> |
|
112 | std::shared_ptr<IDataSeries> | |
111 | retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector); |
|
113 | retrieveDataSeries(const QVector<AcquisitionDataPacket> acqDataPacketVector); | |
112 |
|
114 | |||
113 | void registerProvider(std::shared_ptr<IDataProvider> provider); |
|
115 | void registerProvider(std::shared_ptr<IDataProvider> provider); | |
114 |
|
116 | |||
115 | void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest); |
|
117 | void storeVariableRequest(QUuid varId, QUuid varRequestId, const VariableRequest &varRequest); | |
116 | QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries); |
|
118 | QUuid acceptVariableRequest(QUuid varId, std::shared_ptr<IDataSeries> dataSeries); | |
117 | void updateVariableRequest(QUuid varRequestId); |
|
119 | void updateVariableRequest(QUuid varRequestId); | |
118 | void cancelVariableRequest(QUuid varRequestId); |
|
120 | void cancelVariableRequest(QUuid varRequestId); | |
119 |
|
121 | |||
|
122 | SqpRange getLastRequestedRange(QUuid varId); | |||
|
123 | ||||
120 | QMutex m_WorkingMutex; |
|
124 | QMutex m_WorkingMutex; | |
121 | /// Variable model. The VariableController has the ownership |
|
125 | /// Variable model. The VariableController has the ownership | |
122 | VariableModel *m_VariableModel; |
|
126 | VariableModel *m_VariableModel; | |
123 | QItemSelectionModel *m_VariableSelectionModel; |
|
127 | QItemSelectionModel *m_VariableSelectionModel; | |
124 |
|
128 | |||
125 |
|
129 | |||
126 | TimeController *m_TimeController{nullptr}; |
|
130 | TimeController *m_TimeController{nullptr}; | |
127 | std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy; |
|
131 | std::unique_ptr<VariableCacheStrategy> m_VariableCacheStrategy; | |
128 | std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker; |
|
132 | std::unique_ptr<VariableAcquisitionWorker> m_VariableAcquisitionWorker; | |
129 | QThread m_VariableAcquisitionWorkerThread; |
|
133 | QThread m_VariableAcquisitionWorkerThread; | |
130 |
|
134 | |||
131 | std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> > |
|
135 | std::unordered_map<std::shared_ptr<Variable>, std::shared_ptr<IDataProvider> > | |
132 | m_VariableToProviderMap; |
|
136 | m_VariableToProviderMap; | |
133 | std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap; |
|
137 | std::unordered_map<std::shared_ptr<Variable>, QUuid> m_VariableToIdentifierMap; | |
134 | std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> > |
|
138 | std::map<QUuid, std::shared_ptr<VariableSynchronizationGroup> > | |
135 | m_GroupIdToVariableSynchronizationGroupMap; |
|
139 | m_GroupIdToVariableSynchronizationGroupMap; | |
136 | std::map<QUuid, QUuid> m_VariableIdGroupIdMap; |
|
140 | std::map<QUuid, QUuid> m_VariableIdGroupIdMap; | |
137 | std::set<std::shared_ptr<IDataProvider> > m_ProviderSet; |
|
141 | std::set<std::shared_ptr<IDataProvider> > m_ProviderSet; | |
138 |
|
142 | |||
139 | std::map<QUuid, std::map<QUuid, VariableRequest> > m_VarRequestIdToVarIdVarRequestMap; |
|
143 | std::map<QUuid, std::map<QUuid, VariableRequest> > m_VarRequestIdToVarIdVarRequestMap; | |
140 |
|
144 | |||
141 | std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap; |
|
145 | std::map<QUuid, std::deque<QUuid> > m_VarIdToVarRequestIdQueueMap; | |
142 |
|
146 | |||
143 |
|
147 | |||
144 | VariableController *q; |
|
148 | VariableController *q; | |
145 | }; |
|
149 | }; | |
146 |
|
150 | |||
147 |
|
151 | |||
148 | VariableController::VariableController(QObject *parent) |
|
152 | VariableController::VariableController(QObject *parent) | |
149 | : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)} |
|
153 | : QObject{parent}, impl{spimpl::make_unique_impl<VariableControllerPrivate>(this)} | |
150 | { |
|
154 | { | |
151 | qCDebug(LOG_VariableController()) << tr("VariableController construction") |
|
155 | qCDebug(LOG_VariableController()) << tr("VariableController construction") | |
152 | << QThread::currentThread(); |
|
156 | << QThread::currentThread(); | |
153 |
|
157 | |||
154 | connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this, |
|
158 | connect(impl->m_VariableModel, &VariableModel::abortProgessRequested, this, | |
155 | &VariableController::onAbortProgressRequested); |
|
159 | &VariableController::onAbortProgressRequested); | |
156 |
|
160 | |||
157 | connect(impl->m_VariableAcquisitionWorker.get(), |
|
161 | connect(impl->m_VariableAcquisitionWorker.get(), | |
158 | &VariableAcquisitionWorker::variableCanceledRequested, this, |
|
162 | &VariableAcquisitionWorker::variableCanceledRequested, this, | |
159 | &VariableController::onAbortAcquisitionRequested); |
|
163 | &VariableController::onAbortAcquisitionRequested); | |
160 |
|
164 | |||
161 | connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this, |
|
165 | connect(impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::dataProvided, this, | |
162 | &VariableController::onDataProvided); |
|
166 | &VariableController::onDataProvided); | |
163 | connect(impl->m_VariableAcquisitionWorker.get(), |
|
167 | connect(impl->m_VariableAcquisitionWorker.get(), | |
164 | &VariableAcquisitionWorker::variableRequestInProgress, this, |
|
168 | &VariableAcquisitionWorker::variableRequestInProgress, this, | |
165 | &VariableController::onVariableRetrieveDataInProgress); |
|
169 | &VariableController::onVariableRetrieveDataInProgress); | |
166 |
|
170 | |||
167 |
|
171 | |||
168 | connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started, |
|
172 | connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::started, | |
169 | impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize); |
|
173 | impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::initialize); | |
170 | connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished, |
|
174 | connect(&impl->m_VariableAcquisitionWorkerThread, &QThread::finished, | |
171 | impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize); |
|
175 | impl->m_VariableAcquisitionWorker.get(), &VariableAcquisitionWorker::finalize); | |
172 |
|
176 | |||
173 |
|
177 | |||
174 | impl->m_VariableAcquisitionWorkerThread.start(); |
|
178 | impl->m_VariableAcquisitionWorkerThread.start(); | |
175 | } |
|
179 | } | |
176 |
|
180 | |||
177 | VariableController::~VariableController() |
|
181 | VariableController::~VariableController() | |
178 | { |
|
182 | { | |
179 | qCDebug(LOG_VariableController()) << tr("VariableController destruction") |
|
183 | qCDebug(LOG_VariableController()) << tr("VariableController destruction") | |
180 | << QThread::currentThread(); |
|
184 | << QThread::currentThread(); | |
181 | this->waitForFinish(); |
|
185 | this->waitForFinish(); | |
182 | } |
|
186 | } | |
183 |
|
187 | |||
184 | VariableModel *VariableController::variableModel() noexcept |
|
188 | VariableModel *VariableController::variableModel() noexcept | |
185 | { |
|
189 | { | |
186 | return impl->m_VariableModel; |
|
190 | return impl->m_VariableModel; | |
187 | } |
|
191 | } | |
188 |
|
192 | |||
189 | QItemSelectionModel *VariableController::variableSelectionModel() noexcept |
|
193 | QItemSelectionModel *VariableController::variableSelectionModel() noexcept | |
190 | { |
|
194 | { | |
191 | return impl->m_VariableSelectionModel; |
|
195 | return impl->m_VariableSelectionModel; | |
192 | } |
|
196 | } | |
193 |
|
197 | |||
194 | void VariableController::setTimeController(TimeController *timeController) noexcept |
|
198 | void VariableController::setTimeController(TimeController *timeController) noexcept | |
195 | { |
|
199 | { | |
196 | impl->m_TimeController = timeController; |
|
200 | impl->m_TimeController = timeController; | |
197 | } |
|
201 | } | |
198 |
|
202 | |||
199 | std::shared_ptr<Variable> |
|
203 | std::shared_ptr<Variable> | |
200 | VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept |
|
204 | VariableController::cloneVariable(std::shared_ptr<Variable> variable) noexcept | |
201 | { |
|
205 | { | |
202 | if (impl->m_VariableModel->containsVariable(variable)) { |
|
206 | if (impl->m_VariableModel->containsVariable(variable)) { | |
203 | // Clones variable |
|
207 | // Clones variable | |
204 | auto duplicate = variable->clone(); |
|
208 | auto duplicate = variable->clone(); | |
205 |
|
209 | |||
206 | // Adds clone to model |
|
210 | // Adds clone to model | |
207 | impl->m_VariableModel->addVariable(duplicate); |
|
211 | impl->m_VariableModel->addVariable(duplicate); | |
208 |
|
212 | |||
209 | // Generates clone identifier |
|
213 | // Generates clone identifier | |
210 | impl->m_VariableToIdentifierMap[duplicate] = QUuid::createUuid(); |
|
214 | impl->m_VariableToIdentifierMap[duplicate] = QUuid::createUuid(); | |
211 |
|
215 | |||
212 | // Registers provider |
|
216 | // Registers provider | |
213 | auto variableProvider = impl->m_VariableToProviderMap.at(variable); |
|
217 | auto variableProvider = impl->m_VariableToProviderMap.at(variable); | |
214 | auto duplicateProvider = variableProvider != nullptr ? variableProvider->clone() : nullptr; |
|
218 | auto duplicateProvider = variableProvider != nullptr ? variableProvider->clone() : nullptr; | |
215 |
|
219 | |||
216 | impl->m_VariableToProviderMap[duplicate] = duplicateProvider; |
|
220 | impl->m_VariableToProviderMap[duplicate] = duplicateProvider; | |
217 | if (duplicateProvider) { |
|
221 | if (duplicateProvider) { | |
218 | impl->registerProvider(duplicateProvider); |
|
222 | impl->registerProvider(duplicateProvider); | |
219 | } |
|
223 | } | |
220 |
|
224 | |||
221 | return duplicate; |
|
225 | return duplicate; | |
222 | } |
|
226 | } | |
223 | else { |
|
227 | else { | |
224 | qCCritical(LOG_VariableController()) |
|
228 | qCCritical(LOG_VariableController()) | |
225 | << tr("Can't create duplicate of variable %1: variable not registered in the model") |
|
229 | << tr("Can't create duplicate of variable %1: variable not registered in the model") | |
226 | .arg(variable->name()); |
|
230 | .arg(variable->name()); | |
227 | return nullptr; |
|
231 | return nullptr; | |
228 | } |
|
232 | } | |
229 | } |
|
233 | } | |
230 |
|
234 | |||
231 | void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept |
|
235 | void VariableController::deleteVariable(std::shared_ptr<Variable> variable) noexcept | |
232 | { |
|
236 | { | |
233 | if (!variable) { |
|
237 | if (!variable) { | |
234 | qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null"; |
|
238 | qCCritical(LOG_VariableController()) << "Can't delete variable: variable is null"; | |
235 | return; |
|
239 | return; | |
236 | } |
|
240 | } | |
237 |
|
241 | |||
238 | // Spreads in SciQlop that the variable will be deleted, so that potential receivers can |
|
242 | // Spreads in SciQlop that the variable will be deleted, so that potential receivers can | |
239 | // make some treatments before the deletion |
|
243 | // make some treatments before the deletion | |
240 | emit variableAboutToBeDeleted(variable); |
|
244 | emit variableAboutToBeDeleted(variable); | |
241 |
|
245 | |||
242 | // Deletes identifier |
|
246 | // Deletes identifier | |
243 | impl->m_VariableToIdentifierMap.erase(variable); |
|
247 | impl->m_VariableToIdentifierMap.erase(variable); | |
244 |
|
248 | |||
245 | // Deletes provider |
|
249 | // Deletes provider | |
246 | auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable); |
|
250 | auto nbProvidersDeleted = impl->m_VariableToProviderMap.erase(variable); | |
247 | qCDebug(LOG_VariableController()) |
|
251 | qCDebug(LOG_VariableController()) | |
248 | << tr("Number of providers deleted for variable %1: %2") |
|
252 | << tr("Number of providers deleted for variable %1: %2") | |
249 | .arg(variable->name(), QString::number(nbProvidersDeleted)); |
|
253 | .arg(variable->name(), QString::number(nbProvidersDeleted)); | |
250 |
|
254 | |||
251 |
|
255 | |||
252 | // Deletes from model |
|
256 | // Deletes from model | |
253 | impl->m_VariableModel->deleteVariable(variable); |
|
257 | impl->m_VariableModel->deleteVariable(variable); | |
254 | } |
|
258 | } | |
255 |
|
259 | |||
256 | void VariableController::deleteVariables( |
|
260 | void VariableController::deleteVariables( | |
257 | const QVector<std::shared_ptr<Variable> > &variables) noexcept |
|
261 | const QVector<std::shared_ptr<Variable> > &variables) noexcept | |
258 | { |
|
262 | { | |
259 | for (auto variable : qAsConst(variables)) { |
|
263 | for (auto variable : qAsConst(variables)) { | |
260 | deleteVariable(variable); |
|
264 | deleteVariable(variable); | |
261 | } |
|
265 | } | |
262 | } |
|
266 | } | |
263 |
|
267 | |||
264 | std::shared_ptr<Variable> |
|
268 | std::shared_ptr<Variable> | |
265 | VariableController::createVariable(const QString &name, const QVariantHash &metadata, |
|
269 | VariableController::createVariable(const QString &name, const QVariantHash &metadata, | |
266 | std::shared_ptr<IDataProvider> provider) noexcept |
|
270 | std::shared_ptr<IDataProvider> provider) noexcept | |
267 | { |
|
271 | { | |
268 | if (!impl->m_TimeController) { |
|
272 | if (!impl->m_TimeController) { | |
269 | qCCritical(LOG_VariableController()) |
|
273 | qCCritical(LOG_VariableController()) | |
270 | << tr("Impossible to create variable: The time controller is null"); |
|
274 | << tr("Impossible to create variable: The time controller is null"); | |
271 | return nullptr; |
|
275 | return nullptr; | |
272 | } |
|
276 | } | |
273 |
|
277 | |||
274 | auto range = impl->m_TimeController->dateTime(); |
|
278 | auto range = impl->m_TimeController->dateTime(); | |
275 |
|
279 | |||
276 | if (auto newVariable = impl->m_VariableModel->createVariable(name, metadata)) { |
|
280 | if (auto newVariable = impl->m_VariableModel->createVariable(name, metadata)) { | |
277 | auto identifier = QUuid::createUuid(); |
|
281 | auto identifier = QUuid::createUuid(); | |
278 |
|
282 | |||
279 | // store the provider |
|
283 | // store the provider | |
280 | impl->registerProvider(provider); |
|
284 | impl->registerProvider(provider); | |
281 |
|
285 | |||
282 | // Associate the provider |
|
286 | // Associate the provider | |
283 | impl->m_VariableToProviderMap[newVariable] = provider; |
|
287 | impl->m_VariableToProviderMap[newVariable] = provider; | |
284 | qCInfo(LOG_VariableController()) << "createVariable: " << identifier; |
|
288 | qCInfo(LOG_VariableController()) << "createVariable: " << identifier; | |
285 | impl->m_VariableToIdentifierMap[newVariable] = identifier; |
|
289 | impl->m_VariableToIdentifierMap[newVariable] = identifier; | |
286 |
|
290 | |||
287 |
|
291 | |||
288 | auto varRequestId = QUuid::createUuid(); |
|
292 | auto varRequestId = QUuid::createUuid(); | |
289 | impl->processRequest(newVariable, range, varRequestId); |
|
293 | impl->processRequest(newVariable, range, varRequestId); | |
290 | impl->updateVariableRequest(varRequestId); |
|
294 | impl->updateVariableRequest(varRequestId); | |
291 |
|
295 | |||
292 | return newVariable; |
|
296 | return newVariable; | |
293 | } |
|
297 | } | |
294 | } |
|
298 | } | |
295 |
|
299 | |||
296 | void VariableController::onDateTimeOnSelection(const SqpRange &dateTime) |
|
300 | void VariableController::onDateTimeOnSelection(const SqpRange &dateTime) | |
297 | { |
|
301 | { | |
298 | // TODO check synchronisation and Rescale |
|
302 | // TODO check synchronisation and Rescale | |
299 | qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection" |
|
303 | qCDebug(LOG_VariableController()) << "VariableController::onDateTimeOnSelection" | |
300 | << QThread::currentThread()->objectName(); |
|
304 | << QThread::currentThread()->objectName(); | |
301 | auto selectedRows = impl->m_VariableSelectionModel->selectedRows(); |
|
305 | auto selectedRows = impl->m_VariableSelectionModel->selectedRows(); | |
302 | auto varRequestId = QUuid::createUuid(); |
|
306 | auto varRequestId = QUuid::createUuid(); | |
303 |
|
307 | |||
304 | for (const auto &selectedRow : qAsConst(selectedRows)) { |
|
308 | for (const auto &selectedRow : qAsConst(selectedRows)) { | |
305 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { |
|
309 | if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) { | |
306 | selectedVariable->setRange(dateTime); |
|
310 | selectedVariable->setRange(dateTime); | |
307 | impl->processRequest(selectedVariable, dateTime, varRequestId); |
|
311 | impl->processRequest(selectedVariable, dateTime, varRequestId); | |
308 |
|
312 | |||
309 | // notify that rescale operation has to be done |
|
313 | // notify that rescale operation has to be done | |
310 | emit rangeChanged(selectedVariable, dateTime); |
|
314 | emit rangeChanged(selectedVariable, dateTime); | |
311 | } |
|
315 | } | |
312 | } |
|
316 | } | |
313 | impl->updateVariableRequest(varRequestId); |
|
317 | impl->updateVariableRequest(varRequestId); | |
314 | } |
|
318 | } | |
315 |
|
319 | |||
316 | void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested, |
|
320 | void VariableController::onDataProvided(QUuid vIdentifier, const SqpRange &rangeRequested, | |
317 | const SqpRange &cacheRangeRequested, |
|
321 | const SqpRange &cacheRangeRequested, | |
318 | QVector<AcquisitionDataPacket> dataAcquired) |
|
322 | QVector<AcquisitionDataPacket> dataAcquired) | |
319 | { |
|
323 | { | |
320 | auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired); |
|
324 | auto retrievedDataSeries = impl->retrieveDataSeries(dataAcquired); | |
321 | auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries); |
|
325 | auto varRequestId = impl->acceptVariableRequest(vIdentifier, retrievedDataSeries); | |
322 | if (!varRequestId.isNull()) { |
|
326 | if (!varRequestId.isNull()) { | |
323 | impl->updateVariableRequest(varRequestId); |
|
327 | impl->updateVariableRequest(varRequestId); | |
324 | } |
|
328 | } | |
325 | } |
|
329 | } | |
326 |
|
330 | |||
327 | void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress) |
|
331 | void VariableController::onVariableRetrieveDataInProgress(QUuid identifier, double progress) | |
328 | { |
|
332 | { | |
329 | qCDebug(LOG_VariableController()) |
|
333 | qCDebug(LOG_VariableController()) | |
330 | << "TORM: variableController::onVariableRetrieveDataInProgress" |
|
334 | << "TORM: variableController::onVariableRetrieveDataInProgress" | |
331 | << QThread::currentThread()->objectName() << progress; |
|
335 | << QThread::currentThread()->objectName() << progress; | |
332 | if (auto var = impl->findVariable(identifier)) { |
|
336 | if (auto var = impl->findVariable(identifier)) { | |
333 | impl->m_VariableModel->setDataProgress(var, progress); |
|
337 | impl->m_VariableModel->setDataProgress(var, progress); | |
334 | } |
|
338 | } | |
335 | else { |
|
339 | else { | |
336 | qCCritical(LOG_VariableController()) |
|
340 | qCCritical(LOG_VariableController()) | |
337 | << tr("Impossible to notify progression of a null variable"); |
|
341 | << tr("Impossible to notify progression of a null variable"); | |
338 | } |
|
342 | } | |
339 | } |
|
343 | } | |
340 |
|
344 | |||
341 | void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable) |
|
345 | void VariableController::onAbortProgressRequested(std::shared_ptr<Variable> variable) | |
342 | { |
|
346 | { | |
343 | auto it = impl->m_VariableToIdentifierMap.find(variable); |
|
347 | auto it = impl->m_VariableToIdentifierMap.find(variable); | |
344 | if (it != impl->m_VariableToIdentifierMap.cend()) { |
|
348 | if (it != impl->m_VariableToIdentifierMap.cend()) { | |
345 | impl->m_VariableAcquisitionWorker->abortProgressRequested(it->second); |
|
349 | impl->m_VariableAcquisitionWorker->abortProgressRequested(it->second); | |
346 |
|
350 | |||
347 | QUuid varRequestId; |
|
351 | QUuid varRequestId; | |
348 | auto varIdToVarRequestIdQueueMapIt = impl->m_VarIdToVarRequestIdQueueMap.find(it->second); |
|
352 | auto varIdToVarRequestIdQueueMapIt = impl->m_VarIdToVarRequestIdQueueMap.find(it->second); | |
349 | if (varIdToVarRequestIdQueueMapIt != impl->m_VarIdToVarRequestIdQueueMap.cend()) { |
|
353 | if (varIdToVarRequestIdQueueMapIt != impl->m_VarIdToVarRequestIdQueueMap.cend()) { | |
350 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; |
|
354 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |
351 | varRequestId = varRequestIdQueue.front(); |
|
355 | varRequestId = varRequestIdQueue.front(); | |
352 | impl->cancelVariableRequest(varRequestId); |
|
356 | impl->cancelVariableRequest(varRequestId); | |
353 |
|
357 | |||
354 | // Finish the progression for the request |
|
358 | // Finish the progression for the request | |
355 | impl->m_VariableModel->setDataProgress(variable, 0.0); |
|
359 | impl->m_VariableModel->setDataProgress(variable, 0.0); | |
356 | } |
|
360 | } | |
357 | else { |
|
361 | else { | |
358 | qCWarning(LOG_VariableController()) |
|
362 | qCWarning(LOG_VariableController()) | |
359 | << tr("Aborting progression of inexistant variable request detected !!!") |
|
363 | << tr("Aborting progression of inexistant variable request detected !!!") | |
360 | << QThread::currentThread()->objectName(); |
|
364 | << QThread::currentThread()->objectName(); | |
361 | } |
|
365 | } | |
362 | } |
|
366 | } | |
363 | else { |
|
367 | else { | |
364 | qCWarning(LOG_VariableController()) |
|
368 | qCWarning(LOG_VariableController()) | |
365 | << tr("Aborting progression of inexistant variable detected !!!") |
|
369 | << tr("Aborting progression of inexistant variable detected !!!") | |
366 | << QThread::currentThread()->objectName(); |
|
370 | << QThread::currentThread()->objectName(); | |
367 | } |
|
371 | } | |
368 | } |
|
372 | } | |
369 |
|
373 | |||
370 | void VariableController::onAbortAcquisitionRequested(QUuid vIdentifier) |
|
374 | void VariableController::onAbortAcquisitionRequested(QUuid vIdentifier) | |
371 | { |
|
375 | { | |
372 | qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortAcquisitionRequested" |
|
376 | qCDebug(LOG_VariableController()) << "TORM: variableController::onAbortAcquisitionRequested" | |
373 | << QThread::currentThread()->objectName() << vIdentifier; |
|
377 | << QThread::currentThread()->objectName() << vIdentifier; | |
374 |
|
378 | |||
375 | if (auto var = impl->findVariable(vIdentifier)) { |
|
379 | if (auto var = impl->findVariable(vIdentifier)) { | |
376 | this->onAbortProgressRequested(var); |
|
380 | this->onAbortProgressRequested(var); | |
377 | } |
|
381 | } | |
378 | else { |
|
382 | else { | |
379 | qCCritical(LOG_VariableController()) |
|
383 | qCCritical(LOG_VariableController()) | |
380 | << tr("Impossible to abort Acquisition Requestof a null variable"); |
|
384 | << tr("Impossible to abort Acquisition Requestof a null variable"); | |
381 | } |
|
385 | } | |
382 | } |
|
386 | } | |
383 |
|
387 | |||
384 | void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId) |
|
388 | void VariableController::onAddSynchronizationGroupId(QUuid synchronizationGroupId) | |
385 | { |
|
389 | { | |
386 | qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId" |
|
390 | qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronizationGroupId" | |
387 | << QThread::currentThread()->objectName() |
|
391 | << QThread::currentThread()->objectName() | |
388 | << synchronizationGroupId; |
|
392 | << synchronizationGroupId; | |
389 | auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>(); |
|
393 | auto vSynchroGroup = std::make_shared<VariableSynchronizationGroup>(); | |
390 | impl->m_GroupIdToVariableSynchronizationGroupMap.insert( |
|
394 | impl->m_GroupIdToVariableSynchronizationGroupMap.insert( | |
391 | std::make_pair(synchronizationGroupId, vSynchroGroup)); |
|
395 | std::make_pair(synchronizationGroupId, vSynchroGroup)); | |
392 | } |
|
396 | } | |
393 |
|
397 | |||
394 | void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId) |
|
398 | void VariableController::onRemoveSynchronizationGroupId(QUuid synchronizationGroupId) | |
395 | { |
|
399 | { | |
396 | impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId); |
|
400 | impl->m_GroupIdToVariableSynchronizationGroupMap.erase(synchronizationGroupId); | |
397 | } |
|
401 | } | |
398 |
|
402 | |||
399 | void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable, |
|
403 | void VariableController::onAddSynchronized(std::shared_ptr<Variable> variable, | |
400 | QUuid synchronizationGroupId) |
|
404 | QUuid synchronizationGroupId) | |
401 |
|
405 | |||
402 | { |
|
406 | { | |
403 | qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized" |
|
407 | qCDebug(LOG_VariableController()) << "TORM: VariableController::onAddSynchronized" | |
404 | << synchronizationGroupId; |
|
408 | << synchronizationGroupId; | |
405 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable); |
|
409 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(variable); | |
406 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { |
|
410 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { | |
407 | auto groupIdToVSGIt |
|
411 | auto groupIdToVSGIt | |
408 | = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId); |
|
412 | = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId); | |
409 | if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) { |
|
413 | if (groupIdToVSGIt != impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) { | |
410 | impl->m_VariableIdGroupIdMap.insert( |
|
414 | impl->m_VariableIdGroupIdMap.insert( | |
411 | std::make_pair(varToVarIdIt->second, synchronizationGroupId)); |
|
415 | std::make_pair(varToVarIdIt->second, synchronizationGroupId)); | |
412 | groupIdToVSGIt->second->addVariableId(varToVarIdIt->second); |
|
416 | groupIdToVSGIt->second->addVariableId(varToVarIdIt->second); | |
413 | } |
|
417 | } | |
414 | else { |
|
418 | else { | |
415 | qCCritical(LOG_VariableController()) |
|
419 | qCCritical(LOG_VariableController()) | |
416 | << tr("Impossible to synchronize a variable with an unknown sycnhronization group") |
|
420 | << tr("Impossible to synchronize a variable with an unknown sycnhronization group") | |
417 | << variable->name(); |
|
421 | << variable->name(); | |
418 | } |
|
422 | } | |
419 | } |
|
423 | } | |
420 | else { |
|
424 | else { | |
421 | qCCritical(LOG_VariableController()) |
|
425 | qCCritical(LOG_VariableController()) | |
422 | << tr("Impossible to synchronize a variable with no identifier") << variable->name(); |
|
426 | << tr("Impossible to synchronize a variable with no identifier") << variable->name(); | |
423 | } |
|
427 | } | |
424 | } |
|
428 | } | |
425 |
|
429 | |||
426 | void VariableController::desynchronize(std::shared_ptr<Variable> variable, |
|
430 | void VariableController::desynchronize(std::shared_ptr<Variable> variable, | |
427 | QUuid synchronizationGroupId) |
|
431 | QUuid synchronizationGroupId) | |
428 | { |
|
432 | { | |
429 | // Gets variable id |
|
433 | // Gets variable id | |
430 | auto variableIt = impl->m_VariableToIdentifierMap.find(variable); |
|
434 | auto variableIt = impl->m_VariableToIdentifierMap.find(variable); | |
431 | if (variableIt == impl->m_VariableToIdentifierMap.cend()) { |
|
435 | if (variableIt == impl->m_VariableToIdentifierMap.cend()) { | |
432 | qCCritical(LOG_VariableController()) |
|
436 | qCCritical(LOG_VariableController()) | |
433 | << tr("Can't desynchronize variable %1: variable identifier not found") |
|
437 | << tr("Can't desynchronize variable %1: variable identifier not found") | |
434 | .arg(variable->name()); |
|
438 | .arg(variable->name()); | |
435 | return; |
|
439 | return; | |
436 | } |
|
440 | } | |
437 |
|
441 | |||
438 | // Gets synchronization group |
|
442 | // Gets synchronization group | |
439 | auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId); |
|
443 | auto groupIt = impl->m_GroupIdToVariableSynchronizationGroupMap.find(synchronizationGroupId); | |
440 | if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) { |
|
444 | if (groupIt == impl->m_GroupIdToVariableSynchronizationGroupMap.cend()) { | |
441 | qCCritical(LOG_VariableController()) |
|
445 | qCCritical(LOG_VariableController()) | |
442 | << tr("Can't desynchronize variable %1: unknown synchronization group") |
|
446 | << tr("Can't desynchronize variable %1: unknown synchronization group") | |
443 | .arg(variable->name()); |
|
447 | .arg(variable->name()); | |
444 | return; |
|
448 | return; | |
445 | } |
|
449 | } | |
446 |
|
450 | |||
447 | auto variableId = variableIt->second; |
|
451 | auto variableId = variableIt->second; | |
448 |
|
452 | |||
449 | // Removes variable from synchronization group |
|
453 | // Removes variable from synchronization group | |
450 | auto synchronizationGroup = groupIt->second; |
|
454 | auto synchronizationGroup = groupIt->second; | |
451 | synchronizationGroup->removeVariableId(variableId); |
|
455 | synchronizationGroup->removeVariableId(variableId); | |
452 |
|
456 | |||
453 | // Removes link between variable and synchronization group |
|
457 | // Removes link between variable and synchronization group | |
454 | impl->m_VariableIdGroupIdMap.erase(variableId); |
|
458 | impl->m_VariableIdGroupIdMap.erase(variableId); | |
455 | } |
|
459 | } | |
456 |
|
460 | |||
457 | void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables, |
|
461 | void VariableController::onRequestDataLoading(QVector<std::shared_ptr<Variable> > variables, | |
458 | const SqpRange &range, const SqpRange &oldRange, |
|
462 | const SqpRange &range, const SqpRange &oldRange, | |
459 | bool synchronise) |
|
463 | bool synchronise) | |
460 | { |
|
464 | { | |
461 | // NOTE: oldRange isn't really necessary since oldRange == variable->range(). |
|
465 | // NOTE: oldRange isn't really necessary since oldRange == variable->range(). | |
462 |
|
466 | |||
463 | // we want to load data of the variable for the dateTime. |
|
467 | // we want to load data of the variable for the dateTime. | |
464 | // First we check if the cache contains some of them. |
|
468 | // First we check if the cache contains some of them. | |
465 | // For the other, we ask the provider to give them. |
|
469 | // For the other, we ask the provider to give them. | |
466 |
|
470 | |||
467 | auto varRequestId = QUuid::createUuid(); |
|
471 | auto varRequestId = QUuid::createUuid(); | |
468 | qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading" |
|
472 | qCDebug(LOG_VariableController()) << "VariableController::onRequestDataLoading" | |
469 | << QThread::currentThread()->objectName() << varRequestId; |
|
473 | << QThread::currentThread()->objectName() << varRequestId; | |
470 |
|
474 | |||
471 | for (const auto &var : variables) { |
|
475 | for (const auto &var : variables) { | |
472 | qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId; |
|
476 | qCDebug(LOG_VariableController()) << "processRequest for" << var->name() << varRequestId; | |
473 | impl->processRequest(var, range, varRequestId); |
|
477 | impl->processRequest(var, range, varRequestId); | |
474 | } |
|
478 | } | |
475 |
|
479 | |||
476 | if (synchronise) { |
|
480 | if (synchronise) { | |
477 | // Get the group ids |
|
481 | // Get the group ids | |
478 | qCDebug(LOG_VariableController()) |
|
482 | qCDebug(LOG_VariableController()) | |
479 | << "TORM VariableController::onRequestDataLoading for synchro var ENABLE"; |
|
483 | << "TORM VariableController::onRequestDataLoading for synchro var ENABLE"; | |
480 | auto groupIds = std::set<QUuid>{}; |
|
484 | auto groupIds = std::set<QUuid>{}; | |
481 | auto groupIdToOldRangeMap = std::map<QUuid, SqpRange>{}; |
|
485 | auto groupIdToOldRangeMap = std::map<QUuid, SqpRange>{}; | |
482 | for (const auto &var : variables) { |
|
486 | for (const auto &var : variables) { | |
483 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var); |
|
487 | auto varToVarIdIt = impl->m_VariableToIdentifierMap.find(var); | |
484 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { |
|
488 | if (varToVarIdIt != impl->m_VariableToIdentifierMap.cend()) { | |
485 | auto vId = varToVarIdIt->second; |
|
489 | auto vId = varToVarIdIt->second; | |
486 | auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId); |
|
490 | auto varIdToGroupIdIt = impl->m_VariableIdGroupIdMap.find(vId); | |
487 | if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) { |
|
491 | if (varIdToGroupIdIt != impl->m_VariableIdGroupIdMap.cend()) { | |
488 | auto gId = varIdToGroupIdIt->second; |
|
492 | auto gId = varIdToGroupIdIt->second; | |
489 | groupIdToOldRangeMap.insert(std::make_pair(gId, var->range())); |
|
493 | groupIdToOldRangeMap.insert(std::make_pair(gId, var->range())); | |
490 | if (groupIds.find(gId) == groupIds.cend()) { |
|
494 | if (groupIds.find(gId) == groupIds.cend()) { | |
491 | qCDebug(LOG_VariableController()) << "Synchro detect group " << gId; |
|
495 | qCDebug(LOG_VariableController()) << "Synchro detect group " << gId; | |
492 | groupIds.insert(gId); |
|
496 | groupIds.insert(gId); | |
493 | } |
|
497 | } | |
494 | } |
|
498 | } | |
495 | } |
|
499 | } | |
496 | } |
|
500 | } | |
497 |
|
501 | |||
498 | // We assume here all group ids exist |
|
502 | // We assume here all group ids exist | |
499 | for (const auto &gId : groupIds) { |
|
503 | for (const auto &gId : groupIds) { | |
500 | auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId); |
|
504 | auto vSynchronizationGroup = impl->m_GroupIdToVariableSynchronizationGroupMap.at(gId); | |
501 | auto vSyncIds = vSynchronizationGroup->getIds(); |
|
505 | auto vSyncIds = vSynchronizationGroup->getIds(); | |
502 | qCDebug(LOG_VariableController()) << "Var in synchro group "; |
|
506 | qCDebug(LOG_VariableController()) << "Var in synchro group "; | |
503 | for (auto vId : vSyncIds) { |
|
507 | for (auto vId : vSyncIds) { | |
504 | auto var = impl->findVariable(vId); |
|
508 | auto var = impl->findVariable(vId); | |
505 |
|
509 | |||
506 | // Don't process already processed var |
|
510 | // Don't process already processed var | |
507 | if (!variables.contains(var)) { |
|
511 | if (!variables.contains(var)) { | |
508 | if (var != nullptr) { |
|
512 | if (var != nullptr) { | |
509 | qCDebug(LOG_VariableController()) << "processRequest synchro for" |
|
513 | qCDebug(LOG_VariableController()) << "processRequest synchro for" | |
510 | << var->name(); |
|
514 | << var->name(); | |
511 | auto vSyncRangeRequested = computeSynchroRangeRequested( |
|
515 | auto vSyncRangeRequested = computeSynchroRangeRequested( | |
512 | var->range(), range, groupIdToOldRangeMap.at(gId)); |
|
516 | var->range(), range, groupIdToOldRangeMap.at(gId)); | |
513 | qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested; |
|
517 | qCDebug(LOG_VariableController()) << "synchro RR" << vSyncRangeRequested; | |
514 | impl->processRequest(var, vSyncRangeRequested, varRequestId); |
|
518 | impl->processRequest(var, vSyncRangeRequested, varRequestId); | |
515 | } |
|
519 | } | |
516 | else { |
|
520 | else { | |
517 | qCCritical(LOG_VariableController()) |
|
521 | qCCritical(LOG_VariableController()) | |
518 |
|
522 | |||
519 | << tr("Impossible to synchronize a null variable"); |
|
523 | << tr("Impossible to synchronize a null variable"); | |
520 | } |
|
524 | } | |
521 | } |
|
525 | } | |
522 | } |
|
526 | } | |
523 | } |
|
527 | } | |
524 | } |
|
528 | } | |
525 |
|
529 | |||
526 | impl->updateVariableRequest(varRequestId); |
|
530 | impl->updateVariableRequest(varRequestId); | |
527 | } |
|
531 | } | |
528 |
|
532 | |||
529 |
|
533 | |||
530 | void VariableController::initialize() |
|
534 | void VariableController::initialize() | |
531 | { |
|
535 | { | |
532 | qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread(); |
|
536 | qCDebug(LOG_VariableController()) << tr("VariableController init") << QThread::currentThread(); | |
533 | impl->m_WorkingMutex.lock(); |
|
537 | impl->m_WorkingMutex.lock(); | |
534 | qCDebug(LOG_VariableController()) << tr("VariableController init END"); |
|
538 | qCDebug(LOG_VariableController()) << tr("VariableController init END"); | |
535 | } |
|
539 | } | |
536 |
|
540 | |||
537 | void VariableController::finalize() |
|
541 | void VariableController::finalize() | |
538 | { |
|
542 | { | |
539 | impl->m_WorkingMutex.unlock(); |
|
543 | impl->m_WorkingMutex.unlock(); | |
540 | } |
|
544 | } | |
541 |
|
545 | |||
542 | void VariableController::waitForFinish() |
|
546 | void VariableController::waitForFinish() | |
543 | { |
|
547 | { | |
544 | QMutexLocker locker{&impl->m_WorkingMutex}; |
|
548 | QMutexLocker locker{&impl->m_WorkingMutex}; | |
545 | } |
|
549 | } | |
546 |
|
550 | |||
547 | AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange) |
|
551 | AcquisitionZoomType VariableController::getZoomType(const SqpRange &range, const SqpRange &oldRange) | |
548 | { |
|
552 | { | |
549 | // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd |
|
553 | // t1.m_TStart <= t2.m_TStart && t2.m_TEnd <= t1.m_TEnd | |
550 | auto zoomType = AcquisitionZoomType::Unknown; |
|
554 | auto zoomType = AcquisitionZoomType::Unknown; | |
551 | if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) { |
|
555 | if (range.m_TStart <= oldRange.m_TStart && oldRange.m_TEnd <= range.m_TEnd) { | |
|
556 | qCCritical(LOG_VariableController()) << "zoomtype: ZoomOut"; | |||
552 | zoomType = AcquisitionZoomType::ZoomOut; |
|
557 | zoomType = AcquisitionZoomType::ZoomOut; | |
553 | } |
|
558 | } | |
554 | else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) { |
|
559 | else if (range.m_TStart > oldRange.m_TStart && range.m_TEnd > oldRange.m_TEnd) { | |
|
560 | qCCritical(LOG_VariableController()) << "zoomtype: PanRight"; | |||
555 | zoomType = AcquisitionZoomType::PanRight; |
|
561 | zoomType = AcquisitionZoomType::PanRight; | |
556 | } |
|
562 | } | |
557 | else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) { |
|
563 | else if (range.m_TStart < oldRange.m_TStart && range.m_TEnd < oldRange.m_TEnd) { | |
|
564 | qCCritical(LOG_VariableController()) << "zoomtype: PanLeft"; | |||
558 | zoomType = AcquisitionZoomType::PanLeft; |
|
565 | zoomType = AcquisitionZoomType::PanLeft; | |
559 | } |
|
566 | } | |
560 | else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) { |
|
567 | else if (range.m_TStart > oldRange.m_TStart && oldRange.m_TEnd > range.m_TEnd) { | |
|
568 | qCCritical(LOG_VariableController()) << "zoomtype: ZoomIn"; | |||
561 | zoomType = AcquisitionZoomType::ZoomIn; |
|
569 | zoomType = AcquisitionZoomType::ZoomIn; | |
562 | } |
|
570 | } | |
563 | else { |
|
571 | else { | |
564 | qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected"; |
|
572 | qCCritical(LOG_VariableController()) << "getZoomType: Unknown type detected"; | |
565 | } |
|
573 | } | |
566 | return zoomType; |
|
574 | return zoomType; | |
567 | } |
|
575 | } | |
568 |
|
576 | |||
569 | void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var, |
|
577 | void VariableController::VariableControllerPrivate::processRequest(std::shared_ptr<Variable> var, | |
570 | const SqpRange &rangeRequested, |
|
578 | const SqpRange &rangeRequested, | |
571 | QUuid varRequestId) |
|
579 | QUuid varRequestId) | |
572 | { |
|
580 | { | |
573 |
|
||||
574 | // TODO: protect at |
|
|||
575 | auto varRequest = VariableRequest{}; |
|
581 | auto varRequest = VariableRequest{}; | |
576 | auto varId = m_VariableToIdentifierMap.at(var); |
|
582 | ||
|
583 | auto it = m_VariableToIdentifierMap.find(var); | |||
|
584 | if (it != m_VariableToIdentifierMap.cend()) { | |||
|
585 | ||||
|
586 | auto varId = it->second; | |||
|
587 | ||||
|
588 | auto oldRange = getLastRequestedRange(varId); | |||
|
589 | ||||
|
590 | // check for update oldRange to the last request range. | |||
|
591 | if (oldRange == INVALID_RANGE) { | |||
|
592 | oldRange = var->range(); | |||
|
593 | } | |||
577 |
|
594 | |||
578 | auto varStrategyRangesRequested |
|
595 | auto varStrategyRangesRequested | |
579 |
= m_VariableCacheStrategy->computeRange( |
|
596 | = m_VariableCacheStrategy->computeRange(oldRange, rangeRequested); | |
580 |
|
597 | |||
581 | auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second}; |
|
598 | auto notInCacheRangeList = QVector<SqpRange>{varStrategyRangesRequested.second}; | |
582 | auto inCacheRangeList = QVector<SqpRange>{}; |
|
599 | auto inCacheRangeList = QVector<SqpRange>{}; | |
583 | if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) { |
|
600 | if (m_VarIdToVarRequestIdQueueMap.find(varId) == m_VarIdToVarRequestIdQueueMap.cend()) { | |
584 | notInCacheRangeList = var->provideNotInCacheRangeList(varStrategyRangesRequested.second); |
|
601 | notInCacheRangeList | |
|
602 | = var->provideNotInCacheRangeList(varStrategyRangesRequested.second); | |||
585 | inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second); |
|
603 | inCacheRangeList = var->provideInCacheRangeList(varStrategyRangesRequested.second); | |
586 | } |
|
604 | } | |
587 |
|
605 | |||
588 | if (!notInCacheRangeList.empty()) { |
|
606 | if (!notInCacheRangeList.empty()) { | |
589 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; |
|
607 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; | |
590 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; |
|
608 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; | |
591 |
|
609 | |||
592 | // store VarRequest |
|
610 | // store VarRequest | |
593 | storeVariableRequest(varId, varRequestId, varRequest); |
|
611 | storeVariableRequest(varId, varRequestId, varRequest); | |
594 |
|
612 | |||
595 | auto varProvider = m_VariableToProviderMap.at(var); |
|
613 | auto varProvider = m_VariableToProviderMap.at(var); | |
596 | if (varProvider != nullptr) { |
|
614 | if (varProvider != nullptr) { | |
597 | auto varRequestIdCanceled = m_VariableAcquisitionWorker->pushVariableRequest( |
|
615 | auto varRequestIdCanceled = m_VariableAcquisitionWorker->pushVariableRequest( | |
598 | varRequestId, varId, varStrategyRangesRequested.first, |
|
616 | varRequestId, varId, varStrategyRangesRequested.first, | |
599 | varStrategyRangesRequested.second, |
|
617 | varStrategyRangesRequested.second, | |
600 | DataProviderParameters{std::move(notInCacheRangeList), var->metadata()}, |
|
618 | DataProviderParameters{std::move(notInCacheRangeList), var->metadata()}, | |
601 | varProvider); |
|
619 | varProvider); | |
602 |
|
620 | |||
603 | if (!varRequestIdCanceled.isNull()) { |
|
621 | if (!varRequestIdCanceled.isNull()) { | |
604 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("vsarRequestIdCanceled: ") |
|
622 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("vsarRequestIdCanceled: ") | |
605 | << varRequestIdCanceled; |
|
623 | << varRequestIdCanceled; | |
606 | cancelVariableRequest(varRequestIdCanceled); |
|
624 | cancelVariableRequest(varRequestIdCanceled); | |
607 | } |
|
625 | } | |
608 | } |
|
626 | } | |
609 | else { |
|
627 | else { | |
610 | qCCritical(LOG_VariableController()) |
|
628 | qCCritical(LOG_VariableController()) | |
611 | << "Impossible to provide data with a null provider"; |
|
629 | << "Impossible to provide data with a null provider"; | |
612 | } |
|
630 | } | |
613 |
|
631 | |||
614 | if (!inCacheRangeList.empty()) { |
|
632 | if (!inCacheRangeList.empty()) { | |
615 | emit q->updateVarDisplaying(var, inCacheRangeList.first()); |
|
633 | emit q->updateVarDisplaying(var, inCacheRangeList.first()); | |
616 | } |
|
634 | } | |
617 | } |
|
635 | } | |
618 | else { |
|
636 | else { | |
619 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; |
|
637 | varRequest.m_RangeRequested = varStrategyRangesRequested.first; | |
620 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; |
|
638 | varRequest.m_CacheRangeRequested = varStrategyRangesRequested.second; | |
621 | // store VarRequest |
|
639 | // store VarRequest | |
622 | storeVariableRequest(varId, varRequestId, varRequest); |
|
640 | storeVariableRequest(varId, varRequestId, varRequest); | |
623 |
acceptVariableRequest( |
|
641 | acceptVariableRequest( | |
624 |
|
|
642 | varId, var->dataSeries()->subDataSeries(varStrategyRangesRequested.second)); | |
|
643 | } | |||
625 | } |
|
644 | } | |
626 | } |
|
645 | } | |
627 |
|
646 | |||
628 | std::shared_ptr<Variable> |
|
647 | std::shared_ptr<Variable> | |
629 | VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier) |
|
648 | VariableController::VariableControllerPrivate::findVariable(QUuid vIdentifier) | |
630 | { |
|
649 | { | |
631 | std::shared_ptr<Variable> var; |
|
650 | std::shared_ptr<Variable> var; | |
632 | auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; }; |
|
651 | auto findReply = [vIdentifier](const auto &entry) { return vIdentifier == entry.second; }; | |
633 |
|
652 | |||
634 | auto end = m_VariableToIdentifierMap.cend(); |
|
653 | auto end = m_VariableToIdentifierMap.cend(); | |
635 | auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply); |
|
654 | auto it = std::find_if(m_VariableToIdentifierMap.cbegin(), end, findReply); | |
636 | if (it != end) { |
|
655 | if (it != end) { | |
637 | var = it->first; |
|
656 | var = it->first; | |
638 | } |
|
657 | } | |
639 | else { |
|
658 | else { | |
640 | qCCritical(LOG_VariableController()) |
|
659 | qCCritical(LOG_VariableController()) | |
641 | << tr("Impossible to find the variable with the identifier: ") << vIdentifier; |
|
660 | << tr("Impossible to find the variable with the identifier: ") << vIdentifier; | |
642 | } |
|
661 | } | |
643 |
|
662 | |||
644 | return var; |
|
663 | return var; | |
645 | } |
|
664 | } | |
646 |
|
665 | |||
647 | std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries( |
|
666 | std::shared_ptr<IDataSeries> VariableController::VariableControllerPrivate::retrieveDataSeries( | |
648 | const QVector<AcquisitionDataPacket> acqDataPacketVector) |
|
667 | const QVector<AcquisitionDataPacket> acqDataPacketVector) | |
649 | { |
|
668 | { | |
650 | qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size") |
|
669 | qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size") | |
651 | << acqDataPacketVector.size(); |
|
670 | << acqDataPacketVector.size(); | |
652 | std::shared_ptr<IDataSeries> dataSeries; |
|
671 | std::shared_ptr<IDataSeries> dataSeries; | |
653 | if (!acqDataPacketVector.isEmpty()) { |
|
672 | if (!acqDataPacketVector.isEmpty()) { | |
654 | dataSeries = acqDataPacketVector[0].m_DateSeries; |
|
673 | dataSeries = acqDataPacketVector[0].m_DateSeries; | |
655 | for (int i = 1; i < acqDataPacketVector.size(); ++i) { |
|
674 | for (int i = 1; i < acqDataPacketVector.size(); ++i) { | |
656 | dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get()); |
|
675 | dataSeries->merge(acqDataPacketVector[i].m_DateSeries.get()); | |
657 | } |
|
676 | } | |
658 | } |
|
677 | } | |
659 | qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END") |
|
678 | qCDebug(LOG_VariableController()) << tr("TORM: retrieveDataSeries acqDataPacketVector size END") | |
660 | << acqDataPacketVector.size(); |
|
679 | << acqDataPacketVector.size(); | |
661 | return dataSeries; |
|
680 | return dataSeries; | |
662 | } |
|
681 | } | |
663 |
|
682 | |||
664 | void VariableController::VariableControllerPrivate::registerProvider( |
|
683 | void VariableController::VariableControllerPrivate::registerProvider( | |
665 | std::shared_ptr<IDataProvider> provider) |
|
684 | std::shared_ptr<IDataProvider> provider) | |
666 | { |
|
685 | { | |
667 | if (m_ProviderSet.find(provider) == m_ProviderSet.end()) { |
|
686 | if (m_ProviderSet.find(provider) == m_ProviderSet.end()) { | |
668 | qCDebug(LOG_VariableController()) << tr("Registering of a new provider") |
|
687 | qCDebug(LOG_VariableController()) << tr("Registering of a new provider") | |
669 | << provider->objectName(); |
|
688 | << provider->objectName(); | |
670 | m_ProviderSet.insert(provider); |
|
689 | m_ProviderSet.insert(provider); | |
671 | connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(), |
|
690 | connect(provider.get(), &IDataProvider::dataProvided, m_VariableAcquisitionWorker.get(), | |
672 | &VariableAcquisitionWorker::onVariableDataAcquired); |
|
691 | &VariableAcquisitionWorker::onVariableDataAcquired); | |
673 | connect(provider.get(), &IDataProvider::dataProvidedProgress, |
|
692 | connect(provider.get(), &IDataProvider::dataProvidedProgress, | |
674 | m_VariableAcquisitionWorker.get(), |
|
693 | m_VariableAcquisitionWorker.get(), | |
675 | &VariableAcquisitionWorker::onVariableRetrieveDataInProgress); |
|
694 | &VariableAcquisitionWorker::onVariableRetrieveDataInProgress); | |
676 | connect(provider.get(), &IDataProvider::dataProvidedFailed, |
|
695 | connect(provider.get(), &IDataProvider::dataProvidedFailed, | |
677 | m_VariableAcquisitionWorker.get(), |
|
696 | m_VariableAcquisitionWorker.get(), | |
678 | &VariableAcquisitionWorker::onVariableAcquisitionFailed); |
|
697 | &VariableAcquisitionWorker::onVariableAcquisitionFailed); | |
679 | } |
|
698 | } | |
680 | else { |
|
699 | else { | |
681 | qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists "); |
|
700 | qCDebug(LOG_VariableController()) << tr("Cannot register provider, it already exists "); | |
682 | } |
|
701 | } | |
683 | } |
|
702 | } | |
684 |
|
703 | |||
685 | void VariableController::VariableControllerPrivate::storeVariableRequest( |
|
704 | void VariableController::VariableControllerPrivate::storeVariableRequest( | |
686 | QUuid varId, QUuid varRequestId, const VariableRequest &varRequest) |
|
705 | QUuid varId, QUuid varRequestId, const VariableRequest &varRequest) | |
687 | { |
|
706 | { | |
688 | // First request for the variable. we can create an entry for it |
|
707 | // First request for the variable. we can create an entry for it | |
689 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); |
|
708 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); | |
690 | if (varIdToVarRequestIdQueueMapIt == m_VarIdToVarRequestIdQueueMap.cend()) { |
|
709 | if (varIdToVarRequestIdQueueMapIt == m_VarIdToVarRequestIdQueueMap.cend()) { | |
691 | auto varRequestIdQueue = std::deque<QUuid>{}; |
|
710 | auto varRequestIdQueue = std::deque<QUuid>{}; | |
692 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in QUEUE"); |
|
711 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in QUEUE"); | |
693 | varRequestIdQueue.push_back(varRequestId); |
|
712 | varRequestIdQueue.push_back(varRequestId); | |
694 | m_VarIdToVarRequestIdQueueMap.insert(std::make_pair(varId, std::move(varRequestIdQueue))); |
|
713 | m_VarIdToVarRequestIdQueueMap.insert(std::make_pair(varId, std::move(varRequestIdQueue))); | |
695 | } |
|
714 | } | |
696 | else { |
|
715 | else { | |
697 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in EXISTING QUEUE"); |
|
716 | qCDebug(LOG_VariableController()) << tr("Store REQUEST in EXISTING QUEUE"); | |
698 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; |
|
717 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |
699 | varRequestIdQueue.push_back(varRequestId); |
|
718 | varRequestIdQueue.push_back(varRequestId); | |
700 | } |
|
719 | } | |
701 |
|
720 | |||
702 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); |
|
721 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |
703 | if (varRequestIdToVarIdVarRequestMapIt == m_VarRequestIdToVarIdVarRequestMap.cend()) { |
|
722 | if (varRequestIdToVarIdVarRequestMapIt == m_VarRequestIdToVarIdVarRequestMap.cend()) { | |
704 | auto varIdToVarRequestMap = std::map<QUuid, VariableRequest>{}; |
|
723 | auto varIdToVarRequestMap = std::map<QUuid, VariableRequest>{}; | |
705 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); |
|
724 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); | |
706 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in MAP"); |
|
725 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in MAP"); | |
707 | m_VarRequestIdToVarIdVarRequestMap.insert( |
|
726 | m_VarRequestIdToVarIdVarRequestMap.insert( | |
708 | std::make_pair(varRequestId, std::move(varIdToVarRequestMap))); |
|
727 | std::make_pair(varRequestId, std::move(varIdToVarRequestMap))); | |
709 | } |
|
728 | } | |
710 | else { |
|
729 | else { | |
711 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; |
|
730 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |
712 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in EXISTING MAP"); |
|
731 | qCDebug(LOG_VariableController()) << tr("Store REQUESTID in EXISTING MAP"); | |
713 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); |
|
732 | varIdToVarRequestMap.insert(std::make_pair(varId, varRequest)); | |
714 | } |
|
733 | } | |
715 | } |
|
734 | } | |
716 |
|
735 | |||
717 | QUuid VariableController::VariableControllerPrivate::acceptVariableRequest( |
|
736 | QUuid VariableController::VariableControllerPrivate::acceptVariableRequest( | |
718 | QUuid varId, std::shared_ptr<IDataSeries> dataSeries) |
|
737 | QUuid varId, std::shared_ptr<IDataSeries> dataSeries) | |
719 | { |
|
738 | { | |
720 | QUuid varRequestId; |
|
739 | QUuid varRequestId; | |
721 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); |
|
740 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); | |
722 | if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) { |
|
741 | if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) { | |
723 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; |
|
742 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |
724 | varRequestId = varRequestIdQueue.front(); |
|
743 | varRequestId = varRequestIdQueue.front(); | |
725 | auto varRequestIdToVarIdVarRequestMapIt |
|
744 | auto varRequestIdToVarIdVarRequestMapIt | |
726 | = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); |
|
745 | = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |
727 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { |
|
746 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { | |
728 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; |
|
747 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |
729 | auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId); |
|
748 | auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId); | |
730 | if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) { |
|
749 | if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) { | |
731 | qCDebug(LOG_VariableController()) << tr("acceptVariableRequest"); |
|
750 | qCDebug(LOG_VariableController()) << tr("acceptVariableRequest"); | |
732 | auto &varRequest = varIdToVarRequestMapIt->second; |
|
751 | auto &varRequest = varIdToVarRequestMapIt->second; | |
733 | varRequest.m_DataSeries = dataSeries; |
|
752 | varRequest.m_DataSeries = dataSeries; | |
734 | varRequest.m_CanUpdate = true; |
|
753 | varRequest.m_CanUpdate = true; | |
735 | } |
|
754 | } | |
736 | else { |
|
755 | else { | |
737 | qCDebug(LOG_VariableController()) |
|
756 | qCDebug(LOG_VariableController()) | |
738 | << tr("Impossible to acceptVariableRequest of a unknown variable id attached " |
|
757 | << tr("Impossible to acceptVariableRequest of a unknown variable id attached " | |
739 | "to a variableRequestId") |
|
758 | "to a variableRequestId") | |
740 | << varRequestId << varId; |
|
759 | << varRequestId << varId; | |
741 | } |
|
760 | } | |
742 | } |
|
761 | } | |
743 | else { |
|
762 | else { | |
744 | qCCritical(LOG_VariableController()) |
|
763 | qCCritical(LOG_VariableController()) | |
745 | << tr("Impossible to acceptVariableRequest of a unknown variableRequestId") |
|
764 | << tr("Impossible to acceptVariableRequest of a unknown variableRequestId") | |
746 | << varRequestId; |
|
765 | << varRequestId; | |
747 | } |
|
766 | } | |
748 |
|
767 | |||
749 | varRequestIdQueue.pop_front(); |
|
768 | varRequestIdQueue.pop_front(); | |
750 | if (varRequestIdQueue.empty()) { |
|
769 | if (varRequestIdQueue.empty()) { | |
751 | qCDebug(LOG_VariableController()) |
|
770 | qCDebug(LOG_VariableController()) | |
752 | << tr("TORM Erase REQUEST because it has been accepted") << varId; |
|
771 | << tr("TORM Erase REQUEST because it has been accepted") << varId; | |
753 | m_VarIdToVarRequestIdQueueMap.erase(varId); |
|
772 | m_VarIdToVarRequestIdQueueMap.erase(varId); | |
754 | } |
|
773 | } | |
755 | } |
|
774 | } | |
756 | else { |
|
775 | else { | |
757 | qCCritical(LOG_VariableController()) |
|
776 | qCCritical(LOG_VariableController()) | |
758 | << tr("Impossible to acceptVariableRequest of a unknown variable id") << varId; |
|
777 | << tr("Impossible to acceptVariableRequest of a unknown variable id") << varId; | |
759 | } |
|
778 | } | |
760 |
|
779 | |||
761 | return varRequestId; |
|
780 | return varRequestId; | |
762 | } |
|
781 | } | |
763 |
|
782 | |||
764 | void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId) |
|
783 | void VariableController::VariableControllerPrivate::updateVariableRequest(QUuid varRequestId) | |
765 | { |
|
784 | { | |
766 |
|
785 | |||
767 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); |
|
786 | auto varRequestIdToVarIdVarRequestMapIt = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |
768 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { |
|
787 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { | |
769 | bool processVariableUpdate = true; |
|
788 | bool processVariableUpdate = true; | |
770 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; |
|
789 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |
771 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); |
|
790 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); | |
772 | (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) && processVariableUpdate; |
|
791 | (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) && processVariableUpdate; | |
773 | ++varIdToVarRequestMapIt) { |
|
792 | ++varIdToVarRequestMapIt) { | |
774 | processVariableUpdate &= varIdToVarRequestMapIt->second.m_CanUpdate; |
|
793 | processVariableUpdate &= varIdToVarRequestMapIt->second.m_CanUpdate; | |
775 | qCDebug(LOG_VariableController()) << tr("updateVariableRequest") |
|
794 | qCDebug(LOG_VariableController()) << tr("updateVariableRequest") | |
776 | << processVariableUpdate; |
|
795 | << processVariableUpdate; | |
777 | } |
|
796 | } | |
778 |
|
797 | |||
779 | if (processVariableUpdate) { |
|
798 | if (processVariableUpdate) { | |
780 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); |
|
799 | for (auto varIdToVarRequestMapIt = varIdToVarRequestMap.cbegin(); | |
781 | varIdToVarRequestMapIt != varIdToVarRequestMap.cend(); ++varIdToVarRequestMapIt) { |
|
800 | varIdToVarRequestMapIt != varIdToVarRequestMap.cend(); ++varIdToVarRequestMapIt) { | |
782 | if (auto var = findVariable(varIdToVarRequestMapIt->first)) { |
|
801 | if (auto var = findVariable(varIdToVarRequestMapIt->first)) { | |
783 | auto &varRequest = varIdToVarRequestMapIt->second; |
|
802 | auto &varRequest = varIdToVarRequestMapIt->second; | |
784 | var->setRange(varRequest.m_RangeRequested); |
|
803 | var->setRange(varRequest.m_RangeRequested); | |
785 | var->setCacheRange(varRequest.m_CacheRangeRequested); |
|
804 | var->setCacheRange(varRequest.m_CacheRangeRequested); | |
786 | qCDebug(LOG_VariableController()) << tr("1: onDataProvided") |
|
805 | qCDebug(LOG_VariableController()) << tr("1: onDataProvided") | |
787 | << varRequest.m_RangeRequested; |
|
806 | << varRequest.m_RangeRequested; | |
788 | qCDebug(LOG_VariableController()) << tr("2: onDataProvided") |
|
807 | qCDebug(LOG_VariableController()) << tr("2: onDataProvided") | |
789 | << varRequest.m_CacheRangeRequested; |
|
808 | << varRequest.m_CacheRangeRequested; | |
790 | var->mergeDataSeries(varRequest.m_DataSeries); |
|
809 | var->mergeDataSeries(varRequest.m_DataSeries); | |
791 | qCDebug(LOG_VariableController()) << tr("3: onDataProvided"); |
|
810 | qCDebug(LOG_VariableController()) << tr("3: onDataProvided"); | |
792 |
|
811 | |||
793 | /// @todo MPL: confirm |
|
812 | /// @todo MPL: confirm | |
794 | // Variable update is notified only if there is no pending request for it |
|
813 | // Variable update is notified only if there is no pending request for it | |
795 | // if |
|
814 | // if | |
796 | // (m_VarIdToVarRequestIdQueueMap.count(varIdToVarRequestMapIt->first) |
|
815 | // (m_VarIdToVarRequestIdQueueMap.count(varIdToVarRequestMapIt->first) | |
797 | // == 0) { |
|
816 | // == 0) { | |
798 | emit var->updated(); |
|
817 | emit var->updated(); | |
799 | // } |
|
818 | // } | |
800 | } |
|
819 | } | |
801 | else { |
|
820 | else { | |
802 | qCCritical(LOG_VariableController()) |
|
821 | qCCritical(LOG_VariableController()) | |
803 | << tr("Impossible to update data to a null variable"); |
|
822 | << tr("Impossible to update data to a null variable"); | |
804 | } |
|
823 | } | |
805 | } |
|
824 | } | |
806 |
|
825 | |||
807 | // cleaning varRequestId |
|
826 | // cleaning varRequestId | |
808 | qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in MAP ?") |
|
827 | qCDebug(LOG_VariableController()) << tr("0: erase REQUEST in MAP ?") | |
809 | << m_VarRequestIdToVarIdVarRequestMap.size(); |
|
828 | << m_VarRequestIdToVarIdVarRequestMap.size(); | |
810 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); |
|
829 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); | |
811 | qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in MAP ?") |
|
830 | qCDebug(LOG_VariableController()) << tr("1: erase REQUEST in MAP ?") | |
812 | << m_VarRequestIdToVarIdVarRequestMap.size(); |
|
831 | << m_VarRequestIdToVarIdVarRequestMap.size(); | |
813 | } |
|
832 | } | |
814 | } |
|
833 | } | |
815 | else { |
|
834 | else { | |
816 | qCCritical(LOG_VariableController()) |
|
835 | qCCritical(LOG_VariableController()) | |
817 | << tr("Cannot updateVariableRequest for a unknow varRequestId") << varRequestId; |
|
836 | << tr("Cannot updateVariableRequest for a unknow varRequestId") << varRequestId; | |
818 | } |
|
837 | } | |
819 | } |
|
838 | } | |
820 |
|
839 | |||
821 | void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId) |
|
840 | void VariableController::VariableControllerPrivate::cancelVariableRequest(QUuid varRequestId) | |
822 | { |
|
841 | { | |
823 | // cleaning varRequestId |
|
842 | // cleaning varRequestId | |
824 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); |
|
843 | m_VarRequestIdToVarIdVarRequestMap.erase(varRequestId); | |
825 |
|
844 | |||
826 | for (auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.begin(); |
|
845 | for (auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.begin(); | |
827 | varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.end();) { |
|
846 | varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.end();) { | |
828 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; |
|
847 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |
829 | varRequestIdQueue.erase( |
|
848 | varRequestIdQueue.erase( | |
830 | std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId), |
|
849 | std::remove(varRequestIdQueue.begin(), varRequestIdQueue.end(), varRequestId), | |
831 | varRequestIdQueue.end()); |
|
850 | varRequestIdQueue.end()); | |
832 | if (varRequestIdQueue.empty()) { |
|
851 | if (varRequestIdQueue.empty()) { | |
833 | varIdToVarRequestIdQueueMapIt |
|
852 | varIdToVarRequestIdQueueMapIt | |
834 | = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt); |
|
853 | = m_VarIdToVarRequestIdQueueMap.erase(varIdToVarRequestIdQueueMapIt); | |
835 | } |
|
854 | } | |
836 | else { |
|
855 | else { | |
837 | ++varIdToVarRequestIdQueueMapIt; |
|
856 | ++varIdToVarRequestIdQueueMapIt; | |
838 | } |
|
857 | } | |
839 | } |
|
858 | } | |
840 | } |
|
859 | } | |
|
860 | ||||
|
861 | SqpRange VariableController::VariableControllerPrivate::getLastRequestedRange(QUuid varId) | |||
|
862 | { | |||
|
863 | auto lastRangeRequested = SqpRange{INVALID_RANGE}; | |||
|
864 | auto varIdToVarRequestIdQueueMapIt = m_VarIdToVarRequestIdQueueMap.find(varId); | |||
|
865 | if (varIdToVarRequestIdQueueMapIt != m_VarIdToVarRequestIdQueueMap.cend()) { | |||
|
866 | auto &varRequestIdQueue = varIdToVarRequestIdQueueMapIt->second; | |||
|
867 | auto varRequestId = varRequestIdQueue.back(); | |||
|
868 | auto varRequestIdToVarIdVarRequestMapIt | |||
|
869 | = m_VarRequestIdToVarIdVarRequestMap.find(varRequestId); | |||
|
870 | if (varRequestIdToVarIdVarRequestMapIt != m_VarRequestIdToVarIdVarRequestMap.cend()) { | |||
|
871 | auto &varIdToVarRequestMap = varRequestIdToVarIdVarRequestMapIt->second; | |||
|
872 | auto varIdToVarRequestMapIt = varIdToVarRequestMap.find(varId); | |||
|
873 | if (varIdToVarRequestMapIt != varIdToVarRequestMap.cend()) { | |||
|
874 | auto &varRequest = varIdToVarRequestMapIt->second; | |||
|
875 | lastRangeRequested = varRequest.m_RangeRequested; | |||
|
876 | } | |||
|
877 | else { | |||
|
878 | qCDebug(LOG_VariableController()) | |||
|
879 | << tr("Impossible to getLastRequestedRange of a unknown variable id attached " | |||
|
880 | "to a variableRequestId") | |||
|
881 | << varRequestId << varId; | |||
|
882 | } | |||
|
883 | } | |||
|
884 | else { | |||
|
885 | qCCritical(LOG_VariableController()) | |||
|
886 | << tr("Impossible to getLastRequestedRange of a unknown variableRequestId") | |||
|
887 | << varRequestId; | |||
|
888 | } | |||
|
889 | } | |||
|
890 | else { | |||
|
891 | qDebug(LOG_VariableController()) | |||
|
892 | << tr("Impossible to getLastRequestedRange of a unknown variable id") << varId; | |||
|
893 | } | |||
|
894 | ||||
|
895 | return lastRangeRequested; | |||
|
896 | } |
@@ -1,310 +1,391 | |||||
1 | #include <QObject> |
|
1 | #include <QObject> | |
2 | #include <QtTest> |
|
2 | #include <QtTest> | |
3 |
|
3 | |||
4 | #include <memory> |
|
4 | #include <memory> | |
5 |
|
5 | |||
6 | #include <Data/DataProviderParameters.h> |
|
6 | #include <Data/DataProviderParameters.h> | |
7 | #include <Data/IDataProvider.h> |
|
7 | #include <Data/IDataProvider.h> | |
8 | #include <Data/ScalarSeries.h> |
|
8 | #include <Data/ScalarSeries.h> | |
9 | #include <Time/TimeController.h> |
|
9 | #include <Time/TimeController.h> | |
10 | #include <Variable/Variable.h> |
|
10 | #include <Variable/Variable.h> | |
11 | #include <Variable/VariableController.h> |
|
11 | #include <Variable/VariableController.h> | |
12 | #include <Variable/VariableModel.h> |
|
12 | #include <Variable/VariableModel.h> | |
13 |
|
13 | |||
14 | namespace { |
|
14 | namespace { | |
15 |
|
15 | |||
16 | /// Delay after each operation on the variable before validating it (in ms) |
|
16 | /// Delay after each operation on the variable before validating it (in ms) | |
17 | const auto OPERATION_DELAY = 100; |
|
17 | const auto OPERATION_DELAY = 100; | |
18 |
|
18 | |||
19 | /** |
|
19 | /** | |
20 | * Generates values according to a range. The value generated for a time t is the number of seconds |
|
20 | * Generates values according to a range. The value generated for a time t is the number of seconds | |
21 | * of difference between t and a reference value (which is midnight -> 00:00:00) |
|
21 | * of difference between t and a reference value (which is midnight -> 00:00:00) | |
22 | * |
|
22 | * | |
23 | * Example: For a range between 00:00:10 and 00:00:20, the generated values are |
|
23 | * Example: For a range between 00:00:10 and 00:00:20, the generated values are | |
24 | * {10,11,12,13,14,15,16,17,18,19,20} |
|
24 | * {10,11,12,13,14,15,16,17,18,19,20} | |
25 | */ |
|
25 | */ | |
26 | std::vector<double> values(const SqpRange &range) |
|
26 | std::vector<double> values(const SqpRange &range) | |
27 | { |
|
27 | { | |
28 | QTime referenceTime{0, 0}; |
|
28 | QTime referenceTime{0, 0}; | |
29 |
|
29 | |||
30 | std::vector<double> result{}; |
|
30 | std::vector<double> result{}; | |
31 |
|
31 | |||
32 | for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) { |
|
32 | for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) { | |
33 | auto time = DateUtils::dateTime(i).time(); |
|
33 | auto time = DateUtils::dateTime(i).time(); | |
34 | result.push_back(referenceTime.secsTo(time)); |
|
34 | result.push_back(referenceTime.secsTo(time)); | |
35 | } |
|
35 | } | |
36 |
|
36 | |||
37 | return result; |
|
37 | return result; | |
38 | } |
|
38 | } | |
39 |
|
39 | |||
40 | /// Provider used for the tests |
|
40 | /// Provider used for the tests | |
41 | class TestProvider : public IDataProvider { |
|
41 | class TestProvider : public IDataProvider { | |
42 | std::shared_ptr<IDataProvider> clone() const { return std::make_shared<TestProvider>(); } |
|
42 | std::shared_ptr<IDataProvider> clone() const { return std::make_shared<TestProvider>(); } | |
43 |
|
43 | |||
44 | void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters ¶meters) override |
|
44 | void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters ¶meters) override | |
45 | { |
|
45 | { | |
46 | const auto &ranges = parameters.m_Times; |
|
46 | const auto &ranges = parameters.m_Times; | |
47 |
|
47 | |||
48 | for (const auto &range : ranges) { |
|
48 | for (const auto &range : ranges) { | |
49 | // Generates data series |
|
49 | // Generates data series | |
50 | auto valuesData = values(range); |
|
50 | auto valuesData = values(range); | |
51 |
|
51 | |||
52 | std::vector<double> xAxisData{}; |
|
52 | std::vector<double> xAxisData{}; | |
53 | for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) { |
|
53 | for (auto i = range.m_TStart; i <= range.m_TEnd; ++i) { | |
54 | xAxisData.push_back(i); |
|
54 | xAxisData.push_back(i); | |
55 | } |
|
55 | } | |
56 |
|
56 | |||
57 | auto dataSeries = std::make_shared<ScalarSeries>( |
|
57 | auto dataSeries = std::make_shared<ScalarSeries>( | |
58 | std::move(xAxisData), std::move(valuesData), Unit{"t", true}, Unit{}); |
|
58 | std::move(xAxisData), std::move(valuesData), Unit{"t", true}, Unit{}); | |
59 |
|
59 | |||
60 | emit dataProvided(acqIdentifier, dataSeries, range); |
|
60 | emit dataProvided(acqIdentifier, dataSeries, range); | |
61 | } |
|
61 | } | |
62 | } |
|
62 | } | |
63 |
|
63 | |||
64 | void requestDataAborting(QUuid acqIdentifier) override |
|
64 | void requestDataAborting(QUuid acqIdentifier) override | |
65 | { |
|
65 | { | |
66 | // Does nothing |
|
66 | // Does nothing | |
67 | } |
|
67 | } | |
68 | }; |
|
68 | }; | |
69 |
|
69 | |||
70 | /** |
|
70 | /** | |
71 | * Interface representing an operation performed on a variable controller. |
|
71 | * Interface representing an operation performed on a variable controller. | |
72 | * This interface is used in tests to apply a set of operations and check the status of the |
|
72 | * This interface is used in tests to apply a set of operations and check the status of the | |
73 | * controller after each operation |
|
73 | * controller after each operation | |
74 | */ |
|
74 | */ | |
75 | struct IOperation { |
|
75 | struct IOperation { | |
76 | virtual ~IOperation() = default; |
|
76 | virtual ~IOperation() = default; | |
77 | /// Executes the operation on the variable controller |
|
77 | /// Executes the operation on the variable controller | |
78 | virtual void exec(VariableController &variableController) const = 0; |
|
78 | virtual void exec(VariableController &variableController) const = 0; | |
79 | }; |
|
79 | }; | |
80 |
|
80 | |||
81 | /** |
|
81 | /** | |
82 | *Variable creation operation in the controller |
|
82 | *Variable creation operation in the controller | |
83 | */ |
|
83 | */ | |
84 | struct Create : public IOperation { |
|
84 | struct Create : public IOperation { | |
85 | explicit Create(int index) : m_Index{index} {} |
|
85 | explicit Create(int index) : m_Index{index} {} | |
86 |
|
86 | |||
87 | void exec(VariableController &variableController) const override |
|
87 | void exec(VariableController &variableController) const override | |
88 | { |
|
88 | { | |
89 | auto variable = variableController.createVariable(QString::number(m_Index), {}, |
|
89 | auto variable = variableController.createVariable(QString::number(m_Index), {}, | |
90 | std::make_unique<TestProvider>()); |
|
90 | std::make_unique<TestProvider>()); | |
91 | } |
|
91 | } | |
92 |
|
92 | |||
93 | int m_Index; ///< The index of the variable to create in the controller |
|
93 | int m_Index; ///< The index of the variable to create in the controller | |
94 | }; |
|
94 | }; | |
95 |
|
95 | |||
96 | /** |
|
96 | /** | |
97 | * Variable move/shift operation in the controller |
|
97 | * Variable move/shift operation in the controller | |
98 | */ |
|
98 | */ | |
99 | struct Move : public IOperation { |
|
99 | struct Move : public IOperation { | |
100 | explicit Move(int index, const SqpRange &newRange, bool shift = false) |
|
100 | explicit Move(int index, const SqpRange &newRange, bool shift = false) | |
101 | : m_Index{index}, m_NewRange{newRange}, m_Shift{shift} |
|
101 | : m_Index{index}, m_NewRange{newRange}, m_Shift{shift} | |
102 | { |
|
102 | { | |
103 | } |
|
103 | } | |
104 |
|
104 | |||
105 | void exec(VariableController &variableController) const override |
|
105 | void exec(VariableController &variableController) const override | |
106 | { |
|
106 | { | |
107 | if (auto variable = variableController.variableModel()->variable(m_Index)) { |
|
107 | if (auto variable = variableController.variableModel()->variable(m_Index)) { | |
108 | variableController.onRequestDataLoading({variable}, m_NewRange, variable->range(), |
|
108 | variableController.onRequestDataLoading({variable}, m_NewRange, variable->range(), | |
109 | !m_Shift); |
|
109 | !m_Shift); | |
110 | } |
|
110 | } | |
111 | } |
|
111 | } | |
112 |
|
112 | |||
113 | int m_Index; ///< The index of the variable to move |
|
113 | int m_Index; ///< The index of the variable to move | |
114 | SqpRange m_NewRange; ///< The new range of the variable |
|
114 | SqpRange m_NewRange; ///< The new range of the variable | |
115 | bool m_Shift; ///< Performs a shift ( |
|
115 | bool m_Shift; ///< Performs a shift ( | |
116 | }; |
|
116 | }; | |
117 |
|
117 | |||
118 | /** |
|
118 | /** | |
119 | * Variable synchronization/desynchronization operation in the controller |
|
119 | * Variable synchronization/desynchronization operation in the controller | |
120 | */ |
|
120 | */ | |
121 | struct Synchronize : public IOperation { |
|
121 | struct Synchronize : public IOperation { | |
122 | explicit Synchronize(int index, QUuid syncId, bool synchronize = true) |
|
122 | explicit Synchronize(int index, QUuid syncId, bool synchronize = true) | |
123 | : m_Index{index}, m_SyncId{syncId}, m_Synchronize{synchronize} |
|
123 | : m_Index{index}, m_SyncId{syncId}, m_Synchronize{synchronize} | |
124 | { |
|
124 | { | |
125 | } |
|
125 | } | |
126 |
|
126 | |||
127 | void exec(VariableController &variableController) const override |
|
127 | void exec(VariableController &variableController) const override | |
128 | { |
|
128 | { | |
129 | if (auto variable = variableController.variableModel()->variable(m_Index)) { |
|
129 | if (auto variable = variableController.variableModel()->variable(m_Index)) { | |
130 | if (m_Synchronize) { |
|
130 | if (m_Synchronize) { | |
131 | variableController.onAddSynchronized(variable, m_SyncId); |
|
131 | variableController.onAddSynchronized(variable, m_SyncId); | |
132 | } |
|
132 | } | |
133 | else { |
|
133 | else { | |
134 | variableController.desynchronize(variable, m_SyncId); |
|
134 | variableController.desynchronize(variable, m_SyncId); | |
135 | } |
|
135 | } | |
136 | } |
|
136 | } | |
137 | } |
|
137 | } | |
138 |
|
138 | |||
139 | int m_Index; ///< The index of the variable to sync/desync |
|
139 | int m_Index; ///< The index of the variable to sync/desync | |
140 | QUuid m_SyncId; ///< The synchronization group of the variable |
|
140 | QUuid m_SyncId; ///< The synchronization group of the variable | |
141 | bool m_Synchronize; ///< Performs sync or desync operation |
|
141 | bool m_Synchronize; ///< Performs sync or desync operation | |
142 | }; |
|
142 | }; | |
143 |
|
143 | |||
144 | /** |
|
144 | /** | |
145 | * Test Iteration |
|
145 | * Test Iteration | |
146 | * |
|
146 | * | |
147 | * A test iteration includes an operation to be performed, and a set of expected ranges after each |
|
147 | * A test iteration includes an operation to be performed, and a set of expected ranges after each | |
148 | * operation. Each range is tested after the operation to ensure that: |
|
148 | * operation. Each range is tested after the operation to ensure that: | |
149 | * - the range of the variable is the expected range |
|
149 | * - the range of the variable is the expected range | |
150 | * - the data of the variable are those generated for the expected range |
|
150 | * - the data of the variable are those generated for the expected range | |
151 | */ |
|
151 | */ | |
152 | struct Iteration { |
|
152 | struct Iteration { | |
153 | std::shared_ptr<IOperation> m_Operation; ///< Operation to perform |
|
153 | std::shared_ptr<IOperation> m_Operation; ///< Operation to perform | |
154 | std::map<int, SqpRange> m_ExpectedRanges; ///< Expected ranges (by variable index) |
|
154 | std::map<int, SqpRange> m_ExpectedRanges; ///< Expected ranges (by variable index) | |
155 | }; |
|
155 | }; | |
156 |
|
156 | |||
157 | using Iterations = std::vector<Iteration>; |
|
157 | using Iterations = std::vector<Iteration>; | |
158 |
|
158 | |||
159 | } // namespace |
|
159 | } // namespace | |
160 |
|
160 | |||
161 | Q_DECLARE_METATYPE(Iterations) |
|
161 | Q_DECLARE_METATYPE(Iterations) | |
162 |
|
162 | |||
163 | class TestVariableSync : public QObject { |
|
163 | class TestVariableSync : public QObject { | |
164 | Q_OBJECT |
|
164 | Q_OBJECT | |
165 |
|
165 | |||
166 | private slots: |
|
166 | private slots: | |
167 | /// Input data for @sa testSync() |
|
167 | /// Input data for @sa testSync() | |
168 | void testSync_data(); |
|
168 | void testSync_data(); | |
169 |
|
169 | |||
170 | /// Tests synchronization between variables through several operations |
|
170 | /// Tests synchronization between variables through several operations | |
171 | void testSync(); |
|
171 | void testSync(); | |
172 | }; |
|
172 | }; | |
173 |
|
173 | |||
174 | void TestVariableSync::testSync_data() |
|
174 | namespace { | |
175 | { |
|
|||
176 | // ////////////// // |
|
|||
177 | // Test structure // |
|
|||
178 | // ////////////// // |
|
|||
179 |
|
||||
180 | QTest::addColumn<QUuid>("syncId"); |
|
|||
181 | QTest::addColumn<SqpRange>("initialRange"); |
|
|||
182 | QTest::addColumn<Iterations>("iterations"); |
|
|||
183 |
|
||||
184 | // ////////// // |
|
|||
185 | // Test cases // |
|
|||
186 | // ////////// // |
|
|||
187 |
|
175 | |||
|
176 | void testSyncCase1() | |||
|
177 | { | |||
188 | // Id used to synchronize variables in the controller |
|
178 | // Id used to synchronize variables in the controller | |
189 | auto syncId = QUuid::createUuid(); |
|
179 | auto syncId = QUuid::createUuid(); | |
190 |
|
180 | |||
191 | /// Generates a range according to a start time and a end time (the date is the same) |
|
181 | /// Generates a range according to a start time and a end time (the date is the same) | |
192 | auto range = [](const QTime &startTime, const QTime &endTime) { |
|
182 | auto range = [](const QTime &startTime, const QTime &endTime) { | |
193 | return SqpRange{DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, startTime, Qt::UTC}), |
|
183 | return SqpRange{DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, startTime, Qt::UTC}), | |
194 | DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, endTime, Qt::UTC})}; |
|
184 | DateUtils::secondsSinceEpoch(QDateTime{{2017, 1, 1}, endTime, Qt::UTC})}; | |
195 | }; |
|
185 | }; | |
196 |
|
186 | |||
197 | auto initialRange = range({12, 0}, {13, 0}); |
|
187 | auto initialRange = range({12, 0}, {13, 0}); | |
198 |
|
188 | |||
199 | Iterations iterations{}; |
|
189 | Iterations iterations{}; | |
200 | // Creates variables var0, var1 and var2 |
|
190 | // Creates variables var0, var1 and var2 | |
201 | iterations.push_back({std::make_shared<Create>(0), {{0, initialRange}}}); |
|
191 | iterations.push_back({std::make_shared<Create>(0), {{0, initialRange}}}); | |
202 | iterations.push_back({std::make_shared<Create>(1), {{0, initialRange}, {1, initialRange}}}); |
|
192 | iterations.push_back({std::make_shared<Create>(1), {{0, initialRange}, {1, initialRange}}}); | |
203 | iterations.push_back( |
|
193 | iterations.push_back( | |
204 | {std::make_shared<Create>(2), {{0, initialRange}, {1, initialRange}, {2, initialRange}}}); |
|
194 | {std::make_shared<Create>(2), {{0, initialRange}, {1, initialRange}, {2, initialRange}}}); | |
205 |
|
195 | |||
206 | // Adds variables into the sync group (ranges don't need to be tested here) |
|
196 | // Adds variables into the sync group (ranges don't need to be tested here) | |
207 | iterations.push_back({std::make_shared<Synchronize>(0, syncId)}); |
|
197 | iterations.push_back({std::make_shared<Synchronize>(0, syncId)}); | |
208 | iterations.push_back({std::make_shared<Synchronize>(1, syncId)}); |
|
198 | iterations.push_back({std::make_shared<Synchronize>(1, syncId)}); | |
209 | iterations.push_back({std::make_shared<Synchronize>(2, syncId)}); |
|
199 | iterations.push_back({std::make_shared<Synchronize>(2, syncId)}); | |
210 |
|
200 | |||
211 | // Moves var0: ranges of var0, var1 and var2 change |
|
201 | // Moves var0: ranges of var0, var1 and var2 change | |
212 | auto newRange = range({12, 30}, {13, 30}); |
|
202 | auto newRange = range({12, 30}, {13, 30}); | |
213 | iterations.push_back( |
|
203 | iterations.push_back( | |
214 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); |
|
204 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); | |
215 |
|
205 | |||
216 | // Moves var1: ranges of var0, var1 and var2 change |
|
206 | // Moves var1: ranges of var0, var1 and var2 change | |
217 | newRange = range({13, 0}, {14, 0}); |
|
207 | newRange = range({13, 0}, {14, 0}); | |
218 | iterations.push_back( |
|
208 | iterations.push_back( | |
219 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); |
|
209 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); | |
220 |
|
210 | |||
221 | // Moves var2: ranges of var0, var1 and var2 change |
|
211 | // Moves var2: ranges of var0, var1 and var2 change | |
222 | newRange = range({13, 30}, {14, 30}); |
|
212 | newRange = range({13, 30}, {14, 30}); | |
223 | iterations.push_back( |
|
213 | iterations.push_back( | |
224 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); |
|
214 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, newRange}}}); | |
225 |
|
215 | |||
226 | // Desyncs var2 and moves var0: |
|
216 | // Desyncs var2 and moves var0: | |
227 | // - ranges of var0 and var1 change |
|
217 | // - ranges of var0 and var1 change | |
228 | // - range of var2 doesn't change anymore |
|
218 | // - range of var2 doesn't change anymore | |
229 | auto var2Range = newRange; |
|
219 | auto var2Range = newRange; | |
230 | newRange = range({13, 45}, {14, 45}); |
|
220 | newRange = range({13, 45}, {14, 45}); | |
231 | iterations.push_back({std::make_shared<Synchronize>(2, syncId, false)}); |
|
221 | iterations.push_back({std::make_shared<Synchronize>(2, syncId, false)}); | |
232 | iterations.push_back( |
|
222 | iterations.push_back( | |
233 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, var2Range}}}); |
|
223 | {std::make_shared<Move>(0, newRange), {{0, newRange}, {1, newRange}, {2, var2Range}}}); | |
234 |
|
224 | |||
235 | // Shifts var0: although var1 is synchronized with var0, its range doesn't change |
|
225 | // Shifts var0: although var1 is synchronized with var0, its range doesn't change | |
236 | auto var1Range = newRange; |
|
226 | auto var1Range = newRange; | |
237 | newRange = range({14, 45}, {15, 45}); |
|
227 | newRange = range({14, 45}, {15, 45}); | |
238 | iterations.push_back({std::make_shared<Move>(0, newRange, true), |
|
228 | iterations.push_back({std::make_shared<Move>(0, newRange, true), | |
239 | {{0, newRange}, {1, var1Range}, {2, var2Range}}}); |
|
229 | {{0, newRange}, {1, var1Range}, {2, var2Range}}}); | |
240 |
|
230 | |||
241 | // Moves var0 through several operations: |
|
231 | // Moves var0 through several operations: | |
242 | // - range of var0 changes |
|
232 | // - range of var0 changes | |
243 | // - range or var1 changes according to the previous shift (one hour) |
|
233 | // - range or var1 changes according to the previous shift (one hour) | |
244 | auto moveVar0 = [&iterations](const auto &var0NewRange, const auto &var1ExpectedRange) { |
|
234 | auto moveVar0 = [&iterations](const auto &var0NewRange, const auto &var1ExpectedRange) { | |
245 | iterations.push_back( |
|
235 | iterations.push_back( | |
246 | {std::make_shared<Move>(0, var0NewRange), {{0, var0NewRange}, {1, var1ExpectedRange}}}); |
|
236 | {std::make_shared<Move>(0, var0NewRange), {{0, var0NewRange}, {1, var1ExpectedRange}}}); | |
247 | }; |
|
237 | }; | |
248 | // Pan left |
|
238 | // Pan left | |
249 | moveVar0(range({14, 30}, {15, 30}), range({13, 30}, {14, 30})); |
|
239 | moveVar0(range({14, 30}, {15, 30}), range({13, 30}, {14, 30})); | |
250 | // Pan right |
|
240 | // Pan right | |
251 | moveVar0(range({16, 0}, {17, 0}), range({15, 0}, {16, 0})); |
|
241 | moveVar0(range({16, 0}, {17, 0}), range({15, 0}, {16, 0})); | |
252 | // Zoom in |
|
242 | // Zoom in | |
253 | moveVar0(range({16, 30}, {16, 45}), range({15, 30}, {15, 45})); |
|
243 | moveVar0(range({16, 30}, {16, 45}), range({15, 30}, {15, 45})); | |
254 | // Zoom out |
|
244 | // Zoom out | |
255 | moveVar0(range({12, 0}, {18, 0}), range({11, 0}, {17, 0})); |
|
245 | moveVar0(range({12, 0}, {18, 0}), range({11, 0}, {17, 0})); | |
256 |
|
246 | |||
257 | QTest::newRow("sync1") << syncId << initialRange << std::move(iterations); |
|
247 | QTest::newRow("sync1") << syncId << initialRange << std::move(iterations) << 200; | |
|
248 | } | |||
|
249 | ||||
|
250 | void testSyncCase2() | |||
|
251 | { | |||
|
252 | // Id used to synchronize variables in the controller | |||
|
253 | auto syncId = QUuid::createUuid(); | |||
|
254 | ||||
|
255 | /// Generates a range according to a start time and a end time (the date is the same) | |||
|
256 | auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) { | |||
|
257 | return DateUtils::secondsSinceEpoch( | |||
|
258 | QDateTime{{year, month, day}, QTime{hours, minutes, seconds}, Qt::UTC}); | |||
|
259 | }; | |||
|
260 | ||||
|
261 | auto initialRange = SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)}; | |||
|
262 | ||||
|
263 | Iterations iterations{}; | |||
|
264 | // Creates variables var0 and var1 | |||
|
265 | iterations.push_back({std::make_shared<Create>(0), {{0, initialRange}}}); | |||
|
266 | iterations.push_back({std::make_shared<Create>(1), {{0, initialRange}, {1, initialRange}}}); | |||
|
267 | ||||
|
268 | // Adds variables into the sync group (ranges don't need to be tested here) | |||
|
269 | iterations.push_back({std::make_shared<Synchronize>(0, syncId)}); | |||
|
270 | iterations.push_back({std::make_shared<Synchronize>(1, syncId)}); | |||
|
271 | ||||
|
272 | ||||
|
273 | // Moves var0 through several operations: | |||
|
274 | // - range of var0 changes | |||
|
275 | // - range or var1 changes according to the previous shift (one hour) | |||
|
276 | auto moveVar0 = [&iterations](const auto &var0NewRange) { | |||
|
277 | iterations.push_back( | |||
|
278 | {std::make_shared<Move>(0, var0NewRange), {{0, var0NewRange}, {1, var0NewRange}}}); | |||
|
279 | }; | |||
|
280 | moveVar0(SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)}); | |||
|
281 | moveVar0(SqpRange{dateTime(2017, 1, 1, 14, 0, 0), dateTime(2017, 1, 1, 15, 0, 0)}); | |||
|
282 | moveVar0(SqpRange{dateTime(2017, 1, 1, 8, 0, 0), dateTime(2017, 1, 1, 9, 0, 0)}); | |||
|
283 | // moveVar0(SqpRange{dateTime(2017, 1, 1, 7, 30, 0), dateTime(2017, 1, 1, 9, 30, 0)}); | |||
|
284 | moveVar0(SqpRange{dateTime(2017, 1, 1, 2, 0, 0), dateTime(2017, 1, 1, 4, 0, 0)}); | |||
|
285 | moveVar0(SqpRange{dateTime(2017, 1, 1, 6, 0, 0), dateTime(2017, 1, 1, 8, 0, 0)}); | |||
|
286 | ||||
|
287 | moveVar0(SqpRange{dateTime(2017, 1, 10, 6, 0, 0), dateTime(2017, 1, 15, 8, 0, 0)}); | |||
|
288 | moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 1, 25, 8, 0, 0)}); | |||
|
289 | moveVar0(SqpRange{dateTime(2017, 1, 2, 6, 0, 0), dateTime(2017, 1, 8, 8, 0, 0)}); | |||
|
290 | ||||
|
291 | moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)}); | |||
|
292 | moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)}); | |||
|
293 | moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)}); | |||
|
294 | moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)}); | |||
|
295 | moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)}); | |||
|
296 | moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)}); | |||
|
297 | moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)}); | |||
|
298 | moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)}); | |||
|
299 | moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)}); | |||
|
300 | moveVar0(SqpRange{dateTime(2017, 4, 10, 6, 0, 0), dateTime(2017, 6, 15, 8, 0, 0)}); | |||
|
301 | moveVar0(SqpRange{dateTime(2017, 1, 17, 6, 0, 0), dateTime(2017, 2, 25, 8, 0, 0)}); | |||
|
302 | moveVar0(SqpRange{dateTime(2017, 7, 2, 6, 0, 0), dateTime(2017, 10, 8, 8, 0, 0)}); | |||
|
303 | ||||
|
304 | ||||
|
305 | QTest::newRow("sync2") << syncId << initialRange << iterations << 4000; | |||
|
306 | // QTest::newRow("sync3") << syncId << initialRange << iterations << 5000; | |||
|
307 | } | |||
|
308 | } | |||
|
309 | ||||
|
310 | void TestVariableSync::testSync_data() | |||
|
311 | { | |||
|
312 | // ////////////// // | |||
|
313 | // Test structure // | |||
|
314 | // ////////////// // | |||
|
315 | ||||
|
316 | QTest::addColumn<QUuid>("syncId"); | |||
|
317 | QTest::addColumn<SqpRange>("initialRange"); | |||
|
318 | QTest::addColumn<Iterations>("iterations"); | |||
|
319 | QTest::addColumn<int>("operationDelay"); | |||
|
320 | ||||
|
321 | // ////////// // | |||
|
322 | // Test cases // | |||
|
323 | // ////////// // | |||
|
324 | ||||
|
325 | testSyncCase1(); | |||
|
326 | testSyncCase2(); | |||
258 | } |
|
327 | } | |
259 |
|
328 | |||
260 | void TestVariableSync::testSync() |
|
329 | void TestVariableSync::testSync() | |
261 | { |
|
330 | { | |
262 | // Inits controllers |
|
331 | // Inits controllers | |
263 | TimeController timeController{}; |
|
332 | TimeController timeController{}; | |
264 | VariableController variableController{}; |
|
333 | VariableController variableController{}; | |
265 | variableController.setTimeController(&timeController); |
|
334 | variableController.setTimeController(&timeController); | |
266 |
|
335 | |||
267 | QFETCH(QUuid, syncId); |
|
336 | QFETCH(QUuid, syncId); | |
268 | QFETCH(SqpRange, initialRange); |
|
337 | QFETCH(SqpRange, initialRange); | |
269 | timeController.onTimeToUpdate(initialRange); |
|
338 | timeController.onTimeToUpdate(initialRange); | |
270 |
|
339 | |||
271 | // Synchronization group used |
|
340 | // Synchronization group used | |
272 | variableController.onAddSynchronizationGroupId(syncId); |
|
341 | variableController.onAddSynchronizationGroupId(syncId); | |
273 |
|
342 | |||
274 | // For each iteration: |
|
343 | auto validateRanges = [&variableController](const auto &expectedRanges) { | |
275 | // - execute operation |
|
344 | for (const auto &expectedRangeEntry : expectedRanges) { | |
276 | // - compare the variables' state to the expected states |
|
|||
277 | QFETCH(Iterations, iterations); |
|
|||
278 | for (const auto &iteration : iterations) { |
|
|||
279 | iteration.m_Operation->exec(variableController); |
|
|||
280 | QTest::qWait(OPERATION_DELAY); |
|
|||
281 |
|
||||
282 | for (const auto &expectedRangeEntry : iteration.m_ExpectedRanges) { |
|
|||
283 | auto variableIndex = expectedRangeEntry.first; |
|
345 | auto variableIndex = expectedRangeEntry.first; | |
284 | auto expectedRange = expectedRangeEntry.second; |
|
346 | auto expectedRange = expectedRangeEntry.second; | |
285 |
|
347 | |||
286 | // Gets the variable in the controller |
|
348 | // Gets the variable in the controller | |
287 | auto variable = variableController.variableModel()->variable(variableIndex); |
|
349 | auto variable = variableController.variableModel()->variable(variableIndex); | |
288 |
|
350 | |||
289 | // Compares variable's range to the expected range |
|
351 | // Compares variable's range to the expected range | |
290 | QVERIFY(variable != nullptr); |
|
352 | QVERIFY(variable != nullptr); | |
291 | auto range = variable->range(); |
|
353 | auto range = variable->range(); | |
292 | QCOMPARE(range, expectedRange); |
|
354 | QCOMPARE(range, expectedRange); | |
293 |
|
355 | |||
294 | // Compares variable's data with values expected for its range |
|
356 | // Compares variable's data with values expected for its range | |
295 | auto dataSeries = variable->dataSeries(); |
|
357 | auto dataSeries = variable->dataSeries(); | |
296 | QVERIFY(dataSeries != nullptr); |
|
358 | QVERIFY(dataSeries != nullptr); | |
297 |
|
359 | |||
298 | auto it = dataSeries->xAxisRange(range.m_TStart, range.m_TEnd); |
|
360 | auto it = dataSeries->xAxisRange(range.m_TStart, range.m_TEnd); | |
299 | auto expectedValues = values(range); |
|
361 | auto expectedValues = values(range); | |
|
362 | qInfo() << std::distance(it.first, it.second) << expectedValues.size(); | |||
300 | QVERIFY(std::equal(it.first, it.second, expectedValues.cbegin(), expectedValues.cend(), |
|
363 | QVERIFY(std::equal(it.first, it.second, expectedValues.cbegin(), expectedValues.cend(), | |
301 | [](const auto &dataSeriesIt, const auto &expectedValue) { |
|
364 | [](const auto &dataSeriesIt, const auto &expectedValue) { | |
302 | return dataSeriesIt.value() == expectedValue; |
|
365 | return dataSeriesIt.value() == expectedValue; | |
303 | })); |
|
366 | })); | |
304 | } |
|
367 | } | |
|
368 | }; | |||
|
369 | ||||
|
370 | // For each iteration: | |||
|
371 | // - execute operation | |||
|
372 | // - compare the variables' state to the expected states | |||
|
373 | QFETCH(Iterations, iterations); | |||
|
374 | QFETCH(int, operationDelay); | |||
|
375 | for (const auto &iteration : iterations) { | |||
|
376 | iteration.m_Operation->exec(variableController); | |||
|
377 | QTest::qWait(operationDelay); | |||
|
378 | ||||
|
379 | validateRanges(iteration.m_ExpectedRanges); | |||
|
380 | } | |||
|
381 | ||||
|
382 | for (const auto &iteration : iterations) { | |||
|
383 | iteration.m_Operation->exec(variableController); | |||
305 | } |
|
384 | } | |
|
385 | QTest::qWait(operationDelay); | |||
|
386 | validateRanges(iterations.back().m_ExpectedRanges); | |||
306 | } |
|
387 | } | |
307 |
|
388 | |||
308 | QTEST_MAIN(TestVariableSync) |
|
389 | QTEST_MAIN(TestVariableSync) | |
309 |
|
390 | |||
310 | #include "TestVariableSync.moc" |
|
391 | #include "TestVariableSync.moc" |
@@ -1,302 +1,304 | |||||
1 | #include "Visualization/VisualizationZoneWidget.h" |
|
1 | #include "Visualization/VisualizationZoneWidget.h" | |
2 |
|
2 | |||
3 | #include "Visualization/IVisualizationWidgetVisitor.h" |
|
3 | #include "Visualization/IVisualizationWidgetVisitor.h" | |
4 | #include "Visualization/QCustomPlotSynchronizer.h" |
|
4 | #include "Visualization/QCustomPlotSynchronizer.h" | |
5 | #include "Visualization/VisualizationGraphWidget.h" |
|
5 | #include "Visualization/VisualizationGraphWidget.h" | |
6 | #include "ui_VisualizationZoneWidget.h" |
|
6 | #include "ui_VisualizationZoneWidget.h" | |
7 |
|
7 | |||
8 | #include <Data/SqpRange.h> |
|
8 | #include <Data/SqpRange.h> | |
9 | #include <Variable/Variable.h> |
|
9 | #include <Variable/Variable.h> | |
10 | #include <Variable/VariableController.h> |
|
10 | #include <Variable/VariableController.h> | |
11 |
|
11 | |||
12 | #include <QUuid> |
|
12 | #include <QUuid> | |
13 | #include <SqpApplication.h> |
|
13 | #include <SqpApplication.h> | |
14 | #include <cmath> |
|
14 | #include <cmath> | |
15 |
|
15 | |||
16 | Q_LOGGING_CATEGORY(LOG_VisualizationZoneWidget, "VisualizationZoneWidget") |
|
16 | Q_LOGGING_CATEGORY(LOG_VisualizationZoneWidget, "VisualizationZoneWidget") | |
17 |
|
17 | |||
18 | namespace { |
|
18 | namespace { | |
19 |
|
19 | |||
20 | /// Minimum height for graph added in zones (in pixels) |
|
20 | /// Minimum height for graph added in zones (in pixels) | |
21 | const auto GRAPH_MINIMUM_HEIGHT = 300; |
|
21 | const auto GRAPH_MINIMUM_HEIGHT = 300; | |
22 |
|
22 | |||
23 | /// Generates a default name for a new graph, according to the number of graphs already displayed in |
|
23 | /// Generates a default name for a new graph, according to the number of graphs already displayed in | |
24 | /// the zone |
|
24 | /// the zone | |
25 | QString defaultGraphName(const QLayout &layout) |
|
25 | QString defaultGraphName(const QLayout &layout) | |
26 | { |
|
26 | { | |
27 | auto count = 0; |
|
27 | auto count = 0; | |
28 | for (auto i = 0; i < layout.count(); ++i) { |
|
28 | for (auto i = 0; i < layout.count(); ++i) { | |
29 | if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) { |
|
29 | if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) { | |
30 | count++; |
|
30 | count++; | |
31 | } |
|
31 | } | |
32 | } |
|
32 | } | |
33 |
|
33 | |||
34 | return QObject::tr("Graph %1").arg(count + 1); |
|
34 | return QObject::tr("Graph %1").arg(count + 1); | |
35 | } |
|
35 | } | |
36 |
|
36 | |||
37 | /** |
|
37 | /** | |
38 | * Applies a function to all graphs of the zone represented by its layout |
|
38 | * Applies a function to all graphs of the zone represented by its layout | |
39 | * @param layout the layout that contains graphs |
|
39 | * @param layout the layout that contains graphs | |
40 | * @param fun the function to apply to each graph |
|
40 | * @param fun the function to apply to each graph | |
41 | */ |
|
41 | */ | |
42 | template <typename Fun> |
|
42 | template <typename Fun> | |
43 | void processGraphs(QLayout &layout, Fun fun) |
|
43 | void processGraphs(QLayout &layout, Fun fun) | |
44 | { |
|
44 | { | |
45 | for (auto i = 0; i < layout.count(); ++i) { |
|
45 | for (auto i = 0; i < layout.count(); ++i) { | |
46 | if (auto item = layout.itemAt(i)) { |
|
46 | if (auto item = layout.itemAt(i)) { | |
47 | if (auto visualizationGraphWidget |
|
47 | if (auto visualizationGraphWidget | |
48 | = dynamic_cast<VisualizationGraphWidget *>(item->widget())) { |
|
48 | = dynamic_cast<VisualizationGraphWidget *>(item->widget())) { | |
49 | fun(*visualizationGraphWidget); |
|
49 | fun(*visualizationGraphWidget); | |
50 | } |
|
50 | } | |
51 | } |
|
51 | } | |
52 | } |
|
52 | } | |
53 | } |
|
53 | } | |
54 |
|
54 | |||
55 | } // namespace |
|
55 | } // namespace | |
56 |
|
56 | |||
57 | struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate { |
|
57 | struct VisualizationZoneWidget::VisualizationZoneWidgetPrivate { | |
58 |
|
58 | |||
59 | explicit VisualizationZoneWidgetPrivate() |
|
59 | explicit VisualizationZoneWidgetPrivate() | |
60 | : m_SynchronisationGroupId{QUuid::createUuid()}, |
|
60 | : m_SynchronisationGroupId{QUuid::createUuid()}, | |
61 | m_Synchronizer{std::make_unique<QCustomPlotSynchronizer>()} |
|
61 | m_Synchronizer{std::make_unique<QCustomPlotSynchronizer>()} | |
62 | { |
|
62 | { | |
63 | } |
|
63 | } | |
64 | QUuid m_SynchronisationGroupId; |
|
64 | QUuid m_SynchronisationGroupId; | |
65 | std::unique_ptr<IGraphSynchronizer> m_Synchronizer; |
|
65 | std::unique_ptr<IGraphSynchronizer> m_Synchronizer; | |
66 | }; |
|
66 | }; | |
67 |
|
67 | |||
68 | VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) |
|
68 | VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) | |
69 | : QWidget{parent}, |
|
69 | : QWidget{parent}, | |
70 | ui{new Ui::VisualizationZoneWidget}, |
|
70 | ui{new Ui::VisualizationZoneWidget}, | |
71 | impl{spimpl::make_unique_impl<VisualizationZoneWidgetPrivate>()} |
|
71 | impl{spimpl::make_unique_impl<VisualizationZoneWidgetPrivate>()} | |
72 | { |
|
72 | { | |
73 | ui->setupUi(this); |
|
73 | ui->setupUi(this); | |
74 |
|
74 | |||
75 | ui->zoneNameLabel->setText(name); |
|
75 | ui->zoneNameLabel->setText(name); | |
76 |
|
76 | |||
77 | // 'Close' options : widget is deleted when closed |
|
77 | // 'Close' options : widget is deleted when closed | |
78 | setAttribute(Qt::WA_DeleteOnClose); |
|
78 | setAttribute(Qt::WA_DeleteOnClose); | |
79 | connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationZoneWidget::close); |
|
79 | connect(ui->closeButton, &QToolButton::clicked, this, &VisualizationZoneWidget::close); | |
80 | ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton)); |
|
80 | ui->closeButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_TitleBarCloseButton)); | |
81 |
|
81 | |||
82 | // Synchronisation id |
|
82 | // Synchronisation id | |
83 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronizationGroupId", |
|
83 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronizationGroupId", | |
84 | Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId)); |
|
84 | Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId)); | |
85 | } |
|
85 | } | |
86 |
|
86 | |||
87 | VisualizationZoneWidget::~VisualizationZoneWidget() |
|
87 | VisualizationZoneWidget::~VisualizationZoneWidget() | |
88 | { |
|
88 | { | |
89 | delete ui; |
|
89 | delete ui; | |
90 | } |
|
90 | } | |
91 |
|
91 | |||
92 | void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget) |
|
92 | void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget) | |
93 | { |
|
93 | { | |
94 | // Synchronize new graph with others in the zone |
|
94 | // Synchronize new graph with others in the zone | |
95 | impl->m_Synchronizer->addGraph(*graphWidget); |
|
95 | impl->m_Synchronizer->addGraph(*graphWidget); | |
96 |
|
96 | |||
97 | ui->visualizationZoneFrame->layout()->addWidget(graphWidget); |
|
97 | ui->visualizationZoneFrame->layout()->addWidget(graphWidget); | |
98 | } |
|
98 | } | |
99 |
|
99 | |||
100 | VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable) |
|
100 | VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable) | |
101 | { |
|
101 | { | |
102 | auto graphWidget = new VisualizationGraphWidget{ |
|
102 | auto graphWidget = new VisualizationGraphWidget{ | |
103 | defaultGraphName(*ui->visualizationZoneFrame->layout()), this}; |
|
103 | defaultGraphName(*ui->visualizationZoneFrame->layout()), this}; | |
104 |
|
104 | |||
105 |
|
105 | |||
106 | // Set graph properties |
|
106 | // Set graph properties | |
107 | graphWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); |
|
107 | graphWidget->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); | |
108 | graphWidget->setMinimumHeight(GRAPH_MINIMUM_HEIGHT); |
|
108 | graphWidget->setMinimumHeight(GRAPH_MINIMUM_HEIGHT); | |
109 |
|
109 | |||
110 |
|
110 | |||
111 | // Lambda to synchronize zone widget |
|
111 | // Lambda to synchronize zone widget | |
112 | auto synchronizeZoneWidget = [this, graphWidget](const SqpRange &graphRange, |
|
112 | auto synchronizeZoneWidget = [this, graphWidget](const SqpRange &graphRange, | |
113 | const SqpRange &oldGraphRange) { |
|
113 | const SqpRange &oldGraphRange) { | |
114 |
|
114 | |||
115 | auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange); |
|
115 | auto zoomType = VariableController::getZoomType(graphRange, oldGraphRange); | |
116 | auto frameLayout = ui->visualizationZoneFrame->layout(); |
|
116 | auto frameLayout = ui->visualizationZoneFrame->layout(); | |
117 | for (auto i = 0; i < frameLayout->count(); ++i) { |
|
117 | for (auto i = 0; i < frameLayout->count(); ++i) { | |
118 | auto graphChild |
|
118 | auto graphChild | |
119 | = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget()); |
|
119 | = dynamic_cast<VisualizationGraphWidget *>(frameLayout->itemAt(i)->widget()); | |
120 | if (graphChild && (graphChild != graphWidget)) { |
|
120 | if (graphChild && (graphChild != graphWidget)) { | |
121 |
|
121 | |||
122 | auto graphChildRange = graphChild->graphRange(); |
|
122 | auto graphChildRange = graphChild->graphRange(); | |
123 | switch (zoomType) { |
|
123 | switch (zoomType) { | |
124 | case AcquisitionZoomType::ZoomIn: { |
|
124 | case AcquisitionZoomType::ZoomIn: { | |
125 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; |
|
125 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; | |
126 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; |
|
126 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; | |
127 | graphChildRange.m_TStart += deltaLeft; |
|
127 | graphChildRange.m_TStart += deltaLeft; | |
128 | graphChildRange.m_TEnd -= deltaRight; |
|
128 | graphChildRange.m_TEnd -= deltaRight; | |
129 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn"); |
|
129 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomIn"); | |
130 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") |
|
130 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") | |
131 | << deltaLeft; |
|
131 | << deltaLeft; | |
132 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") |
|
132 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") | |
133 | << deltaRight; |
|
133 | << deltaRight; | |
134 | qCDebug(LOG_VisualizationZoneWidget()) |
|
134 | qCDebug(LOG_VisualizationZoneWidget()) | |
135 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
135 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
136 |
|
136 | |||
137 | break; |
|
137 | break; | |
138 | } |
|
138 | } | |
139 |
|
139 | |||
140 | case AcquisitionZoomType::ZoomOut: { |
|
140 | case AcquisitionZoomType::ZoomOut: { | |
141 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut"); |
|
141 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: ZoomOut"); | |
142 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
142 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
143 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
143 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
144 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") |
|
144 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaLeft") | |
145 | << deltaLeft; |
|
145 | << deltaLeft; | |
146 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") |
|
146 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: deltaRight") | |
147 | << deltaRight; |
|
147 | << deltaRight; | |
148 | qCDebug(LOG_VisualizationZoneWidget()) |
|
148 | qCDebug(LOG_VisualizationZoneWidget()) | |
149 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
149 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
150 | graphChildRange.m_TStart -= deltaLeft; |
|
150 | graphChildRange.m_TStart -= deltaLeft; | |
151 | graphChildRange.m_TEnd += deltaRight; |
|
151 | graphChildRange.m_TEnd += deltaRight; | |
152 | break; |
|
152 | break; | |
153 | } |
|
153 | } | |
154 | case AcquisitionZoomType::PanRight: { |
|
154 | case AcquisitionZoomType::PanRight: { | |
155 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight"); |
|
155 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanRight"); | |
|
156 | auto deltaLeft = graphRange.m_TStart - oldGraphRange.m_TStart; | |||
156 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; |
|
157 | auto deltaRight = graphRange.m_TEnd - oldGraphRange.m_TEnd; | |
157 |
graphChildRange.m_TStart += delta |
|
158 | graphChildRange.m_TStart += deltaLeft; | |
158 | graphChildRange.m_TEnd += deltaRight; |
|
159 | graphChildRange.m_TEnd += deltaRight; | |
159 | qCDebug(LOG_VisualizationZoneWidget()) |
|
160 | qCDebug(LOG_VisualizationZoneWidget()) | |
160 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; |
|
161 | << tr("TORM: dt") << graphRange.m_TEnd - graphRange.m_TStart; | |
161 | break; |
|
162 | break; | |
162 | } |
|
163 | } | |
163 | case AcquisitionZoomType::PanLeft: { |
|
164 | case AcquisitionZoomType::PanLeft: { | |
164 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft"); |
|
165 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: PanLeft"); | |
165 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; |
|
166 | auto deltaLeft = oldGraphRange.m_TStart - graphRange.m_TStart; | |
|
167 | auto deltaRight = oldGraphRange.m_TEnd - graphRange.m_TEnd; | |||
166 | graphChildRange.m_TStart -= deltaLeft; |
|
168 | graphChildRange.m_TStart -= deltaLeft; | |
167 |
graphChildRange.m_TEnd -= delta |
|
169 | graphChildRange.m_TEnd -= deltaRight; | |
168 | break; |
|
170 | break; | |
169 | } |
|
171 | } | |
170 | case AcquisitionZoomType::Unknown: { |
|
172 | case AcquisitionZoomType::Unknown: { | |
171 | qCDebug(LOG_VisualizationZoneWidget()) |
|
173 | qCDebug(LOG_VisualizationZoneWidget()) | |
172 | << tr("Impossible to synchronize: zoom type unknown"); |
|
174 | << tr("Impossible to synchronize: zoom type unknown"); | |
173 | break; |
|
175 | break; | |
174 | } |
|
176 | } | |
175 | default: |
|
177 | default: | |
176 | qCCritical(LOG_VisualizationZoneWidget()) |
|
178 | qCCritical(LOG_VisualizationZoneWidget()) | |
177 | << tr("Impossible to synchronize: zoom type not take into account"); |
|
179 | << tr("Impossible to synchronize: zoom type not take into account"); | |
178 | // No action |
|
180 | // No action | |
179 | break; |
|
181 | break; | |
180 | } |
|
182 | } | |
181 | graphChild->enableAcquisition(false); |
|
183 | graphChild->enableAcquisition(false); | |
182 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ") |
|
184 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range before: ") | |
183 | << graphChild->graphRange(); |
|
185 | << graphChild->graphRange(); | |
184 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ") |
|
186 | qCDebug(LOG_VisualizationZoneWidget()) << tr("TORM: Range after : ") | |
185 | << graphChildRange; |
|
187 | << graphChildRange; | |
186 | qCDebug(LOG_VisualizationZoneWidget()) |
|
188 | qCDebug(LOG_VisualizationZoneWidget()) | |
187 | << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart; |
|
189 | << tr("TORM: child dt") << graphChildRange.m_TEnd - graphChildRange.m_TStart; | |
188 | graphChild->setGraphRange(graphChildRange); |
|
190 | graphChild->setGraphRange(graphChildRange); | |
189 | graphChild->enableAcquisition(true); |
|
191 | graphChild->enableAcquisition(true); | |
190 | } |
|
192 | } | |
191 | } |
|
193 | } | |
192 | }; |
|
194 | }; | |
193 |
|
195 | |||
194 | // connection for synchronization |
|
196 | // connection for synchronization | |
195 | connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget); |
|
197 | connect(graphWidget, &VisualizationGraphWidget::synchronize, synchronizeZoneWidget); | |
196 | connect(graphWidget, &VisualizationGraphWidget::variableAdded, this, |
|
198 | connect(graphWidget, &VisualizationGraphWidget::variableAdded, this, | |
197 | &VisualizationZoneWidget::onVariableAdded); |
|
199 | &VisualizationZoneWidget::onVariableAdded); | |
198 | connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this, |
|
200 | connect(graphWidget, &VisualizationGraphWidget::variableAboutToBeRemoved, this, | |
199 | &VisualizationZoneWidget::onVariableAboutToBeRemoved); |
|
201 | &VisualizationZoneWidget::onVariableAboutToBeRemoved); | |
200 |
|
202 | |||
201 | auto range = SqpRange{}; |
|
203 | auto range = SqpRange{}; | |
202 |
|
204 | |||
203 | // Apply visitor to graph children |
|
205 | // Apply visitor to graph children | |
204 | auto layout = ui->visualizationZoneFrame->layout(); |
|
206 | auto layout = ui->visualizationZoneFrame->layout(); | |
205 | if (layout->count() > 0) { |
|
207 | if (layout->count() > 0) { | |
206 | // Case of a new graph in a existant zone |
|
208 | // Case of a new graph in a existant zone | |
207 | if (auto visualizationGraphWidget |
|
209 | if (auto visualizationGraphWidget | |
208 | = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) { |
|
210 | = dynamic_cast<VisualizationGraphWidget *>(layout->itemAt(0)->widget())) { | |
209 | range = visualizationGraphWidget->graphRange(); |
|
211 | range = visualizationGraphWidget->graphRange(); | |
210 | } |
|
212 | } | |
211 | } |
|
213 | } | |
212 | else { |
|
214 | else { | |
213 | // Case of a new graph as the first of the zone |
|
215 | // Case of a new graph as the first of the zone | |
214 | range = variable->range(); |
|
216 | range = variable->range(); | |
215 | } |
|
217 | } | |
216 |
|
218 | |||
217 | this->addGraph(graphWidget); |
|
219 | this->addGraph(graphWidget); | |
218 |
|
220 | |||
219 | graphWidget->addVariable(variable, range); |
|
221 | graphWidget->addVariable(variable, range); | |
220 |
|
222 | |||
221 | // get y using variable range |
|
223 | // get y using variable range | |
222 | if (auto dataSeries = variable->dataSeries()) { |
|
224 | if (auto dataSeries = variable->dataSeries()) { | |
223 | dataSeries->lockRead(); |
|
225 | dataSeries->lockRead(); | |
224 | auto valuesBounds |
|
226 | auto valuesBounds | |
225 | = dataSeries->valuesBounds(variable->range().m_TStart, variable->range().m_TEnd); |
|
227 | = dataSeries->valuesBounds(variable->range().m_TStart, variable->range().m_TEnd); | |
226 | auto end = dataSeries->cend(); |
|
228 | auto end = dataSeries->cend(); | |
227 | if (valuesBounds.first != end && valuesBounds.second != end) { |
|
229 | if (valuesBounds.first != end && valuesBounds.second != end) { | |
228 | auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; }; |
|
230 | auto rangeValue = [](const auto &value) { return std::isnan(value) ? 0. : value; }; | |
229 |
|
231 | |||
230 | auto minValue = rangeValue(valuesBounds.first->minValue()); |
|
232 | auto minValue = rangeValue(valuesBounds.first->minValue()); | |
231 | auto maxValue = rangeValue(valuesBounds.second->maxValue()); |
|
233 | auto maxValue = rangeValue(valuesBounds.second->maxValue()); | |
232 |
|
234 | |||
233 | graphWidget->setYRange(SqpRange{minValue, maxValue}); |
|
235 | graphWidget->setYRange(SqpRange{minValue, maxValue}); | |
234 | } |
|
236 | } | |
235 | dataSeries->unlock(); |
|
237 | dataSeries->unlock(); | |
236 | } |
|
238 | } | |
237 |
|
239 | |||
238 | return graphWidget; |
|
240 | return graphWidget; | |
239 | } |
|
241 | } | |
240 |
|
242 | |||
241 | void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor) |
|
243 | void VisualizationZoneWidget::accept(IVisualizationWidgetVisitor *visitor) | |
242 | { |
|
244 | { | |
243 | if (visitor) { |
|
245 | if (visitor) { | |
244 | visitor->visitEnter(this); |
|
246 | visitor->visitEnter(this); | |
245 |
|
247 | |||
246 | // Apply visitor to graph children: widgets different from graphs are not visited (no |
|
248 | // Apply visitor to graph children: widgets different from graphs are not visited (no | |
247 | // action) |
|
249 | // action) | |
248 | processGraphs( |
|
250 | processGraphs( | |
249 | *ui->visualizationZoneFrame->layout(), |
|
251 | *ui->visualizationZoneFrame->layout(), | |
250 | [visitor](VisualizationGraphWidget &graphWidget) { graphWidget.accept(visitor); }); |
|
252 | [visitor](VisualizationGraphWidget &graphWidget) { graphWidget.accept(visitor); }); | |
251 |
|
253 | |||
252 | visitor->visitLeave(this); |
|
254 | visitor->visitLeave(this); | |
253 | } |
|
255 | } | |
254 | else { |
|
256 | else { | |
255 | qCCritical(LOG_VisualizationZoneWidget()) << tr("Can't visit widget : the visitor is null"); |
|
257 | qCCritical(LOG_VisualizationZoneWidget()) << tr("Can't visit widget : the visitor is null"); | |
256 | } |
|
258 | } | |
257 | } |
|
259 | } | |
258 |
|
260 | |||
259 | bool VisualizationZoneWidget::canDrop(const Variable &variable) const |
|
261 | bool VisualizationZoneWidget::canDrop(const Variable &variable) const | |
260 | { |
|
262 | { | |
261 | // A tab can always accomodate a variable |
|
263 | // A tab can always accomodate a variable | |
262 | Q_UNUSED(variable); |
|
264 | Q_UNUSED(variable); | |
263 | return true; |
|
265 | return true; | |
264 | } |
|
266 | } | |
265 |
|
267 | |||
266 | bool VisualizationZoneWidget::contains(const Variable &variable) const |
|
268 | bool VisualizationZoneWidget::contains(const Variable &variable) const | |
267 | { |
|
269 | { | |
268 | Q_UNUSED(variable); |
|
270 | Q_UNUSED(variable); | |
269 | return false; |
|
271 | return false; | |
270 | } |
|
272 | } | |
271 |
|
273 | |||
272 | QString VisualizationZoneWidget::name() const |
|
274 | QString VisualizationZoneWidget::name() const | |
273 | { |
|
275 | { | |
274 | return ui->zoneNameLabel->text(); |
|
276 | return ui->zoneNameLabel->text(); | |
275 | } |
|
277 | } | |
276 |
|
278 | |||
277 | void VisualizationZoneWidget::closeEvent(QCloseEvent *event) |
|
279 | void VisualizationZoneWidget::closeEvent(QCloseEvent *event) | |
278 | { |
|
280 | { | |
279 | // Closes graphs in the zone |
|
281 | // Closes graphs in the zone | |
280 | processGraphs(*ui->visualizationZoneFrame->layout(), |
|
282 | processGraphs(*ui->visualizationZoneFrame->layout(), | |
281 | [](VisualizationGraphWidget &graphWidget) { graphWidget.close(); }); |
|
283 | [](VisualizationGraphWidget &graphWidget) { graphWidget.close(); }); | |
282 |
|
284 | |||
283 | // Delete synchronization group from variable controller |
|
285 | // Delete synchronization group from variable controller | |
284 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onRemoveSynchronizationGroupId", |
|
286 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onRemoveSynchronizationGroupId", | |
285 | Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId)); |
|
287 | Qt::QueuedConnection, Q_ARG(QUuid, impl->m_SynchronisationGroupId)); | |
286 |
|
288 | |||
287 | QWidget::closeEvent(event); |
|
289 | QWidget::closeEvent(event); | |
288 | } |
|
290 | } | |
289 |
|
291 | |||
290 | void VisualizationZoneWidget::onVariableAdded(std::shared_ptr<Variable> variable) |
|
292 | void VisualizationZoneWidget::onVariableAdded(std::shared_ptr<Variable> variable) | |
291 | { |
|
293 | { | |
292 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronized", |
|
294 | QMetaObject::invokeMethod(&sqpApp->variableController(), "onAddSynchronized", | |
293 | Qt::QueuedConnection, Q_ARG(std::shared_ptr<Variable>, variable), |
|
295 | Qt::QueuedConnection, Q_ARG(std::shared_ptr<Variable>, variable), | |
294 | Q_ARG(QUuid, impl->m_SynchronisationGroupId)); |
|
296 | Q_ARG(QUuid, impl->m_SynchronisationGroupId)); | |
295 | } |
|
297 | } | |
296 |
|
298 | |||
297 | void VisualizationZoneWidget::onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable) |
|
299 | void VisualizationZoneWidget::onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable) | |
298 | { |
|
300 | { | |
299 | QMetaObject::invokeMethod(&sqpApp->variableController(), "desynchronize", Qt::QueuedConnection, |
|
301 | QMetaObject::invokeMethod(&sqpApp->variableController(), "desynchronize", Qt::QueuedConnection, | |
300 | Q_ARG(std::shared_ptr<Variable>, variable), |
|
302 | Q_ARG(std::shared_ptr<Variable>, variable), | |
301 | Q_ARG(QUuid, impl->m_SynchronisationGroupId)); |
|
303 | Q_ARG(QUuid, impl->m_SynchronisationGroupId)); | |
302 | } |
|
304 | } |
@@ -1,36 +1,41 | |||||
1 | #ifndef SCIQLOP_COSINUSPROVIDER_H |
|
1 | #ifndef SCIQLOP_COSINUSPROVIDER_H | |
2 | #define SCIQLOP_COSINUSPROVIDER_H |
|
2 | #define SCIQLOP_COSINUSPROVIDER_H | |
3 |
|
3 | |||
4 | #include "MockPluginGlobal.h" |
|
4 | #include "MockPluginGlobal.h" | |
5 |
|
5 | |||
6 | #include <Data/IDataProvider.h> |
|
6 | #include <Data/IDataProvider.h> | |
7 |
|
7 | |||
8 | #include <QLoggingCategory> |
|
8 | #include <QLoggingCategory> | |
9 | #include <QUuid> |
|
9 | #include <QUuid> | |
10 |
|
10 | |||
11 | #include <QHash> |
|
11 | #include <QHash> | |
12 | Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider) |
|
12 | Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider) | |
13 |
|
13 | |||
14 | /** |
|
14 | /** | |
15 | * @brief The CosinusProvider class is an example of how a data provider can generate data |
|
15 | * @brief The CosinusProvider class is an example of how a data provider can generate data | |
16 | */ |
|
16 | */ | |
17 | class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider { |
|
17 | class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider { | |
18 | public: |
|
18 | public: | |
19 | std::shared_ptr<IDataProvider> clone() const override; |
|
19 | std::shared_ptr<IDataProvider> clone() const override; | |
20 |
|
20 | |||
21 | /// @sa IDataProvider::requestDataLoading(). The current impl isn't thread safe. |
|
21 | /// @sa IDataProvider::requestDataLoading(). The current impl isn't thread safe. | |
22 | void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters ¶meters) override; |
|
22 | void requestDataLoading(QUuid acqIdentifier, const DataProviderParameters ¶meters) override; | |
23 |
|
23 | |||
24 |
|
24 | |||
25 | /// @sa IDataProvider::requestDataAborting(). The current impl isn't thread safe. |
|
25 | /// @sa IDataProvider::requestDataAborting(). The current impl isn't thread safe. | |
26 | void requestDataAborting(QUuid acqIdentifier) override; |
|
26 | void requestDataAborting(QUuid acqIdentifier) override; | |
27 |
|
27 | |||
28 |
|
28 | |||
|
29 | /// Provide data | |||
|
30 | std::shared_ptr<IDataSeries> provideDataSeries(const SqpRange &dataRangeRequested, | |||
|
31 | const QVariantHash &data); | |||
|
32 | ||||
|
33 | ||||
29 | private: |
|
34 | private: | |
30 | std::shared_ptr<IDataSeries> |
|
35 | std::shared_ptr<IDataSeries> | |
31 | retrieveData(QUuid acqIdentifier, const SqpRange &dataRangeRequested, const QVariantHash &data); |
|
36 | retrieveData(QUuid acqIdentifier, const SqpRange &dataRangeRequested, const QVariantHash &data); | |
32 |
|
37 | |||
33 | QHash<QUuid, bool> m_VariableToEnableProvider; |
|
38 | QHash<QUuid, bool> m_VariableToEnableProvider; | |
34 | }; |
|
39 | }; | |
35 |
|
40 | |||
36 | #endif // SCIQLOP_COSINUSPROVIDER_H |
|
41 | #endif // SCIQLOP_COSINUSPROVIDER_H |
@@ -1,201 +1,213 | |||||
1 | #include "CosinusProvider.h" |
|
1 | #include "CosinusProvider.h" | |
2 | #include "MockDefs.h" |
|
2 | #include "MockDefs.h" | |
3 |
|
3 | |||
4 | #include <Data/DataProviderParameters.h> |
|
4 | #include <Data/DataProviderParameters.h> | |
5 | #include <Data/ScalarSeries.h> |
|
5 | #include <Data/ScalarSeries.h> | |
6 | #include <Data/VectorSeries.h> |
|
6 | #include <Data/VectorSeries.h> | |
7 |
|
7 | |||
8 | #include <cmath> |
|
8 | #include <cmath> | |
9 |
|
9 | |||
10 | #include <QFuture> |
|
10 | #include <QFuture> | |
11 | #include <QThread> |
|
11 | #include <QThread> | |
12 | #include <QtConcurrent/QtConcurrent> |
|
12 | #include <QtConcurrent/QtConcurrent> | |
13 |
|
13 | |||
14 | Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider") |
|
14 | Q_LOGGING_CATEGORY(LOG_CosinusProvider, "CosinusProvider") | |
15 |
|
15 | |||
16 | namespace { |
|
16 | namespace { | |
17 |
|
17 | |||
18 | /// Abstract cosinus type |
|
18 | /// Abstract cosinus type | |
19 | struct ICosinusType { |
|
19 | struct ICosinusType { | |
20 | virtual ~ICosinusType() = default; |
|
20 | virtual ~ICosinusType() = default; | |
21 | /// @return the number of components generated for the type |
|
21 | /// @return the number of components generated for the type | |
22 | virtual int componentCount() const = 0; |
|
22 | virtual int componentCount() const = 0; | |
23 | /// @return the data series created for the type |
|
23 | /// @return the data series created for the type | |
24 | virtual std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, |
|
24 | virtual std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, | |
25 | std::vector<double> valuesData, |
|
25 | std::vector<double> valuesData, | |
26 | Unit xAxisUnit, |
|
26 | Unit xAxisUnit, | |
27 | Unit valuesUnit) const = 0; |
|
27 | Unit valuesUnit) const = 0; | |
28 | }; |
|
28 | }; | |
29 |
|
29 | |||
30 | struct ScalarCosinus : public ICosinusType { |
|
30 | struct ScalarCosinus : public ICosinusType { | |
31 | int componentCount() const override { return 1; } |
|
31 | int componentCount() const override { return 1; } | |
32 |
|
32 | |||
33 | std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, |
|
33 | std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, | |
34 | std::vector<double> valuesData, Unit xAxisUnit, |
|
34 | std::vector<double> valuesData, Unit xAxisUnit, | |
35 | Unit valuesUnit) const override |
|
35 | Unit valuesUnit) const override | |
36 | { |
|
36 | { | |
37 | return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), |
|
37 | return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), | |
38 | xAxisUnit, valuesUnit); |
|
38 | xAxisUnit, valuesUnit); | |
39 | } |
|
39 | } | |
40 | }; |
|
40 | }; | |
41 | struct VectorCosinus : public ICosinusType { |
|
41 | struct VectorCosinus : public ICosinusType { | |
42 | int componentCount() const override { return 3; } |
|
42 | int componentCount() const override { return 3; } | |
43 |
|
43 | |||
44 | std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, |
|
44 | std::shared_ptr<IDataSeries> createDataSeries(std::vector<double> xAxisData, | |
45 | std::vector<double> valuesData, Unit xAxisUnit, |
|
45 | std::vector<double> valuesData, Unit xAxisUnit, | |
46 | Unit valuesUnit) const override |
|
46 | Unit valuesUnit) const override | |
47 | { |
|
47 | { | |
48 | return std::make_shared<VectorSeries>(std::move(xAxisData), std::move(valuesData), |
|
48 | return std::make_shared<VectorSeries>(std::move(xAxisData), std::move(valuesData), | |
49 | xAxisUnit, valuesUnit); |
|
49 | xAxisUnit, valuesUnit); | |
50 | } |
|
50 | } | |
51 | }; |
|
51 | }; | |
52 |
|
52 | |||
53 | /// Converts string to cosinus type |
|
53 | /// Converts string to cosinus type | |
54 | /// @return the cosinus type if the string could be converted, nullptr otherwise |
|
54 | /// @return the cosinus type if the string could be converted, nullptr otherwise | |
55 | std::unique_ptr<ICosinusType> cosinusType(const QString &type) noexcept |
|
55 | std::unique_ptr<ICosinusType> cosinusType(const QString &type) noexcept | |
56 | { |
|
56 | { | |
57 | if (type.compare(QStringLiteral("scalar"), Qt::CaseInsensitive) == 0) { |
|
57 | if (type.compare(QStringLiteral("scalar"), Qt::CaseInsensitive) == 0) { | |
58 | return std::make_unique<ScalarCosinus>(); |
|
58 | return std::make_unique<ScalarCosinus>(); | |
59 | } |
|
59 | } | |
60 | else if (type.compare(QStringLiteral("vector"), Qt::CaseInsensitive) == 0) { |
|
60 | else if (type.compare(QStringLiteral("vector"), Qt::CaseInsensitive) == 0) { | |
61 | return std::make_unique<VectorCosinus>(); |
|
61 | return std::make_unique<VectorCosinus>(); | |
62 | } |
|
62 | } | |
63 | else { |
|
63 | else { | |
64 | return nullptr; |
|
64 | return nullptr; | |
65 | } |
|
65 | } | |
66 | } |
|
66 | } | |
67 |
|
67 | |||
68 | } // namespace |
|
68 | } // namespace | |
69 |
|
69 | |||
70 | std::shared_ptr<IDataProvider> CosinusProvider::clone() const |
|
70 | std::shared_ptr<IDataProvider> CosinusProvider::clone() const | |
71 | { |
|
71 | { | |
72 | // No copy is made in clone |
|
72 | // No copy is made in clone | |
73 | return std::make_shared<CosinusProvider>(); |
|
73 | return std::make_shared<CosinusProvider>(); | |
74 | } |
|
74 | } | |
75 |
|
75 | |||
76 | std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier, |
|
76 | std::shared_ptr<IDataSeries> CosinusProvider::retrieveData(QUuid acqIdentifier, | |
77 | const SqpRange &dataRangeRequested, |
|
77 | const SqpRange &dataRangeRequested, | |
78 | const QVariantHash &data) |
|
78 | const QVariantHash &data) | |
79 | { |
|
79 | { | |
80 | // TODO: Add Mutex |
|
80 | // TODO: Add Mutex | |
81 | auto dataIndex = 0; |
|
81 | auto dataIndex = 0; | |
82 |
|
82 | |||
83 | // Retrieves cosinus type |
|
83 | // Retrieves cosinus type | |
84 | auto typeVariant = data.value(COSINUS_TYPE_KEY, COSINUS_TYPE_DEFAULT_VALUE); |
|
84 | auto typeVariant = data.value(COSINUS_TYPE_KEY, COSINUS_TYPE_DEFAULT_VALUE); | |
85 | if (!typeVariant.canConvert<QString>()) { |
|
85 | if (!typeVariant.canConvert<QString>()) { | |
86 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: invalid type"); |
|
86 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: invalid type"); | |
87 | return nullptr; |
|
87 | return nullptr; | |
88 | } |
|
88 | } | |
89 |
|
89 | |||
90 | auto type = cosinusType(typeVariant.toString()); |
|
90 | auto type = cosinusType(typeVariant.toString()); | |
91 | if (!type) { |
|
91 | if (!type) { | |
92 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: unknown type"); |
|
92 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: unknown type"); | |
93 | return nullptr; |
|
93 | return nullptr; | |
94 | } |
|
94 | } | |
95 |
|
95 | |||
96 | // Retrieves frequency |
|
96 | // Retrieves frequency | |
97 | auto freqVariant = data.value(COSINUS_FREQUENCY_KEY, COSINUS_FREQUENCY_DEFAULT_VALUE); |
|
97 | auto freqVariant = data.value(COSINUS_FREQUENCY_KEY, COSINUS_FREQUENCY_DEFAULT_VALUE); | |
98 | if (!freqVariant.canConvert<double>()) { |
|
98 | if (!freqVariant.canConvert<double>()) { | |
99 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: invalid frequency"); |
|
99 | qCCritical(LOG_CosinusProvider()) << tr("Can't retrieve data: invalid frequency"); | |
100 | return nullptr; |
|
100 | return nullptr; | |
101 | } |
|
101 | } | |
102 |
|
102 | |||
103 | // Gets the timerange from the parameters |
|
103 | // Gets the timerange from the parameters | |
104 | double freq = freqVariant.toDouble(); |
|
104 | double freq = freqVariant.toDouble(); | |
105 | double start = std::ceil(dataRangeRequested.m_TStart * freq); |
|
105 | double start = std::ceil(dataRangeRequested.m_TStart * freq); | |
106 | double end = std::floor(dataRangeRequested.m_TEnd * freq); |
|
106 | double end = std::floor(dataRangeRequested.m_TEnd * freq); | |
107 |
|
107 | |||
108 | // We assure that timerange is valid |
|
108 | // We assure that timerange is valid | |
109 | if (end < start) { |
|
109 | if (end < start) { | |
110 | std::swap(start, end); |
|
110 | std::swap(start, end); | |
111 | } |
|
111 | } | |
112 |
|
112 | |||
113 | // Generates scalar series containing cosinus values (one value per second, end value is |
|
113 | // Generates scalar series containing cosinus values (one value per second, end value is | |
114 | // included) |
|
114 | // included) | |
115 | auto dataCount = end - start + 1; |
|
115 | auto dataCount = end - start + 1; | |
116 |
|
116 | |||
117 | // Number of components (depending on the cosinus type) |
|
117 | // Number of components (depending on the cosinus type) | |
118 | auto componentCount = type->componentCount(); |
|
118 | auto componentCount = type->componentCount(); | |
119 |
|
119 | |||
120 | auto xAxisData = std::vector<double>{}; |
|
120 | auto xAxisData = std::vector<double>{}; | |
121 | xAxisData.resize(dataCount); |
|
121 | xAxisData.resize(dataCount); | |
122 |
|
122 | |||
123 | auto valuesData = std::vector<double>{}; |
|
123 | auto valuesData = std::vector<double>{}; | |
124 | valuesData.resize(dataCount * componentCount); |
|
124 | valuesData.resize(dataCount * componentCount); | |
125 |
|
125 | |||
126 | int progress = 0; |
|
126 | int progress = 0; | |
127 | auto progressEnd = dataCount; |
|
127 | auto progressEnd = dataCount; | |
128 | for (auto time = start; time <= end; ++time, ++dataIndex) { |
|
128 | for (auto time = start; time <= end; ++time, ++dataIndex) { | |
129 | auto it = m_VariableToEnableProvider.find(acqIdentifier); |
|
129 | auto it = m_VariableToEnableProvider.find(acqIdentifier); | |
130 | if (it != m_VariableToEnableProvider.end() && it.value()) { |
|
130 | if (it != m_VariableToEnableProvider.end() && it.value()) { | |
131 | const auto timeOnFreq = time / freq; |
|
131 | const auto timeOnFreq = time / freq; | |
132 |
|
132 | |||
133 | xAxisData[dataIndex] = timeOnFreq; |
|
133 | xAxisData[dataIndex] = timeOnFreq; | |
134 |
|
134 | |||
135 | // Generates all components' values |
|
135 | // Generates all components' values | |
136 | // Example: for a vector, values will be : cos(x), cos(x)/2, cos(x)/3 |
|
136 | // Example: for a vector, values will be : cos(x), cos(x)/2, cos(x)/3 | |
137 | auto value = std::cos(timeOnFreq); |
|
137 | auto value = std::cos(timeOnFreq); | |
138 | for (auto i = 0; i < componentCount; ++i) { |
|
138 | for (auto i = 0; i < componentCount; ++i) { | |
139 | valuesData[componentCount * dataIndex + i] = value / (i + 1); |
|
139 | valuesData[componentCount * dataIndex + i] = value / (i + 1); | |
140 | } |
|
140 | } | |
141 |
|
141 | |||
142 | // progression |
|
142 | // progression | |
143 | int currentProgress = (time - start) * 100.0 / progressEnd; |
|
143 | int currentProgress = (time - start) * 100.0 / progressEnd; | |
144 | if (currentProgress != progress) { |
|
144 | if (currentProgress != progress) { | |
145 | progress = currentProgress; |
|
145 | progress = currentProgress; | |
146 |
|
146 | |||
147 | emit dataProvidedProgress(acqIdentifier, progress); |
|
147 | emit dataProvidedProgress(acqIdentifier, progress); | |
148 |
qC |
|
148 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::retrieveData" | |
149 |
<< QThread::currentThread()->objectName() |
|
149 | << QThread::currentThread()->objectName() | |
|
150 | << progress; | |||
150 | // NOTE: Try to use multithread if possible |
|
151 | // NOTE: Try to use multithread if possible | |
151 | } |
|
152 | } | |
152 | } |
|
153 | } | |
153 | else { |
|
154 | else { | |
154 | if (!it.value()) { |
|
155 | if (!it.value()) { | |
155 | qCDebug(LOG_CosinusProvider()) |
|
156 | qCDebug(LOG_CosinusProvider()) | |
156 | << "CosinusProvider::retrieveData: ARRET De l'acquisition detectΓ©" |
|
157 | << "CosinusProvider::retrieveData: ARRET De l'acquisition detectΓ©" | |
157 | << end - time; |
|
158 | << end - time; | |
158 | } |
|
159 | } | |
159 | } |
|
160 | } | |
160 | } |
|
161 | } | |
161 | if (progress != 100) { |
|
162 | if (progress != 100) { | |
162 | // We can close progression beacause all data has been retrieved |
|
163 | // We can close progression beacause all data has been retrieved | |
163 | emit dataProvidedProgress(acqIdentifier, 100); |
|
164 | emit dataProvidedProgress(acqIdentifier, 100); | |
164 | } |
|
165 | } | |
165 | return type->createDataSeries(std::move(xAxisData), std::move(valuesData), |
|
166 | return type->createDataSeries(std::move(xAxisData), std::move(valuesData), | |
166 | Unit{QStringLiteral("t"), true}, Unit{}); |
|
167 | Unit{QStringLiteral("t"), true}, Unit{}); | |
167 | } |
|
168 | } | |
168 |
|
169 | |||
169 | void CosinusProvider::requestDataLoading(QUuid acqIdentifier, |
|
170 | void CosinusProvider::requestDataLoading(QUuid acqIdentifier, | |
170 | const DataProviderParameters ¶meters) |
|
171 | const DataProviderParameters ¶meters) | |
171 | { |
|
172 | { | |
172 | // TODO: Add Mutex |
|
173 | // TODO: Add Mutex | |
173 | m_VariableToEnableProvider[acqIdentifier] = true; |
|
174 | m_VariableToEnableProvider[acqIdentifier] = true; | |
174 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::requestDataLoading" |
|
175 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::requestDataLoading" | |
175 | << QThread::currentThread()->objectName(); |
|
176 | << QThread::currentThread()->objectName(); | |
176 | // NOTE: Try to use multithread if possible |
|
177 | // NOTE: Try to use multithread if possible | |
177 | const auto times = parameters.m_Times; |
|
178 | const auto times = parameters.m_Times; | |
178 |
|
179 | |||
179 | for (const auto &dateTime : qAsConst(times)) { |
|
180 | for (const auto &dateTime : qAsConst(times)) { | |
180 | if (m_VariableToEnableProvider[acqIdentifier]) { |
|
181 | if (m_VariableToEnableProvider[acqIdentifier]) { | |
181 | auto scalarSeries = this->retrieveData(acqIdentifier, dateTime, parameters.m_Data); |
|
182 | auto scalarSeries = this->retrieveData(acqIdentifier, dateTime, parameters.m_Data); | |
182 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided"; |
|
183 | qCDebug(LOG_CosinusProvider()) << "TORM: CosinusProvider::dataProvided"; | |
183 | emit dataProvided(acqIdentifier, scalarSeries, dateTime); |
|
184 | emit dataProvided(acqIdentifier, scalarSeries, dateTime); | |
184 | } |
|
185 | } | |
185 | } |
|
186 | } | |
186 | } |
|
187 | } | |
187 |
|
188 | |||
188 | void CosinusProvider::requestDataAborting(QUuid acqIdentifier) |
|
189 | void CosinusProvider::requestDataAborting(QUuid acqIdentifier) | |
189 | { |
|
190 | { | |
190 | // TODO: Add Mutex |
|
191 | // TODO: Add Mutex | |
191 | qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << acqIdentifier |
|
192 | qCDebug(LOG_CosinusProvider()) << "CosinusProvider::requestDataAborting" << acqIdentifier | |
192 | << QThread::currentThread()->objectName(); |
|
193 | << QThread::currentThread()->objectName(); | |
193 | auto it = m_VariableToEnableProvider.find(acqIdentifier); |
|
194 | auto it = m_VariableToEnableProvider.find(acqIdentifier); | |
194 | if (it != m_VariableToEnableProvider.end()) { |
|
195 | if (it != m_VariableToEnableProvider.end()) { | |
195 | it.value() = false; |
|
196 | it.value() = false; | |
196 | } |
|
197 | } | |
197 | else { |
|
198 | else { | |
198 | qCWarning(LOG_CosinusProvider()) |
|
199 | qCWarning(LOG_CosinusProvider()) | |
199 | << tr("Aborting progression of inexistant identifier detected !!!"); |
|
200 | << tr("Aborting progression of inexistant identifier detected !!!"); | |
200 | } |
|
201 | } | |
201 | } |
|
202 | } | |
|
203 | ||||
|
204 | std::shared_ptr<IDataSeries> CosinusProvider::provideDataSeries(const SqpRange &dataRangeRequested, | |||
|
205 | const QVariantHash &data) | |||
|
206 | { | |||
|
207 | auto uid = QUuid::createUuid(); | |||
|
208 | m_VariableToEnableProvider[uid] = true; | |||
|
209 | auto dataSeries = this->retrieveData(uid, dataRangeRequested, data); | |||
|
210 | ||||
|
211 | m_VariableToEnableProvider.remove(uid); | |||
|
212 | return dataSeries; | |||
|
213 | } |
@@ -1,193 +1,194 | |||||
1 | #include "CosinusProvider.h" |
|
1 | #include "CosinusProvider.h" | |
2 | #include "MockDefs.h" |
|
2 | #include "MockDefs.h" | |
3 |
|
3 | |||
4 | #include <Data/DataProviderParameters.h> |
|
4 | #include <Data/DataProviderParameters.h> | |
5 | #include <Data/ScalarSeries.h> |
|
5 | #include <Data/ScalarSeries.h> | |
6 | #include <SqpApplication.h> |
|
6 | #include <SqpApplication.h> | |
7 | #include <Time/TimeController.h> |
|
7 | #include <Time/TimeController.h> | |
8 | #include <Variable/Variable.h> |
|
8 | #include <Variable/Variable.h> | |
9 | #include <Variable/VariableController.h> |
|
9 | #include <Variable/VariableController.h> | |
10 |
|
10 | |||
11 | #include <QObject> |
|
11 | #include <QObject> | |
12 | #include <QtTest> |
|
12 | #include <QtTest> | |
13 |
|
13 | |||
14 | #include <cmath> |
|
14 | #include <cmath> | |
15 | #include <memory> |
|
15 | #include <memory> | |
16 |
|
16 | |||
17 | namespace { |
|
17 | namespace { | |
18 |
|
18 | |||
19 | /// Path for the tests |
|
19 | /// Path for the tests | |
20 | const auto TESTS_RESOURCES_PATH = QFileInfo{ |
|
20 | const auto TESTS_RESOURCES_PATH = QFileInfo{ | |
21 | QString{MOCKPLUGIN_TESTS_RESOURCES_DIR}, |
|
21 | QString{MOCKPLUGIN_TESTS_RESOURCES_DIR}, | |
22 | "TestCosinusAcquisition"}.absoluteFilePath(); |
|
22 | "TestCosinusAcquisition"}.absoluteFilePath(); | |
23 |
|
23 | |||
24 | /// Format of dates in data files |
|
24 | /// Format of dates in data files | |
25 | const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss:zzz"); |
|
25 | const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss:zzz"); | |
26 |
|
26 | |||
27 | /// Delay after each operation on the variable before validating it (in ms) |
|
|||
28 | const auto OPERATION_DELAY = 250; |
|
|||
29 |
|
||||
30 | /** |
|
27 | /** | |
31 | * Verifies that the data in the candidate series are identical to the data in the reference series |
|
28 | * Verifies that the data in the candidate series are identical to the data in the reference series | |
32 | * in a specific range |
|
29 | * in a specific range | |
33 | * @param candidate the candidate data series |
|
30 | * @param candidate the candidate data series | |
34 | * @param range the range to check |
|
31 | * @param range the range to check | |
35 | * @param reference the reference data series |
|
32 | * @param reference the reference data series | |
36 | * @return true if the data of the candidate series and the reference series are identical in the |
|
33 | * @return true if the data of the candidate series and the reference series are identical in the | |
37 | * range, false otherwise |
|
34 | * range, false otherwise | |
38 | */ |
|
35 | */ | |
39 | bool checkDataSeries(std::shared_ptr<IDataSeries> candidate, const SqpRange &range, |
|
36 | bool checkDataSeries(std::shared_ptr<IDataSeries> candidate, const SqpRange &range, | |
40 | std::shared_ptr<IDataSeries> reference) |
|
37 | std::shared_ptr<IDataSeries> reference) | |
41 | { |
|
38 | { | |
42 | if (candidate == nullptr || reference == nullptr) { |
|
39 | if (candidate == nullptr || reference == nullptr) { | |
43 | return candidate == reference; |
|
40 | return candidate == reference; | |
44 | } |
|
41 | } | |
45 |
|
42 | |||
46 | auto referenceIt = reference->xAxisRange(range.m_TStart, range.m_TEnd); |
|
43 | auto referenceIt = reference->xAxisRange(range.m_TStart, range.m_TEnd); | |
47 |
|
44 | |||
|
45 | qInfo() << "candidateSize" << std::distance(candidate->cbegin(), candidate->cend()); | |||
|
46 | qInfo() << "refSize" << std::distance(referenceIt.first, referenceIt.second); | |||
|
47 | ||||
48 | return std::equal(candidate->cbegin(), candidate->cend(), referenceIt.first, referenceIt.second, |
|
48 | return std::equal(candidate->cbegin(), candidate->cend(), referenceIt.first, referenceIt.second, | |
49 | [](const auto &it1, const auto &it2) { |
|
49 | [](const auto &it1, const auto &it2) { | |
50 | // - milliseconds precision for time |
|
50 | // - milliseconds precision for time | |
51 | // - 1e-6 precision for value |
|
51 | // - 1e-6 precision for value | |
52 | return std::abs(it1.x() - it2.x()) < 1e-3 |
|
52 | return std::abs(it1.x() - it2.x()) < 1e-3 | |
53 | && std::abs(it1.value() - it2.value()) < 1e-6; |
|
53 | && std::abs(it1.value() - it2.value()) < 1e-6; | |
54 | }); |
|
54 | }); | |
55 | } |
|
55 | } | |
56 |
|
56 | |||
57 | /// Generates the data series from the reading of a data stream |
|
|||
58 | std::shared_ptr<IDataSeries> readDataStream(QTextStream &stream) |
|
|||
59 | { |
|
|||
60 | std::vector<double> xAxisData, valuesData; |
|
|||
61 |
|
||||
62 | QString line{}; |
|
|||
63 | while (stream.readLineInto(&line)) { |
|
|||
64 | // Separates date (x-axis data) to value data |
|
|||
65 | auto splitLine = line.split('\t'); |
|
|||
66 | if (splitLine.size() == 2) { |
|
|||
67 | // Converts datetime to double |
|
|||
68 | auto dateTime = QDateTime::fromString(splitLine[0], DATETIME_FORMAT); |
|
|||
69 | dateTime.setTimeSpec(Qt::UTC); |
|
|||
70 | xAxisData.push_back(DateUtils::secondsSinceEpoch(dateTime)); |
|
|||
71 |
|
||||
72 | valuesData.push_back(splitLine[1].toDouble()); |
|
|||
73 | } |
|
|||
74 | } |
|
|||
75 |
|
||||
76 | return std::make_shared<ScalarSeries>(std::move(xAxisData), std::move(valuesData), |
|
|||
77 | Unit{{}, true}, Unit{}); |
|
|||
78 | } |
|
|||
79 |
|
||||
80 | } // namespace |
|
57 | } // namespace | |
81 |
|
58 | |||
82 | /** |
|
59 | /** | |
83 | * @brief The TestCosinusAcquisition class tests acquisition in SciQlop (operations like zooms in, |
|
60 | * @brief The TestCosinusAcquisition class tests acquisition in SciQlop (operations like zooms in, | |
84 | * zooms out, pans) of data from CosinusProvider |
|
61 | * zooms out, pans) of data from CosinusProvider | |
85 | * @sa CosinusProvider |
|
62 | * @sa CosinusProvider | |
86 | */ |
|
63 | */ | |
87 | class TestCosinusAcquisition : public QObject { |
|
64 | class TestCosinusAcquisition : public QObject { | |
88 | Q_OBJECT |
|
65 | Q_OBJECT | |
89 |
|
66 | |||
90 | private slots: |
|
67 | private slots: | |
91 | /// Input data for @sa testAcquisition() |
|
68 | /// Input data for @sa testAcquisition() | |
92 | void testAcquisition_data(); |
|
69 | void testAcquisition_data(); | |
93 | void testAcquisition(); |
|
70 | void testAcquisition(); | |
94 | }; |
|
71 | }; | |
95 |
|
72 | |||
96 | void TestCosinusAcquisition::testAcquisition_data() |
|
73 | void TestCosinusAcquisition::testAcquisition_data() | |
97 | { |
|
74 | { | |
98 | // ////////////// // |
|
75 | // ////////////// // | |
99 | // Test structure // |
|
76 | // Test structure // | |
100 | // ////////////// // |
|
77 | // ////////////// // | |
101 |
|
78 | |||
102 | QTest::addColumn<QString>("dataFilename"); // File containing expected data of acquisitions |
|
79 | QTest::addColumn<SqpRange>("referenceRange"); // Range for generating reference series | |
103 | QTest::addColumn<SqpRange>("initialRange"); // First acquisition |
|
80 | QTest::addColumn<SqpRange>("initialRange"); // First acquisition | |
|
81 | QTest::addColumn<int>("operationDelay"); // Acquisitions to make | |||
104 | QTest::addColumn<std::vector<SqpRange> >("operations"); // Acquisitions to make |
|
82 | QTest::addColumn<std::vector<SqpRange> >("operations"); // Acquisitions to make | |
105 |
|
83 | |||
106 | // ////////// // |
|
84 | // ////////// // | |
107 | // Test cases // |
|
85 | // Test cases // | |
108 | // ////////// // |
|
86 | // ////////// // | |
109 |
|
87 | |||
110 | auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) { |
|
88 | auto dateTime = [](int year, int month, int day, int hours, int minutes, int seconds) { | |
111 | return DateUtils::secondsSinceEpoch( |
|
89 | return DateUtils::secondsSinceEpoch( | |
112 | QDateTime{{year, month, day}, {hours, minutes, seconds}, Qt::UTC}); |
|
90 | QDateTime{{year, month, day}, {hours, minutes, seconds}, Qt::UTC}); | |
113 | }; |
|
91 | }; | |
114 |
|
92 | |||
115 | QTest::newRow("cosinus") |
|
93 | QTest::newRow("cosinus") | |
116 | << "Cosinus_100Hz_20170101_1200_20170101_1300.txt" |
|
94 | << SqpRange{dateTime(2017, 1, 1, 12, 0, 0), dateTime(2017, 1, 1, 13, 0, 0)} | |
117 | << SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 1, 12, 35, 1)} |
|
95 | << SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 1, 12, 35, 1)} << 250 | |
118 | << std::vector<SqpRange>{ |
|
96 | << std::vector<SqpRange>{ | |
119 | // Pan (jump) left |
|
97 | // Pan (jump) left | |
120 | SqpRange{dateTime(2017, 1, 1, 12, 45, 0), dateTime(2017, 1, 1, 12, 50, 0)}, |
|
98 | SqpRange{dateTime(2017, 1, 1, 12, 45, 0), dateTime(2017, 1, 1, 12, 50, 0)}, | |
121 | // Pan (jump) right |
|
99 | // Pan (jump) right | |
122 | SqpRange{dateTime(2017, 1, 1, 12, 15, 0), dateTime(2017, 1, 1, 12, 20, 0)}, |
|
100 | SqpRange{dateTime(2017, 1, 1, 12, 15, 0), dateTime(2017, 1, 1, 12, 20, 0)}, | |
123 | // Pan (overlay) right |
|
101 | // Pan (overlay) right | |
124 | SqpRange{dateTime(2017, 1, 1, 12, 14, 0), dateTime(2017, 1, 1, 12, 19, 0)}, |
|
102 | SqpRange{dateTime(2017, 1, 1, 12, 14, 0), dateTime(2017, 1, 1, 12, 19, 0)}, | |
125 | // Pan (overlay) left |
|
103 | // Pan (overlay) left | |
126 | SqpRange{dateTime(2017, 1, 1, 12, 15, 0), dateTime(2017, 1, 1, 12, 20, 0)}, |
|
104 | SqpRange{dateTime(2017, 1, 1, 12, 15, 0), dateTime(2017, 1, 1, 12, 20, 0)}, | |
127 | // Pan (overlay) left |
|
105 | // Pan (overlay) left | |
128 | SqpRange{dateTime(2017, 1, 1, 12, 16, 0), dateTime(2017, 1, 1, 12, 21, 0)}, |
|
106 | SqpRange{dateTime(2017, 1, 1, 12, 16, 0), dateTime(2017, 1, 1, 12, 21, 0)}, | |
129 | // Zoom in |
|
107 | // Zoom in | |
130 | SqpRange{dateTime(2017, 1, 1, 12, 17, 30), dateTime(2017, 1, 1, 12, 19, 30)}, |
|
108 | SqpRange{dateTime(2017, 1, 1, 12, 17, 30), dateTime(2017, 1, 1, 12, 19, 30)}, | |
131 | // Zoom out |
|
109 | // Zoom out | |
132 | SqpRange{dateTime(2017, 1, 1, 12, 12, 30), dateTime(2017, 1, 1, 12, 24, 30)}}; |
|
110 | SqpRange{dateTime(2017, 1, 1, 12, 12, 30), dateTime(2017, 1, 1, 12, 24, 30)}}; | |
|
111 | ||||
|
112 | QTest::newRow("cosinus_big") | |||
|
113 | << SqpRange{dateTime(2017, 1, 1, 1, 0, 0), dateTime(2017, 1, 5, 13, 0, 0)} | |||
|
114 | << SqpRange{dateTime(2017, 1, 2, 6, 30, 0), dateTime(2017, 1, 2, 18, 30, 0)} << 5000 | |||
|
115 | << std::vector<SqpRange>{ | |||
|
116 | // Pan (jump) left | |||
|
117 | SqpRange{dateTime(2017, 1, 1, 13, 30, 0), dateTime(2017, 1, 1, 18, 30, 0)}, | |||
|
118 | // Pan (jump) right | |||
|
119 | SqpRange{dateTime(2017, 1, 3, 4, 30, 0), dateTime(2017, 1, 3, 10, 30, 0)}, | |||
|
120 | // Pan (overlay) right | |||
|
121 | SqpRange{dateTime(2017, 1, 3, 8, 30, 0), dateTime(2017, 1, 3, 12, 30, 0)}, | |||
|
122 | // Pan (overlay) left | |||
|
123 | SqpRange{dateTime(2017, 1, 2, 8, 30, 0), dateTime(2017, 1, 3, 10, 30, 0)}, | |||
|
124 | // Pan (overlay) left | |||
|
125 | SqpRange{dateTime(2017, 1, 1, 12, 30, 0), dateTime(2017, 1, 3, 5, 30, 0)}, | |||
|
126 | // Zoom in | |||
|
127 | SqpRange{dateTime(2017, 1, 2, 2, 30, 0), dateTime(2017, 1, 2, 8, 30, 0)}, | |||
|
128 | // Zoom out | |||
|
129 | SqpRange{dateTime(2017, 1, 1, 14, 30, 0), dateTime(2017, 1, 3, 12, 30, 0)}}; | |||
133 | } |
|
130 | } | |
134 |
|
131 | |||
135 | void TestCosinusAcquisition::testAcquisition() |
|
132 | void TestCosinusAcquisition::testAcquisition() | |
136 | { |
|
133 | { | |
137 |
// Retrieves |
|
134 | // Retrieves reference range | |
138 |
QFETCH( |
|
135 | QFETCH(SqpRange, referenceRange); | |
139 |
|
136 | CosinusProvider referenceProvider{}; | ||
140 | auto dataFilePath = QFileInfo{TESTS_RESOURCES_PATH, dataFilename}.absoluteFilePath(); |
|
137 | auto dataSeries = referenceProvider.provideDataSeries( | |
141 | QFile dataFile{dataFilePath}; |
|
138 | referenceRange, {{COSINUS_TYPE_KEY, "scalar"}, {COSINUS_FREQUENCY_KEY, 100.}}); | |
142 |
|
139 | |||
143 | if (dataFile.open(QFile::ReadOnly)) { |
|
140 | auto end = dataSeries->cend() - 1; | |
144 | // Generates data series to compare with |
|
141 | qInfo() << dataSeries->nbPoints() << dataSeries->cbegin()->x() << end->x(); | |
145 | QTextStream dataStream{&dataFile}; |
|
|||
146 | auto dataSeries = readDataStream(dataStream); |
|
|||
147 |
|
142 | |||
148 |
|
|
143 | /// Lambda used to validate a variable at each step | |
149 | auto validateVariable = [dataSeries](std::shared_ptr<Variable> variable, |
|
144 | auto validateVariable | |
150 | const SqpRange &range) { |
|
145 | = [dataSeries](std::shared_ptr<Variable> variable, const SqpRange &range) { | |
151 | // Checks that the variable's range has changed |
|
146 | // Checks that the variable's range has changed | |
152 | QCOMPARE(variable->range(), range); |
|
147 | QCOMPARE(variable->range(), range); | |
153 |
|
148 | |||
154 | // Checks the variable's data series |
|
149 | // Checks the variable's data series | |
155 | QVERIFY(checkDataSeries(variable->dataSeries(), variable->cacheRange(), dataSeries)); |
|
150 | QVERIFY(checkDataSeries(variable->dataSeries(), variable->cacheRange(), dataSeries)); | |
156 | }; |
|
151 | }; | |
157 |
|
152 | |||
158 |
|
|
153 | // Creates variable | |
159 |
|
|
154 | QFETCH(SqpRange, initialRange); | |
160 |
|
|
155 | sqpApp->timeController().onTimeToUpdate(initialRange); | |
161 |
|
|
156 | auto provider = std::make_shared<CosinusProvider>(); | |
162 |
|
|
157 | auto variable = sqpApp->variableController().createVariable( | |
163 |
|
|
158 | "MMS", {{COSINUS_TYPE_KEY, "scalar"}, {COSINUS_FREQUENCY_KEY, 100.}}, provider); | |
164 |
|
159 | |||
165 | QTest::qWait(OPERATION_DELAY); |
|
160 | QFETCH(int, operationDelay); | |
|
161 | QTest::qWait(operationDelay); | |||
166 |
|
|
162 | validateVariable(variable, initialRange); | |
167 |
|
163 | |||
168 |
|
|
164 | // Makes operations on the variable | |
169 |
|
|
165 | QFETCH(std::vector<SqpRange>, operations); | |
170 |
|
|
166 | for (const auto &operation : operations) { | |
171 |
|
|
167 | // Asks request on the variable and waits during its execution | |
172 |
|
|
168 | sqpApp->variableController().onRequestDataLoading({variable}, operation, variable->range(), | |
173 |
|
|
169 | true); | |
174 |
|
170 | |||
175 |
|
|
171 | QTest::qWait(operationDelay); | |
176 |
|
|
172 | validateVariable(variable, operation); | |
177 |
|
|
173 | } | |
|
174 | ||||
|
175 | ||||
|
176 | for (const auto &operation : operations) { | |||
|
177 | // Asks request on the variable and waits during its execution | |||
|
178 | sqpApp->variableController().onRequestDataLoading({variable}, operation, variable->range(), | |||
|
179 | true); | |||
178 | } |
|
180 | } | |
179 | else { |
|
181 | QTest::qWait(operationDelay); | |
180 | QFAIL("Can't read input data file"); |
|
182 | validateVariable(variable, operations.back()); | |
181 | } |
|
|||
182 | } |
|
183 | } | |
183 |
|
184 | |||
184 | int main(int argc, char *argv[]) |
|
185 | int main(int argc, char *argv[]) | |
185 | { |
|
186 | { | |
186 | SqpApplication app{argc, argv}; |
|
187 | SqpApplication app{argc, argv}; | |
187 | app.setAttribute(Qt::AA_Use96Dpi, true); |
|
188 | app.setAttribute(Qt::AA_Use96Dpi, true); | |
188 | TestCosinusAcquisition testObject{}; |
|
189 | TestCosinusAcquisition testObject{}; | |
189 | QTEST_SET_MAIN_SOURCE_PATH |
|
190 | QTEST_SET_MAIN_SOURCE_PATH | |
190 | return QTest::qExec(&testObject, argc, argv); |
|
191 | return QTest::qExec(&testObject, argc, argv); | |
191 | } |
|
192 | } | |
192 |
|
193 | |||
193 | #include "TestCosinusAcquisition.moc" |
|
194 | #include "TestCosinusAcquisition.moc" |
General Comments 0
You need to be logged in to leave comments.
Login now