From 3a849a66be09d9271b8d8857b1dd17f9f474f2bb 2017-06-20 12:16:12
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-06-20 12:16:12
Subject: [PATCH] Time widget is now used with the variable createion request
---

diff --git a/core/include/Variable/VariableController.h b/core/include/Variable/VariableController.h
index f7fdba5..0945b53 100644
--- a/core/include/Variable/VariableController.h
+++ b/core/include/Variable/VariableController.h
@@ -7,6 +7,7 @@
 #include <Common/spimpl.h>
 
 class IDataProvider;
+class TimeController;
 class Variable;
 class VariableModel;
 
@@ -23,6 +24,8 @@ public:
 
     VariableModel *variableModel() noexcept;
 
+    void setTimeController(TimeController *timeController) noexcept;
+
 signals:
     /// Signal emitted when a variable has been created
     void variableCreated(std::shared_ptr<Variable> variable);
diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp
index 7651e40..4ed7282 100644
--- a/core/src/Variable/VariableController.cpp
+++ b/core/src/Variable/VariableController.cpp
@@ -4,6 +4,7 @@
 #include <Data/DataProviderParameters.h>
 #include <Data/IDataProvider.h>
 #include <Data/IDataSeries.h>
+#include <Time/TimeController.h>
 
 #include <QDateTime>
 #include <QMutex>
@@ -15,14 +16,10 @@ 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::unique_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider) noexcept
+std::unique_ptr<IDataSeries> generateDefaultDataSeries(const IDataProvider &provider,
+                                                       const SqpDateTime &dateTime) noexcept
 {
-    auto parameters = DataProviderParameters{
-        // Remarks : we don't use toSecsSinceEpoch() here (method is for Qt 5.8 or above)
-        static_cast<double>(QDateTime{QDate{2017, 01, 01}, QTime{12, 00}}.toMSecsSinceEpoch()
-                            / 1000.),
-        static_cast<double>(QDateTime{QDate{2017, 01, 01}, QTime{12, 01}}.toMSecsSinceEpoch())
-            / 1000.};
+    auto parameters = DataProviderParameters{dateTime};
 
     return provider.retrieveData(parameters);
 }
@@ -38,6 +35,8 @@ struct VariableController::VariableControllerPrivate {
     QMutex m_WorkingMutex;
     /// Variable model. The VariableController has the ownership
     VariableModel *m_VariableModel;
+
+    TimeController *m_TimeController;
 };
 
 VariableController::VariableController(QObject *parent)
@@ -59,16 +58,36 @@ VariableModel *VariableController::variableModel() noexcept
     return impl->m_VariableModel;
 }
 
+void VariableController::setTimeController(TimeController *timeController) noexcept
+{
+    impl->m_TimeController = timeController;
+}
+
 void VariableController::createVariable(const QString &name,
                                         std::shared_ptr<IDataProvider> provider) noexcept
 {
+    // TORM
+    //    auto dateTime = SqpDateTime{
+    //        // Remarks : we don't use toSecsSinceEpoch() here (method is for Qt 5.8 or above)
+    //        static_cast<double>(QDateTime{QDate{2017, 01, 01}, QTime{12, 00}}.toMSecsSinceEpoch()
+    //                            / 1000.),
+    //        static_cast<double>(QDateTime{QDate{2017, 01, 01}, QTime{12, 01}}.toMSecsSinceEpoch())
+    //            / 1000.};
+
+    if (!impl->m_TimeController) {
+        qCCritical(LOG_VariableController())
+            << tr("Impossible to create variable: The time controller is null");
+        return;
+    }
+
+
     /// @todo : for the moment :
     /// - the provider is only used to retrieve data from the variable for its initialization, but
     /// it will be retained later
     /// - default data are generated for the variable, without taking into account the timerange set
     /// in sciqlop
-    if (auto newVariable
-        = impl->m_VariableModel->createVariable(name, generateDefaultDataSeries(*provider))) {
+    if (auto newVariable = impl->m_VariableModel->createVariable(
+            name, generateDefaultDataSeries(*provider, impl->m_TimeController->dateTime()))) {
         emit variableCreated(newVariable);
     }
 }
diff --git a/gui/include/SqpApplication.h b/gui/include/SqpApplication.h
index daa7440..87bc813 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 TimeController;
 class VariableController;
 class VisualizationController;
 
@@ -37,6 +38,7 @@ public:
 
     /// Accessors for the differents sciqlop controllers
     DataSourceController &dataSourceController() noexcept;
+    TimeController &timeController() noexcept;
     VariableController &variableController() noexcept;
     VisualizationController &visualizationController() noexcept;
 
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 5e46e93..4a57fa0 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -3,6 +3,7 @@
 #include <Data/IDataProvider.h>
 #include <DataSource/DataSourceController.h>
 #include <QThread>
+#include <Time/TimeController.h>
 #include <Variable/Variable.h>
 #include <Variable/VariableController.h>
 #include <Visualization/VisualizationController.h>
@@ -13,6 +14,7 @@ class SqpApplication::SqpApplicationPrivate {
 public:
     SqpApplicationPrivate()
             : m_DataSourceController{std::make_unique<DataSourceController>()},
+              m_TimeController{std::make_unique<TimeController>()},
               m_VariableController{std::make_unique<VariableController>()},
               m_VisualizationController{std::make_unique<VisualizationController>()}
     {
@@ -36,6 +38,9 @@ public:
         m_DataSourceController->moveToThread(&m_DataSourceControllerThread);
         m_VariableController->moveToThread(&m_VariableControllerThread);
         m_VisualizationController->moveToThread(&m_VisualizationControllerThread);
+
+        // Additionnal init
+        m_VariableController->setTimeController(m_TimeController.get());
     }
 
     virtual ~SqpApplicationPrivate()
@@ -53,6 +58,7 @@ public:
 
     std::unique_ptr<DataSourceController> m_DataSourceController;
     std::unique_ptr<VariableController> m_VariableController;
+    std::unique_ptr<TimeController> m_TimeController;
     std::unique_ptr<VisualizationController> m_VisualizationController;
     QThread m_DataSourceControllerThread;
     QThread m_VariableControllerThread;
@@ -98,6 +104,11 @@ DataSourceController &SqpApplication::dataSourceController() noexcept
     return *impl->m_DataSourceController;
 }
 
+TimeController &SqpApplication::timeController() noexcept
+{
+    return *impl->m_TimeController;
+}
+
 VariableController &SqpApplication::variableController() noexcept
 {
     return *impl->m_VariableController;