From 976817e9ad157bc705b9e14d4ec37db305dd2fd0 2017-08-28 08:07:57
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-08-28 08:07:57
Subject: [PATCH] Vera corrections

---

diff --git a/core/include/Variable/VariableAcquisitionWorker.h b/core/include/Variable/VariableAcquisitionWorker.h
index 4c76379..25f7f0b 100644
--- a/core/include/Variable/VariableAcquisitionWorker.h
+++ b/core/include/Variable/VariableAcquisitionWorker.h
@@ -48,14 +48,14 @@ public slots:
                                 SqpRange dataRangeAcquired);
     void onVariableRetrieveDataInProgress(QUuid acqIdentifier, double progress);
 
-private slots:
-    void onExecuteRequest(QUuid acqIdentifier);
-
 private:
     void waitForFinish();
 
     class VariableAcquisitionWorkerPrivate;
     spimpl::unique_impl_ptr<VariableAcquisitionWorkerPrivate> impl;
+
+private slots:
+    void onExecuteRequest(QUuid acqIdentifier);
 };
 
 #endif // SCIQLOP_VARIABLEACQUISITIONWORKER_H
diff --git a/core/src/Variable/VariableAcquisitionWorker.cpp b/core/src/Variable/VariableAcquisitionWorker.cpp
index 93aa9bb..f24a269 100644
--- a/core/src/Variable/VariableAcquisitionWorker.cpp
+++ b/core/src/Variable/VariableAcquisitionWorker.cpp
@@ -184,22 +184,6 @@ void VariableAcquisitionWorker::onVariableDataAcquired(QUuid acqIdentifier,
     impl->unlock();
 }
 
-void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
-{
-    qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
-    impl->lockRead();
-    auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
-    if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
-        auto request = it->second;
-        impl->unlock();
-        request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters);
-    }
-    else {
-        impl->unlock();
-        // TODO log no acqIdentifier recognized
-    }
-}
-
 void VariableAcquisitionWorker::initialize()
 {
     qCDebug(LOG_VariableAcquisitionWorker()) << tr("VariableAcquisitionWorker init")
@@ -236,3 +220,19 @@ void VariableAcquisitionWorker::VariableAcquisitionWorkerPrivate::removeVariable
     m_VIdentifierToCurrrentAcqIdNextIdPairMap.erase(vIdentifier);
     unlock();
 }
+
+void VariableAcquisitionWorker::onExecuteRequest(QUuid acqIdentifier)
+{
+    qCDebug(LOG_VariableAcquisitionWorker()) << tr("onExecuteRequest") << QThread::currentThread();
+    impl->lockRead();
+    auto it = impl->m_AcqIdentifierToAcqRequestMap.find(acqIdentifier);
+    if (it != impl->m_AcqIdentifierToAcqRequestMap.cend()) {
+        auto request = it->second;
+        impl->unlock();
+        request.m_Provider->requestDataLoading(acqIdentifier, request.m_DataProviderParameters);
+    }
+    else {
+        impl->unlock();
+        // TODO log no acqIdentifier recognized
+    }
+}
diff --git a/core/vera-exclusions/exclusions.txt b/core/vera-exclusions/exclusions.txt
index f1bd7ef..928edb5 100644
--- a/core/vera-exclusions/exclusions.txt
+++ b/core/vera-exclusions/exclusions.txt
@@ -2,6 +2,8 @@
 Common/spimpl\.h:\d+:.*
 
 # Ignore false positive relative to two class definitions in a same file
+ArrayData\.h:\d+:.*IPSIS_S01.*
+ArrayDataIterator\.h:\d+:.*IPSIS_S01.*
 DataSourceItem\.h:\d+:.*IPSIS_S01.*
 DataSeries\.h:\d+:.*IPSIS_S01.*
 DataSeriesIterator\.h:\d+:.*IPSIS_S01.*
@@ -16,34 +18,19 @@ DataSeries\.h:\d+:.*IPSIS_S04_VARIABLE.*
 DataSeries\.h:\d+:.*IPSIS_S04_NAMESPACE.*found: (dataseries_detail)
 
 # Ignore false positive relative to iterators
-ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag)
-ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (IteratorValue)
-ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t)
-ArrayData\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type)
-ArrayData\.h:\d+:.*IPSIS_S05.*
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (iterator_category)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (value_type)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (IteratorValue)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (difference_type)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (pointer)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (reference)
-ArrayData\.h:\d+:.*IPSIS_S06.*found: (value_type)
-DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag)
-DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (DataSeriesIteratorValue)
-DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t)
-DataSeriesIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type)
-DataSeriesIterator\.h:\d+:.*IPSIS_S05.*
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (DataSeriesIteratorValue)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (pointer)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (reference)
-DataSeriesIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
+SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (forward_iterator_tag)
+SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (T)
+SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (ptrdiff_t)
+SqpIterator\.h:\d+:.*IPSIS_S04_VARIABLE.*found: (value_type)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (iterator_category)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (forward_iterator_tag)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (T)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (difference_type)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (ptrdiff_t)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (pointer)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (reference)
+SqpIterator\.h:\d+:.*IPSIS_S06.*found: (value_type)
 
 # Ignore false positive relative to an alias
 DataSourceItemAction\.h:\d+:.*IPSIS_S06.*found: (ExecuteFunction)
diff --git a/gui/include/Visualization/VisualizationZoneWidget.h b/gui/include/Visualization/VisualizationZoneWidget.h
index 1f5125f..6518706 100644
--- a/gui/include/Visualization/VisualizationZoneWidget.h
+++ b/gui/include/Visualization/VisualizationZoneWidget.h
@@ -42,15 +42,14 @@ public:
     bool contains(const Variable &variable) const override;
     QString name() const override;
 
-
-private slots:
-    void onVariableAdded(std::shared_ptr<Variable> variable);
-
 private:
     Ui::VisualizationZoneWidget *ui;
 
     class VisualizationZoneWidgetPrivate;
     spimpl::unique_impl_ptr<VisualizationZoneWidgetPrivate> impl;
+
+private slots:
+    void onVariableAdded(std::shared_ptr<Variable> variable);
 };
 
 #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H