From eb6ce8cd853b72e6f2f5dfdc5980d0e7fb7acabc 2017-07-07 12:47:25
From: Alexandre Leroux <aleroux@itlink.fr>
Date: 2017-07-07 12:47:25
Subject: [PATCH] Merge branch 'develop' of https://hephaistos.lpp.polytechnique.fr/rhodecode/GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation into develop

---

diff --git a/core/include/Data/IDataProvider.h b/core/include/Data/IDataProvider.h
index 6f4b5b6..c627123 100644
--- a/core/include/Data/IDataProvider.h
+++ b/core/include/Data/IDataProvider.h
@@ -26,10 +26,6 @@ class IDataProvider : public QObject {
 public:
     virtual ~IDataProvider() noexcept = default;
 
-    virtual std::shared_ptr<IDataSeries>
-    retrieveData(const DataProviderParameters &parameters) const = 0;
-
-
     virtual void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) = 0;
 
 signals:
diff --git a/core/include/Network/NetworkController.h b/core/include/Network/NetworkController.h
new file mode 100644
index 0000000..0e36901
--- /dev/null
+++ b/core/include/Network/NetworkController.h
@@ -0,0 +1,30 @@
+#ifndef SCIQLOP_NETWORKCONTROLLER_H
+#define SCIQLOP_NETWORKCONTROLLER_H
+
+#include <QLoggingCategory>
+#include <QObject>
+
+#include <Common/spimpl.h>
+
+Q_DECLARE_LOGGING_CATEGORY(LOG_NetworkController)
+
+/**
+ * @brief The NetworkController class aims to handle all network connection of SciQlop.
+ */
+class NetworkController : public QObject {
+    Q_OBJECT
+public:
+    explicit NetworkController(QObject *parent = 0);
+
+
+    void initialize();
+    void finalize();
+
+private:
+    void waitForFinish();
+
+    class NetworkControllerPrivate;
+    spimpl::unique_impl_ptr<NetworkControllerPrivate> impl;
+};
+
+#endif // SCIQLOP_NETWORKCONTROLLER_H
diff --git a/core/src/Network/NetworkController.cpp b/core/src/Network/NetworkController.cpp
new file mode 100644
index 0000000..e015af4
--- /dev/null
+++ b/core/src/Network/NetworkController.cpp
@@ -0,0 +1,33 @@
+#include "Network/NetworkController.h"
+
+#include <QMutex>
+#include <QThread>
+
+Q_LOGGING_CATEGORY(LOG_NetworkController, "NetworkController")
+
+struct NetworkController::NetworkControllerPrivate {
+    explicit NetworkControllerPrivate(NetworkController *parent) : m_WorkingMutex{} {}
+    QMutex m_WorkingMutex;
+};
+
+NetworkController::NetworkController(QObject *parent)
+        : QObject(parent), impl{spimpl::make_unique_impl<NetworkControllerPrivate>(this)}
+{
+}
+
+void NetworkController::initialize()
+{
+    qCDebug(LOG_NetworkController()) << tr("NetworkController init") << QThread::currentThread();
+    impl->m_WorkingMutex.lock();
+    qCDebug(LOG_NetworkController()) << tr("NetworkController init END");
+}
+
+void NetworkController::finalize()
+{
+    impl->m_WorkingMutex.unlock();
+}
+
+void NetworkController::waitForFinish()
+{
+    QMutexLocker locker{&impl->m_WorkingMutex};
+}
diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp
index 0e58f7e..350c766 100644
--- a/core/src/Variable/VariableController.cpp
+++ b/core/src/Variable/VariableController.cpp
@@ -17,20 +17,6 @@
 
 Q_LOGGING_CATEGORY(LOG_VariableController, "VariableController")
 
-namespace {
-
-/// @todo Generates default dataseries, according to the provider passed in parameter. This method
-/// will be deleted when the timerange is recovered from SciQlop
-std::shared_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider,
-                                                       const SqpDateTime &dateTime) noexcept
-{
-    auto parameters = DataProviderParameters{dateTime};
-
-    return provider.retrieveData(parameters);
-}
-
-} // namespace
-
 struct VariableController::VariableControllerPrivate {
     explicit VariableControllerPrivate(VariableController *parent)
             : m_WorkingMutex{},
diff --git a/gui/include/SqpApplication.h b/gui/include/SqpApplication.h
index 87bc813..a23bd7f 100644
--- a/gui/include/SqpApplication.h
+++ b/gui/include/SqpApplication.h
@@ -16,6 +16,7 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_SqpApplication)
 #define sqpApp (static_cast<SqpApplication *>(QCoreApplication::instance()))
 
 class DataSourceController;
+class NetworkController;
 class TimeController;
 class VariableController;
 class VisualizationController;
@@ -38,6 +39,7 @@ public:
 
     /// Accessors for the differents sciqlop controllers
     DataSourceController &dataSourceController() noexcept;
+    NetworkController &networkController() noexcept;
     TimeController &timeController() noexcept;
     VariableController &variableController() noexcept;
     VisualizationController &visualizationController() noexcept;
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index c79f0f7..a50fa86 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -2,6 +2,7 @@
 
 #include <Data/IDataProvider.h>
 #include <DataSource/DataSourceController.h>
+#include <Network/NetworkController.h>
 #include <QThread>
 #include <Time/TimeController.h>
 #include <Variable/Variable.h>
@@ -14,18 +15,11 @@ class SqpApplication::SqpApplicationPrivate {
 public:
     SqpApplicationPrivate()
             : m_DataSourceController{std::make_unique<DataSourceController>()},
+              m_NetworkController{std::make_unique<NetworkController>()},
               m_TimeController{std::make_unique<TimeController>()},
               m_VariableController{std::make_unique<VariableController>()},
               m_VisualizationController{std::make_unique<VisualizationController>()}
     {
-        QThread::currentThread()->setObjectName("MainThread");
-        m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
-        m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
-        m_VariableController->moveToThread(&m_VariableControllerThread);
-        m_VariableControllerThread.setObjectName("VariableControllerThread");
-        m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
-        m_VisualizationControllerThread.setObjectName("VisualizationControllerThread");
-
         // /////////////////////////////// //
         // Connections between controllers //
         // /////////////////////////////// //
@@ -43,6 +37,12 @@ public:
                 SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)), Qt::DirectConnection);
 
 
+        m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
+        m_NetworkController->moveToThread(&m_NetworkControllerThread);
+        m_VariableController->moveToThread(&m_VariableControllerThread);
+        m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
+
+
         // Additionnal init
         m_VariableController->setTimeController(m_TimeController.get());
     }
@@ -53,6 +53,9 @@ public:
         m_DataSourceControllerThread.quit();
         m_DataSourceControllerThread.wait();
 
+        m_NetworkControllerThread.quit();
+        m_NetworkControllerThread.wait();
+
         m_VariableControllerThread.quit();
         m_VariableControllerThread.wait();
 
@@ -63,8 +66,10 @@ public:
     std::unique_ptr<DataSourceController> m_DataSourceController;
     std::unique_ptr<VariableController> m_VariableController;
     std::unique_ptr<TimeController> m_TimeController;
+    std::unique_ptr<NetworkController> m_NetworkController;
     std::unique_ptr<VisualizationController> m_VisualizationController;
     QThread m_DataSourceControllerThread;
+    QThread m_NetworkControllerThread;
     QThread m_VariableControllerThread;
     QThread m_VisualizationControllerThread;
 };
@@ -80,6 +85,11 @@ SqpApplication::SqpApplication(int &argc, char **argv)
     connect(&impl->m_DataSourceControllerThread, &QThread::finished,
             impl->m_DataSourceController.get(), &DataSourceController::finalize);
 
+    connect(&impl->m_NetworkControllerThread, &QThread::started, impl->m_NetworkController.get(),
+            &NetworkController::initialize);
+    connect(&impl->m_NetworkControllerThread, &QThread::finished, impl->m_NetworkController.get(),
+            &NetworkController::finalize);
+
     connect(&impl->m_VariableControllerThread, &QThread::started, impl->m_VariableController.get(),
             &VariableController::initialize);
     connect(&impl->m_VariableControllerThread, &QThread::finished, impl->m_VariableController.get(),
@@ -91,6 +101,7 @@ SqpApplication::SqpApplication(int &argc, char **argv)
             impl->m_VisualizationController.get(), &VisualizationController::finalize);
 
     impl->m_DataSourceControllerThread.start();
+    impl->m_NetworkControllerThread.start();
     impl->m_VariableControllerThread.start();
     impl->m_VisualizationControllerThread.start();
 }
@@ -108,6 +119,11 @@ DataSourceController &SqpApplication::dataSourceController() noexcept
     return *impl->m_DataSourceController;
 }
 
+NetworkController &SqpApplication::networkController() noexcept
+{
+    return *impl->m_NetworkController;
+}
+
 TimeController &SqpApplication::timeController() noexcept
 {
     return *impl->m_TimeController;
diff --git a/plugins/mockplugin/include/CosinusProvider.h b/plugins/mockplugin/include/CosinusProvider.h
index 7fbe76e..63c1fd2 100644
--- a/plugins/mockplugin/include/CosinusProvider.h
+++ b/plugins/mockplugin/include/CosinusProvider.h
@@ -14,14 +14,12 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_CosinusProvider)
  */
 class SCIQLOP_MOCKPLUGIN_EXPORT CosinusProvider : public IDataProvider {
 public:
-    /// @sa IDataProvider::retrieveData()
-    std::shared_ptr<IDataSeries>
-    retrieveData(const DataProviderParameters &parameters) const override;
-
     void requestDataLoading(const QVector<SqpDateTime> &dateTimeList) override;
 
 
 private:
+    /// @sa IDataProvider::retrieveData()
+    std::shared_ptr<IDataSeries> retrieveData(const DataProviderParameters &parameters) const;
     std::shared_ptr<IDataSeries> retrieveDataSeries(const SqpDateTime &dateTime);
 };