From 373baac343d64292778c04b22515e633fd5e3d72 2017-06-22 12:28:38
From: leroux <aleroux@itlink.fr>
Date: 2017-06-22 12:28:38
Subject: [PATCH] Merge pull request #156 from SCIQLOP-Initialisation develop

 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..a6d1aa4
--- /dev/null
+++ b/core/include/Data/SqpDateTime.h
@@ -0,0 +1,14 @@
+#ifndef SCIQLOP_SQPDATETIME_H
+#define SCIQLOP_SQPDATETIME_H
+
+/**
+ * @brief The SqpDateTime struct holds the information of time parameters
+ */
+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..ccd7a5c 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{nullptr};
 };
 
 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/include/Visualization/VisualizationGraphWidget.h b/gui/include/Visualization/VisualizationGraphWidget.h
index cee73b7..cd68182 100644
--- a/gui/include/Visualization/VisualizationGraphWidget.h
+++ b/gui/include/Visualization/VisualizationGraphWidget.h
@@ -19,7 +19,7 @@ class VisualizationGraphWidget : public QWidget, public IVisualizationWidget {
     Q_OBJECT
 
 public:
-    explicit VisualizationGraphWidget(QWidget *parent = 0);
+    explicit VisualizationGraphWidget(const QString &name = {}, QWidget *parent = 0);
     virtual ~VisualizationGraphWidget();
 
     void addVariable(std::shared_ptr<Variable> variable);
diff --git a/gui/include/Visualization/VisualizationTabWidget.h b/gui/include/Visualization/VisualizationTabWidget.h
index 8ba996e..e955860 100644
--- a/gui/include/Visualization/VisualizationTabWidget.h
+++ b/gui/include/Visualization/VisualizationTabWidget.h
@@ -3,8 +3,11 @@
 
 #include "Visualization/IVisualizationWidget.h"
 
+#include <Common/spimpl.h>
+
 #include <QWidget>
 
+class Variable;
 class VisualizationZoneWidget;
 
 namespace Ui {
@@ -15,14 +18,19 @@ class VisualizationTabWidget : public QWidget, public IVisualizationWidget {
     Q_OBJECT
 
 public:
-    explicit VisualizationTabWidget(QWidget *parent = 0);
+    explicit VisualizationTabWidget(const QString &name = {}, QWidget *parent = 0);
     virtual ~VisualizationTabWidget();
 
     /// Add a zone widget
     void addZone(VisualizationZoneWidget *zoneWidget);
 
-    /// Create a zone using a Variable
-    VisualizationZoneWidget *createZone();
+    /**
+     * Creates a zone using a variable. The variable will be displayed in a new graph of the new
+     * zone.
+     * @param variable the variable for which to create the zone
+     * @return the pointer to the created zone
+     */
+    VisualizationZoneWidget *createZone(std::shared_ptr<Variable> variable);
 
     /// Remove a zone
     void removeZone(VisualizationZoneWidget *zone);
@@ -34,6 +42,9 @@ public:
 
 private:
     Ui::VisualizationTabWidget *ui;
+
+    class VisualizationTabWidgetPrivate;
+    spimpl::unique_impl_ptr<VisualizationTabWidgetPrivate> impl;
 };
 
 #endif // SCIQLOP_VISUALIZATIONTABWIDGET_H
diff --git a/gui/include/Visualization/VisualizationZoneWidget.h b/gui/include/Visualization/VisualizationZoneWidget.h
index bdb08bf..82f5418 100644
--- a/gui/include/Visualization/VisualizationZoneWidget.h
+++ b/gui/include/Visualization/VisualizationZoneWidget.h
@@ -3,26 +3,31 @@
 
 #include "Visualization/IVisualizationWidget.h"
 
-class VisualizationGraphWidget;
-
 #include <QWidget>
 
 namespace Ui {
 class VisualizationZoneWidget;
 } // Ui
 
+class Variable;
+class VisualizationGraphWidget;
+
 class VisualizationZoneWidget : public QWidget, public IVisualizationWidget {
     Q_OBJECT
 
 public:
-    explicit VisualizationZoneWidget(QWidget *parent = 0);
+    explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0);
     virtual ~VisualizationZoneWidget();
 
     /// Add a graph widget
     void addGraph(VisualizationGraphWidget *graphWidget);
 
-    /// Create a graph using a Variable
-    VisualizationGraphWidget *createGraph();
+    /**
+     * Creates a graph using a variable. The variable will be displayed in the new graph.
+     * @param variable the variable for which to create the graph
+     * @return the pointer to the created graph
+     */
+    VisualizationGraphWidget *createGraph(std::shared_ptr<Variable> variable);
 
     /// Remove a graph
     void removeGraph(VisualizationGraphWidget *graph);
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/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index cfe0b03..f8133c1 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -22,13 +22,17 @@ struct VisualizationGraphWidget::VisualizationGraphWidgetPrivate {
     std::unordered_map<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMap;
 };
 
-VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
+VisualizationGraphWidget::VisualizationGraphWidget(const QString &name, QWidget *parent)
         : QWidget{parent},
           ui{new Ui::VisualizationGraphWidget},
           impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
 {
     ui->setupUi(this);
 
+    // qcpplot title
+    ui->widget->plotLayout()->insertRow(0);
+    ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
+
     // Set qcpplot properties :
     // - Drag (on x-axis) and zoom are enabled
     // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
@@ -65,7 +69,12 @@ void VisualizationGraphWidget::close()
 
 QString VisualizationGraphWidget::name() const
 {
-    return QStringLiteral("MainView");
+    if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
+        return title->text();
+    }
+    else {
+        return QString{};
+    }
 }
 
 void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept
diff --git a/gui/src/Visualization/VisualizationTabWidget.cpp b/gui/src/Visualization/VisualizationTabWidget.cpp
index 4061a08..ddc297d 100644
--- a/gui/src/Visualization/VisualizationTabWidget.cpp
+++ b/gui/src/Visualization/VisualizationTabWidget.cpp
@@ -3,9 +3,34 @@
 
 #include "Visualization/VisualizationZoneWidget.h"
 
+namespace {
 
-VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
-        : QWidget{parent}, ui{new Ui::VisualizationTabWidget}
+/// Generates a default name for a new zone, according to the number of zones already displayed in
+/// the tab
+QString defaultZoneName(const QLayout &layout)
+{
+    auto count = 0;
+    for (auto i = 0; i < layout.count(); ++i) {
+        if (dynamic_cast<VisualizationZoneWidget *>(layout.itemAt(i)->widget())) {
+            count++;
+        }
+    }
+
+    return QObject::tr("Zone %1").arg(count + 1);
+}
+
+} // namespace
+
+struct VisualizationTabWidget::VisualizationTabWidgetPrivate {
+    explicit VisualizationTabWidgetPrivate(const QString &name) : m_Name{name} {}
+
+    QString m_Name;
+};
+
+VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent)
+        : QWidget{parent},
+          ui{new Ui::VisualizationTabWidget},
+          impl{spimpl::make_unique_impl<VisualizationTabWidgetPrivate>(name)}
 {
     ui->setupUi(this);
 }
@@ -20,11 +45,14 @@ void VisualizationTabWidget::addZone(VisualizationZoneWidget *zoneWidget)
     this->layout()->addWidget(zoneWidget);
 }
 
-VisualizationZoneWidget *VisualizationTabWidget::createZone()
+VisualizationZoneWidget *VisualizationTabWidget::createZone(std::shared_ptr<Variable> variable)
 {
-    auto zoneWidget = new VisualizationZoneWidget{this};
+    auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*layout()), this};
     this->addZone(zoneWidget);
 
+    // Creates a new graph into the zone
+    zoneWidget->createGraph(variable);
+
     return zoneWidget;
 }
 
@@ -45,5 +73,5 @@ void VisualizationTabWidget::close()
 
 QString VisualizationTabWidget::name() const
 {
-    return QStringLiteral("MainView");
+    return impl->m_Name;
 }
diff --git a/gui/src/Visualization/VisualizationWidget.cpp b/gui/src/Visualization/VisualizationWidget.cpp
index 6011c5a..ecf4e06 100644
--- a/gui/src/Visualization/VisualizationWidget.cpp
+++ b/gui/src/Visualization/VisualizationWidget.cpp
@@ -32,8 +32,9 @@ VisualizationWidget::VisualizationWidget(QWidget *parent)
     };
 
     auto addTabView = [this, enableMinimumCornerWidgetSize]() {
-        auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
-                                           QString("View %1").arg(ui->tabWidget->count() + 1));
+        auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1),
+                                                 ui->tabWidget};
+        auto index = ui->tabWidget->addTab(widget, widget->name());
         if (ui->tabWidget->count() > 0) {
             enableMinimumCornerWidgetSize(false);
         }
@@ -54,6 +55,9 @@ VisualizationWidget::VisualizationWidget(QWidget *parent)
 
     connect(addTabViewButton, &QToolButton::clicked, addTabView);
     connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
+
+    // Adds default tab
+    addTabView();
 }
 
 VisualizationWidget::~VisualizationWidget()
@@ -96,16 +100,7 @@ QString VisualizationWidget::name() const
 void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept
 {
     if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) {
-        if (auto newZone = currentTab->createZone()) {
-            if (auto newGraph = newZone->createGraph()) {
-                newGraph->addVariable(variable);
-            }
-            else {
-                qCCritical(LOG_VisualizationWidget())
-                    << tr("Can't display the variable : can't create the graph");
-            }
-        }
-        else {
+        if (!currentTab->createZone(variable)) {
             qCCritical(LOG_VisualizationWidget())
                 << tr("Can't display the variable : can't create a new zone in the current tab");
         }
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index ba4aa14..a57c84e 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -3,10 +3,30 @@
 
 #include "Visualization/VisualizationGraphWidget.h"
 
-VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
+namespace {
+
+/// Generates a default name for a new graph, according to the number of graphs already displayed in
+/// the zone
+QString defaultGraphName(const QLayout &layout)
+{
+    auto count = 0;
+    for (auto i = 0; i < layout.count(); ++i) {
+        if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
+            count++;
+        }
+    }
+
+    return QObject::tr("Graph %1").arg(count + 1);
+}
+
+} // namespace
+
+VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
         : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
 {
     ui->setupUi(this);
+
+    ui->zoneNameLabel->setText(name);
 }
 
 VisualizationZoneWidget::~VisualizationZoneWidget()
@@ -19,11 +39,14 @@ void VisualizationZoneWidget::addGraph(VisualizationGraphWidget *graphWidget)
     ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
 }
 
-VisualizationGraphWidget *VisualizationZoneWidget::createGraph()
+VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
 {
-    auto graphWidget = new VisualizationGraphWidget{this};
+    auto graphWidget = new VisualizationGraphWidget{
+        defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
     this->addGraph(graphWidget);
 
+    graphWidget->addVariable(variable);
+
     return graphWidget;
 }
 
@@ -44,5 +67,5 @@ void VisualizationZoneWidget::close()
 
 QString VisualizationZoneWidget::name() const
 {
-    return QStringLiteral("MainView");
+    return ui->zoneNameLabel->text();
 }
diff --git a/gui/ui/Visualization/VisualizationWidget.ui b/gui/ui/Visualization/VisualizationWidget.ui
index 6e84bbb..1547c1e 100644
--- a/gui/ui/Visualization/VisualizationWidget.ui
+++ b/gui/ui/Visualization/VisualizationWidget.ui
@@ -17,25 +17,12 @@
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>-1</number>
      </property>
-     <widget class="VisualizationTabWidget" name="firstView">
-      <attribute name="title">
-       <string>View 1</string>
-      </attribute>
-     </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>VisualizationTabWidget</class>
-   <extends>QWidget</extends>
-   <header location="global">Visualization/VisualizationTabWidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/gui/ui/Visualization/VisualizationZoneWidget.ui b/gui/ui/Visualization/VisualizationZoneWidget.ui
index fc42eb5..1c2920e 100644
--- a/gui/ui/Visualization/VisualizationZoneWidget.ui
+++ b/gui/ui/Visualization/VisualizationZoneWidget.ui
@@ -14,23 +14,49 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="spacing">
-    <number>3</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
+   <item>
+    <widget class="QWidget" name="infobar" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="zoneNameLabel">
+        <property name="styleSheet">
+         <string notr="true">color: rgb(127, 127, 127);
+</string>
+        </property>
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QFrame" name="visualizationZoneFrame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="frameShape">
       <enum>QFrame::Box</enum>
      </property>
diff --git a/gui/vera-exclusions/exclusions.txt b/gui/vera-exclusions/exclusions.txt
index 0bcc8be..72b8768 100644
--- a/gui/vera-exclusions/exclusions.txt
+++ b/gui/vera-exclusions/exclusions.txt
@@ -8,4 +8,6 @@ SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
 
 # Ignore false positive relative to unnamed namespace
 DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.*
+VisualizationTabWidget\.cpp:\d+:.*IPSIS_F13.*
+VisualizationZoneWidget\.cpp:\d+:.*IPSIS_F13.*
 
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) {