GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r306:214febc149fd

app/src/MainWindow.cpp +5 0

             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
             #include <Variable/Variable.h>
+            #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             #include <QAction>
                 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> >();

core/include/Time/TimeController.h +4 -1

                 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;

core/include/Variable/Variable.h 0 -1

             signals:
                 void updated();
             private:
                 class VariablePrivate;
                 spimpl::unique_impl_ptr<VariablePrivate> impl;

core/include/Variable/VariableController.h +5 -1

             #include <Common/spimpl.h>
             class IDataProvider;
+            class QItemSelectionModel;
             class TimeController;
             class Variable;
             class VariableModel;
                 virtual ~VariableController();
                 VariableModel *variableModel() noexcept;
+                QItemSelectionModel *variableSelectionModel() noexcept;
                 void setTimeController(TimeController *timeController) noexcept;
                  */
                 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();

core/src/Time/TimeController.cpp +4 -1

             void TimeController::onTimeToUpdate(SqpDateTime dateTime)
             {
                 impl->m_DateTime = dateTime;
+            }
-                emit timeUpdated(dateTime);
+            void TimeController::onTimeNotify()
+            {
+                emit timeUpdated(impl->m_DateTime);
             }

core/src/Variable/VariableCacheController.cpp +3 -3

                                                      impl->m_VariableToSqpDateTimeListMap.at(variable), 0);
                         }
                         catch (const std::out_of_range &e) {
-                            qCInfo(LOG_VariableCacheController()) << e.what();
+                            qCWarning(LOG_VariableCacheController()) << e.what();
                         }
                     }
                 }
                                                 notInCache, 0, dateTime.m_TStart);
                 }
                 catch (const std::out_of_range &e) {
-                    qCInfo(LOG_VariableCacheController()) << e.what();
+                    qCWarning(LOG_VariableCacheController()) << e.what();
                 }
                 return notInCache;
                     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>{};
                 }
             }

core/src/Variable/VariableController.cpp +20 0

             #include <QDateTime>
             #include <QMutex>
             #include <QThread>
+            #include <QtCore/QItemSelectionModel>
             #include <unordered_map>
                 explicit VariableControllerPrivate(VariableController *parent)
                         : m_WorkingMutex{},
                           m_VariableModel{new VariableModel{parent}},
+                          m_VariableSelectionModel{new QItemSelectionModel{m_VariableModel, parent}},
                           m_VariableCacheController{std::make_unique<VariableCacheController>()}
                 {
                 }
                 QMutex m_WorkingMutex;
                 /// Variable model. The VariableController has the ownership
                 VariableModel *m_VariableModel;
+                QItemSelectionModel *m_VariableSelectionModel;
                 TimeController *m_TimeController{nullptr};
                 return impl->m_VariableModel;
             }
+            QItemSelectionModel *VariableController::variableSelectionModel() noexcept
+            {
+                return impl->m_VariableSelectionModel;
+            }
             void VariableController::setTimeController(TimeController *timeController) noexcept
             {
                 impl->m_TimeController = timeController;
                 }
             }
+            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)

gui/src/TimeWidget/TimeWidget.cpp +19 0

             #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;

gui/src/Variable/VariableInspectorWidget.cpp +4 -3

                 ui->setupUi(this);
                 // Sets model for table
-                auto sortFilterModel = new QSortFilterProxyModel{this};
+                //    auto sortFilterModel = new QSortFilterProxyModel{this};
-                sortFilterModel->setSourceModel(sqpApp->variableController().variableModel());
+                //    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();

gui/ui/TimeWidget/TimeWidget.ui +7 0

                  </property>
                 </widget>
                </item>
+               <item>
+                <widget class="QToolButton" name="applyToolButton">
+                 <property name="text">
+                  <string>...</string>
+                 </property>
+                </widget>
+               </item>
               </layout>
              </widget>
              <resources/>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages