@@ -48,14 +48,14 public slots: | |||
|
48 | 48 | SqpRange dataRangeAcquired); |
|
49 | 49 | void onVariableRetrieveDataInProgress(QUuid acqIdentifier, double progress); |
|
50 | 50 | |
|
51 | private slots: | |
|
52 | void onExecuteRequest(QUuid acqIdentifier); | |
|
53 | ||
|
54 | 51 | private: |
|
55 | 52 | void waitForFinish(); |
|
56 | 53 | |
|
57 | 54 | class VariableAcquisitionWorkerPrivate; |
|
58 | 55 | spimpl::unique_impl_ptr<VariableAcquisitionWorkerPrivate> impl; |
|
56 | ||
|
57 | private slots: | |
|
58 | void onExecuteRequest(QUuid acqIdentifier); | |
|
59 | 59 | }; |
|
60 | 60 | |
|
61 | 61 | #endif // SCIQLOP_VARIABLEACQUISITIONWORKER_H |
@@ -184,22 +184,6 void VariableAcquisitionWorker::onVariableDataAcquired(QUuid acqIdentifier, | |||
|
184 | 184 | impl->unlock(); |
|
185 | 185 | } |
|
186 | 186 | |
|
187 | void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier) | |
|
188 | { | |
|
189 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread(); | |
|
190 | impl->lockRead(); | |
|
191 | auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier); | |
|
192 | if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) { | |
|
193 | auto request = it->second; | |
|
194 | impl->unlock(); | |
|
195 | request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters); | |
|
196 | } | |
|
197 | else { | |
|
198 | impl->unlock(); | |
|
199 | // TODO log no acqIdentifier recognized | |
|
200 | } | |
|
201 | } | |
|
202 | ||
|
203 | 187 | void VariableAcquisitionWorker::initialize() |
|
204 | 188 | { |
|
205 | 189 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("VariableAcquisitionWorker init") |
@@ -236,3 +220,19 void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeVariable | |||
|
236 | 220 | m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier); |
|
237 | 221 | unlock(); |
|
238 | 222 | } |
|
223 | ||
|
224 | void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier) | |
|
225 | { | |
|
226 | qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread(); | |
|
227 | impl->lockRead(); | |
|
228 | auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier); | |
|
229 | if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) { | |
|
230 | auto request = it->second; | |
|
231 | impl->unlock(); | |
|
232 | request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters); | |
|
233 | } | |
|
234 | else { | |
|
235 | impl->unlock(); | |
|
236 | // TODO log no acqIdentifier recognized | |
|
237 | } | |
|
238 | } |
@@ -2,6 +2,8 | |||
|
2 | 2 | Common/spimpl\.h:\d+:.* |
|
3 | 3 | |
|
4 | 4 | # Ignore false positive relative to two class definitions in a same file |
|
5 | ArrayData\.h:\d+:.*IPSIS_S01.* | |
|
6 | ArrayDataIterator\.h:\d+:.*IPSIS_S01.* | |
|
5 | 7 | DataSourceItem\.h:\d+:.*IPSIS_S01.* |
|
6 | 8 | DataSeries\.h:\d+:.*IPSIS_S01.* |
|
7 | 9 | DataSeriesIterator\.h:\d+:.*IPSIS_S01.* |
@@ -16,34 +18,19 DataSeries\.h:\d+:.*IPSIS_S04_VARIABLE.* | |||
|
16 | 18 | DataSeries\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (dataseries_detail) |
|
17 | 19 | |
|
18 | 20 | # Ignore false positive relative to iterators |
|
19 |
|
|
|
20 |
|
|
|
21 |
|
|
|
22 |
|
|
|
23 | ArrayData\.h:\d+:.*IPSIS_S05.* | |
|
24 |
|
|
|
25 |
|
|
|
26 |
|
|
|
27 |
|
|
|
28 |
|
|
|
29 |
|
|
|
30 |
|
|
|
31 |
|
|
|
32 | ArrayData\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
33 | DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag) | |
|
34 | DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (DataSeriesIteratorValue) | |
|
35 | DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t) | |
|
36 | DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type) | |
|
37 | DataSeriesIterator\.h:\d+:.*IPSIS_S05.* | |
|
38 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category) | |
|
39 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag) | |
|
40 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
41 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (DataSeriesIteratorValue) | |
|
42 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type) | |
|
43 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t) | |
|
44 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (pointer) | |
|
45 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (reference) | |
|
46 | DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
21 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag) | |
|
22 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (T) | |
|
23 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t) | |
|
24 | SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type) | |
|
25 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category) | |
|
26 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag) | |
|
27 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
28 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (T) | |
|
29 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type) | |
|
30 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t) | |
|
31 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (pointer) | |
|
32 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (reference) | |
|
33 | SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type) | |
|
47 | 34 | |
|
48 | 35 | # Ignore false positive relative to an alias |
|
49 | 36 | DataSourceItemAction\.h:\d+:.*IPSIS_S06.*found: (ExecuteFunction) |
@@ -42,15 +42,14 public: | |||
|
42 | 42 | bool contains(const Variable &variable) const override; |
|
43 | 43 | QString name() const override; |
|
44 | 44 | |
|
45 | ||
|
46 | private slots: | |
|
47 | void onVariableAdded(std::shared_ptr<Variable> variable); | |
|
48 | ||
|
49 | 45 | private: |
|
50 | 46 | Ui::VisualizationZoneWidget *ui; |
|
51 | 47 | |
|
52 | 48 | class VisualizationZoneWidgetPrivate; |
|
53 | 49 | spimpl::unique_impl_ptr<VisualizationZoneWidgetPrivate> impl; |
|
50 | ||
|
51 | private slots: | |
|
52 | void onVariableAdded(std::shared_ptr<Variable> variable); | |
|
54 | 53 | }; |
|
55 | 54 | |
|
56 | 55 | #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H |
General Comments 0
You need to be logged in to leave comments.
Login now