From 214febc149fdd041cd11abf2ca8502e20c325e95 2017-06-30 14:12:44
From: mperrinel <mperrinel@itlink.fr>
Date: 2017-06-30 14:12:44
Subject: [PATCH] Merge branch 'feature/ApplyOnTimeWidget' into develop
---

diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index 1c1c4ca..d89ff54 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -29,6 +29,7 @@
 #include <Time/TimeController.h>
 #include <TimeWidget/TimeWidget.h>
 #include <Variable/Variable.h>
+#include <Variable/VariableController.h>
 #include <Visualization/VisualizationController.h>
 
 #include <QAction>
@@ -182,6 +183,10 @@ MainWindow::MainWindow(QWidget *parent)
     connect(timeWidget, SIGNAL(timeUpdated(SqpDateTime)), &sqpApp->timeController(),
             SLOT(onTimeToUpdate(SqpDateTime)));
 
+    qRegisterMetaType<SqpDateTime>();
+    connect(&sqpApp->timeController(), SIGNAL(timeUpdated(SqpDateTime)),
+            &sqpApp->variableController(), SLOT(onDateTimeOnSelection(SqpDateTime)));
+
     // Widgets / widgets connections
     qRegisterMetaType<std::shared_ptr<Variable> >();
 
diff --git a/core/include/Time/TimeController.h b/core/include/Time/TimeController.h
index ecb82d2..fe94644 100644
--- a/core/include/Time/TimeController.h
+++ b/core/include/Time/TimeController.h
@@ -26,9 +26,12 @@ signals:
     void timeUpdated(SqpDateTime time);
 
 public slots:
-    /// Slot called when a new dateTime has been defined. Call timeUpdated signal
+    /// Slot called when a new dateTime has been defined.
     void onTimeToUpdate(SqpDateTime dateTime);
 
+    /// Slot called when the dateTime has to be notified. Call timeUpdated signal
+    void onTimeNotify();
+
 private:
     class TimeControllerPrivate;
     spimpl::unique_impl_ptr<TimeControllerPrivate> impl;
diff --git a/core/include/Variable/Variable.h b/core/include/Variable/Variable.h
index f654f78..21ea2e7 100644
--- a/core/include/Variable/Variable.h
+++ b/core/include/Variable/Variable.h
@@ -44,7 +44,6 @@ public slots:
 signals:
     void updated();
 
-
 private:
     class VariablePrivate;
     spimpl::unique_impl_ptr<VariablePrivate> impl;
diff --git a/core/include/Variable/VariableController.h b/core/include/Variable/VariableController.h
index 2da1749..02bc847 100644
--- a/core/include/Variable/VariableController.h
+++ b/core/include/Variable/VariableController.h
@@ -8,8 +8,8 @@
 
 #include <Common/spimpl.h>
 
-
 class IDataProvider;
+class QItemSelectionModel;
 class TimeController;
 class Variable;
 class VariableModel;
@@ -26,6 +26,7 @@ public:
     virtual ~VariableController();
 
     VariableModel *variableModel() noexcept;
+    QItemSelectionModel *variableSelectionModel() noexcept;
 
     void setTimeController(TimeController *timeController) noexcept;
 
@@ -44,6 +45,9 @@ public slots:
      */
     void createVariable(const QString &name, std::shared_ptr<IDataProvider> provider) noexcept;
 
+    /// Update the temporal parameters of every selected variable to dateTime
+    void onDateTimeOnSelection(const SqpDateTime &dateTime);
+
     void initialize();
     void finalize();
 
diff --git a/core/src/Time/TimeController.cpp b/core/src/Time/TimeController.cpp
index 92b2e13..4e564c6 100644
--- a/core/src/Time/TimeController.cpp
+++ b/core/src/Time/TimeController.cpp
@@ -21,6 +21,9 @@ SqpDateTime TimeController::dateTime() const noexcept
 void TimeController::onTimeToUpdate(SqpDateTime dateTime)
 {
     impl->m_DateTime = dateTime;
+}
 
-    emit timeUpdated(dateTime);
+void TimeController::onTimeNotify()
+{
+    emit timeUpdated(impl->m_DateTime);
 }
diff --git a/core/src/Variable/VariableCacheController.cpp b/core/src/Variable/VariableCacheController.cpp
index 8c22487..b5cbd3b 100644
--- a/core/src/Variable/VariableCacheController.cpp
+++ b/core/src/Variable/VariableCacheController.cpp
@@ -55,7 +55,7 @@ void VariableCacheController::addDateTime(std::shared_ptr<Variable> variable,
                                          impl->m_VariableToSqpDateTimeListMap.at(variable), 0);
             }
             catch (const std::out_of_range &e) {
-                qCInfo(LOG_VariableCacheController()) << e.what();
+                qCWarning(LOG_VariableCacheController()) << e.what();
             }
         }
     }
@@ -77,7 +77,7 @@ VariableCacheController::provideNotInCacheDateTimeList(std::shared_ptr<Variable>
                                     notInCache, 0, dateTime.m_TStart);
     }
     catch (const std::out_of_range &e) {
-        qCInfo(LOG_VariableCacheController()) << e.what();
+        qCWarning(LOG_VariableCacheController()) << e.what();
     }
 
     return notInCache;
@@ -90,7 +90,7 @@ VariableCacheController::dateCacheList(std::shared_ptr<Variable> variable) const
         return impl->m_VariableToSqpDateTimeListMap.at(variable);
     }
     catch (const std::out_of_range &e) {
-        qCInfo(LOG_VariableCacheController()) << e.what();
+        qCWarning(LOG_VariableCacheController()) << e.what();
         return QVector<SqpDateTime>{};
     }
 }
diff --git a/core/src/Variable/VariableController.cpp b/core/src/Variable/VariableController.cpp
index 355cee0..b348b95 100644
--- a/core/src/Variable/VariableController.cpp
+++ b/core/src/Variable/VariableController.cpp
@@ -11,6 +11,7 @@
 #include <QDateTime>
 #include <QMutex>
 #include <QThread>
+#include <QtCore/QItemSelectionModel>
 
 #include <unordered_map>
 
@@ -34,6 +35,7 @@ struct VariableController::VariableControllerPrivate {
     explicit VariableControllerPrivate(VariableController *parent)
             : m_WorkingMutex{},
               m_VariableModel{new VariableModel{parent}},
+              m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
               m_VariableCacheController{std::make_unique<VariableCacheController>()}
     {
     }
@@ -41,6 +43,7 @@ struct VariableController::VariableControllerPrivate {
     QMutex m_WorkingMutex;
     /// Variable model. The VariableController has the ownership
     VariableModel *m_VariableModel;
+    QItemSelectionModel *m_VariableSelectionModel;
 
 
     TimeController *m_TimeController{nullptr};
@@ -69,6 +72,11 @@ VariableModel *VariableController::variableModel() noexcept
     return impl->m_VariableModel;
 }
 
+QItemSelectionModel *VariableController::variableSelectionModel() noexcept
+{
+    return impl->m_VariableSelectionModel;
+}
+
 void VariableController::setTimeController(TimeController *timeController) noexcept
 {
     impl->m_TimeController = timeController;
@@ -110,6 +118,18 @@ void VariableController::createVariable(const QString &name,
     }
 }
 
+void VariableController::onDateTimeOnSelection(const SqpDateTime &dateTime)
+{
+    auto selectedRows = impl->m_VariableSelectionModel->selectedRows();
+
+    for (const auto &selectedRow : qAsConst(selectedRows)) {
+        if (auto selectedVariable = impl->m_VariableModel->variable(selectedRow.row())) {
+            selectedVariable->setDateTime(dateTime);
+            this->onRequestDataLoading(selectedVariable, dateTime);
+        }
+    }
+}
+
 
 void VariableController::onRequestDataLoading(std::shared_ptr<Variable> variable,
                                               const SqpDateTime &dateTime)
diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index 3e21cb5..e2a754d 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -1,19 +1,38 @@
 #include "TimeWidget/TimeWidget.h"
 #include "ui_TimeWidget.h"
 
+#include <SqpApplication.h>
+#include <Time/TimeController.h>
 
 TimeWidget::TimeWidget(QWidget *parent) : QWidget{parent}, ui{new Ui::TimeWidget}
 {
     ui->setupUi(this);
 
+    ui->applyToolButton->setIcon(sqpApp->style()->standardIcon(QStyle::SP_DialogApplyButton));
+
     // Connection
     connect(ui->startDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
             &TimeWidget::onTimeUpdateRequested);
 
     connect(ui->endDateTimeEdit, &QDateTimeEdit::dateTimeChanged, this,
             &TimeWidget::onTimeUpdateRequested);
+
+
+    connect(ui->applyToolButton, &QToolButton::clicked, &sqpApp->timeController(),
+            &TimeController::onTimeNotify);
+
+    // Initialisation
+    ui->startDateTimeEdit->setDateTime(
+        QDateTime::currentDateTime().addSecs(-3600)); // one hour berefore
+    ui->endDateTimeEdit->setDateTime(QDateTime::currentDateTime());
+
+    auto dateTime
+        = SqpDateTime{QDateTime::currentDateTime().addSecs(-3600).toMSecsSinceEpoch() / 1000.0,
+                      QDateTime::currentDateTime().toMSecsSinceEpoch() / 1000.0};
+    sqpApp->timeController().onTimeToUpdate(dateTime);
 }
 
+
 TimeWidget::~TimeWidget()
 {
     delete ui;
diff --git a/gui/src/Variable/VariableInspectorWidget.cpp b/gui/src/Variable/VariableInspectorWidget.cpp
index 14df440..d26beb4 100644
--- a/gui/src/Variable/VariableInspectorWidget.cpp
+++ b/gui/src/Variable/VariableInspectorWidget.cpp
@@ -18,10 +18,11 @@ VariableInspectorWidget::VariableInspectorWidget(QWidget *parent)
     ui->setupUi(this);
 
     // Sets model for table
-    auto sortFilterModel = new QSortFilterProxyModel{this};
-    sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
+    //    auto sortFilterModel = new QSortFilterProxyModel{this};
+    //    sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
 
-    ui->tableView->setModel(sortFilterModel);
+    ui->tableView->setModel(sqpApp->variableController().variableModel());
+    ui->tableView->setSelectionModel(sqpApp->variableController().variableSelectionModel());
 
     // Fixes column sizes
     auto model = ui->tableView->model();
diff --git a/gui/ui/TimeWidget/TimeWidget.ui b/gui/ui/TimeWidget/TimeWidget.ui
index 67cc2c2..d1f5ccb 100644
--- a/gui/ui/TimeWidget/TimeWidget.ui
+++ b/gui/ui/TimeWidget/TimeWidget.ui
@@ -78,6 +78,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QToolButton" name="applyToolButton">
+     <property name="text">
+      <string>...</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>