From 435054a2a67ec4ece36d864de843a4db0c159f17 2017-06-20 12:18:31
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-06-20 12:18:31
Subject: [PATCH] Merge branch 'feature/TimeWidgetInUse' into develop
---

diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index 3dcbf5e..2e6506b 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -26,6 +26,7 @@
 #include <DataSource/DataSourceWidget.h>
 #include <SidePane/SqpSidePane.h>
 #include <SqpApplication.h>
+#include <Time/TimeController.h>
 #include <TimeWidget/TimeWidget.h>
 #include <Variable/Variable.h>
 #include <Visualization/VisualizationController.h>
@@ -168,12 +169,20 @@ MainWindow::MainWindow(QWidget *parent)
     this->menuBar()->addAction(tr("File"));
     auto mainToolBar = this->addToolBar(QStringLiteral("MainToolBar"));
 
-    mainToolBar->addWidget(new TimeWidget{});
+    auto timeWidget = new TimeWidget{};
+    mainToolBar->addWidget(timeWidget);
 
     // Widgets / controllers connections
+
+    // DataSource
     connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
             m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
 
+    // Time
+    connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
+            SLOT(onTimeToUpdate(SqpDateTime)));
+
+    // Variable
     qRegisterMetaType<std::shared_ptr<Variable> >();
     connect(&sqpApp->visualizationController(), SIGNAL(variableCreated(std::shared_ptr<Variable>)),
             m_Ui->view, SLOT(displayVariable(std::shared_ptr<Variable>)));
diff --git a/core/include/Data/DataProviderParameters.h b/core/include/Data/DataProviderParameters.h
index 496f171..07df203 100644
--- a/core/include/Data/DataProviderParameters.h
+++ b/core/include/Data/DataProviderParameters.h
@@ -1,16 +1,15 @@
 #ifndef SCIQLOP_DATAPROVIDERPARAMETERS_H
 #define SCIQLOP_DATAPROVIDERPARAMETERS_H
 
+#include "SqpDateTime.h"
+
 /**
  * @brief The DataProviderParameters struct holds the information needed to retrieve data from a
  * data provider
  * @sa IDataProvider
  */
 struct DataProviderParameters {
-    /// Start time
-    double m_TStart;
-    /// End time
-    double m_TEnd;
+    SqpDateTime m_Time;
 };
 
 #endif // SCIQLOP_DATAPROVIDERPARAMETERS_H
diff --git a/core/include/Data/SqpDateTime.h b/core/include/Data/SqpDateTime.h
new file mode 100644
index 0000000..34f9aa3
--- /dev/null
+++ b/core/include/Data/SqpDateTime.h
@@ -0,0 +1,15 @@
+#ifndef SCIQLOP_SQPDATETIME_H
+#define SCIQLOP_SQPDATETIME_H
+
+/**
+ * @brief The SqpDateTime struct holds the information of time parameters
+ * @sa SqpDateTime
+ */
+struct SqpDateTime {
+    /// Start time
+    double m_TStart;
+    /// End time
+    double m_TEnd;
+};
+
+#endif // SCIQLOP_SQPDATETIME_H
diff --git a/core/include/Time/TimeController.h b/core/include/Time/TimeController.h
new file mode 100644
index 0000000..ecb82d2
--- /dev/null
+++ b/core/include/Time/TimeController.h
@@ -0,0 +1,37 @@
+#ifndef SCIQLOP_TIMECONTROLLER_H
+#define SCIQLOP_TIMECONTROLLER_H
+
+#include <Data/SqpDateTime.h>
+
+#include <QLoggingCategory>
+#include <QObject>
+
+#include <Common/spimpl.h>
+
+
+Q_DECLARE_LOGGING_CATEGORY(LOG_TimeController)
+
+/**
+ * @brief The TimeController class aims to handle the Time parameters notification in SciQlop.
+ */
+class TimeController : public QObject {
+    Q_OBJECT
+public:
+    explicit TimeController(QObject *parent = 0);
+
+    SqpDateTime dateTime() const noexcept;
+
+signals:
+    /// Signal emitted to notify that time parameters has beed updated
+    void timeUpdated(SqpDateTime time);
+
+public slots:
+    /// Slot called when a new dateTime has been defined. Call timeUpdated signal
+    void onTimeToUpdate(SqpDateTime dateTime);
+
+private:
+    class TimeControllerPrivate;
+    spimpl::unique_impl_ptr<TimeControllerPrivate> impl;
+};
+
+#endif // SCIQLOP_TIMECONTROLLER_H
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/Time/TimeController.cpp b/core/src/Time/TimeController.cpp
new file mode 100644
index 0000000..92b2e13
--- /dev/null
+++ b/core/src/Time/TimeController.cpp
@@ -0,0 +1,26 @@
+#include "Time/TimeController.h"
+
+Q_LOGGING_CATEGORY(LOG_TimeController, "TimeController")
+
+struct TimeController::TimeControllerPrivate {
+
+    SqpDateTime m_DateTime;
+};
+
+TimeController::TimeController(QObject *parent)
+        : QObject{parent}, impl{spimpl::make_unique_impl<TimeControllerPrivate>()}
+{
+    qCDebug(LOG_TimeController()) << tr("TimeController construction");
+}
+
+SqpDateTime TimeController::dateTime() const noexcept
+{
+    return impl->m_DateTime;
+}
+
+void TimeController::onTimeToUpdate(SqpDateTime dateTime)
+{
+    impl->m_DateTime = dateTime;
+
+    emit timeUpdated(dateTime);
+}
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/include/TimeWidget/TimeWidget.h b/gui/include/TimeWidget/TimeWidget.h
index 014bea1..de7ee69 100644
--- a/gui/include/TimeWidget/TimeWidget.h
+++ b/gui/include/TimeWidget/TimeWidget.h
@@ -3,6 +3,8 @@
 
 #include <QWidget>
 
+#include <Data/SqpDateTime.h>
+
 namespace Ui {
 class TimeWidget;
 } // Ui
@@ -14,6 +16,15 @@ public:
     explicit TimeWidget(QWidget *parent = 0);
     virtual ~TimeWidget();
 
+signals:
+    /// Signal emitted when the time parameters has beed updated
+    void timeUpdated(SqpDateTime time);
+
+public slots:
+    /// slot called when time parameters update has ben requested
+    void onTimeUpdateRequested();
+
+
 private:
     Ui::TimeWidget *ui;
 };
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;
diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index 69cdd16..3e21cb5 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -1,12 +1,29 @@
 #include "TimeWidget/TimeWidget.h"
 #include "ui_TimeWidget.h"
 
+
 TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
 {
     ui->setupUi(this);
+
+    // Connection
+    connect(ui->startDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
+            &TimeWidget::onTimeUpdateRequested);
+
+    connect(ui->endDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
+            &TimeWidget::onTimeUpdateRequested);
 }
 
 TimeWidget::~TimeWidget()
 {
     delete ui;
 }
+
+void TimeWidget::onTimeUpdateRequested()
+{
+    auto dateTime = SqpDateTime{
+        static_cast<double>(ui->startDateTimeEdit->dateTime().toMSecsSinceEpoch() / 1000.),
+        static_cast<double>(ui->endDateTimeEdit->dateTime().toMSecsSinceEpoch()) / 1000.};
+
+    emit timeUpdated(std::move(dateTime));
+}
diff --git a/plugins/mockplugin/src/CosinusProvider.cpp b/plugins/mockplugin/src/CosinusProvider.cpp
index 24cc69a..44e159c 100644
--- a/plugins/mockplugin/src/CosinusProvider.cpp
+++ b/plugins/mockplugin/src/CosinusProvider.cpp
@@ -8,9 +8,11 @@
 std::unique_ptr<IDataSeries>
 CosinusProvider::retrieveData(const DataProviderParameters &parameters) const
 {
+    auto dateTime = parameters.m_Time;
+
     // Gets the timerange from the parameters
-    auto start = parameters.m_TStart;
-    auto end = parameters.m_TEnd;
+    auto start = dateTime.m_TStart;
+    auto end = dateTime.m_TEnd;
 
     // We assure that timerange is valid
     if (end < start) {