From 9b9ad663ae27682f1bfdec325e9ded4f5879cf35 2017-06-08 09:33:02
From: leroux <aleroux@itlink.fr>
Date: 2017-06-08 09:33:02
Subject: [PATCH] Merge pull request #141 from SCIQLOP-Initialisation develop

 Develop

---

diff --git a/app/src/Main.cpp b/app/src/Main.cpp
index cb3a380..1533e01 100644
--- a/app/src/Main.cpp
+++ b/app/src/Main.cpp
@@ -25,6 +25,16 @@
 #include <SqpApplication.h>
 #include <qglobal.h>
 
+#include <Plugin/PluginManager.h>
+#include <QDir>
+
+namespace {
+
+/// Name of the directory containing the plugins
+const auto PLUGIN_DIRECTORY_NAME = QStringLiteral("plugins");
+
+} // namespace
+
 int main(int argc, char *argv[])
 {
     SqpApplication a{argc, argv};
@@ -34,5 +44,16 @@ int main(int argc, char *argv[])
     MainWindow w;
     w.show();
 
+    // Loads plugins
+    auto pluginDir = QDir{sqpApp->applicationDirPath()};
+    pluginDir.mkdir(PLUGIN_DIRECTORY_NAME);
+    pluginDir.cd(PLUGIN_DIRECTORY_NAME);
+
+    qCDebug(LOG_PluginManager())
+        << QObject::tr("Plugin directory: %1").arg(pluginDir.absolutePath());
+
+    PluginManager pluginManager{};
+    pluginManager.loadPlugins(pluginDir);
+
     return a.exec();
 }
diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index f0eab1a..a8a7605 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -21,6 +21,11 @@
 ----------------------------------------------------------------------------*/
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
+
+#include <DataSource/DataSourceController.h>
+#include <DataSource/DataSourceWidget.h>
+#include <SqpApplication.h>
+
 #include <QAction>
 #include <QDate>
 #include <QDateTime>
@@ -40,7 +45,7 @@
 #include <QAction>
 #include <QToolBar>
 #include <memory.h>
-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::MainWindow)
+MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow}
 {
     m_Ui->setupUi(this);
 
@@ -57,6 +62,11 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_Ui(new Ui::Main
     this->menuBar()->addAction("File");
     auto mainToolBar = this->addToolBar("MainToolBar");
     mainToolBar->addAction("A1");
+
+    // Widgets / controllers connections
+    connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
+            m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
+
     /*    QLopGUI::registerMenuBar(menuBar());
         this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
         this->m_progressWidget = new QWidget();
diff --git a/app/ui/MainWindow.ui b/app/ui/MainWindow.ui
index 7aab4f3..9fef44e 100644
--- a/app/ui/MainWindow.ui
+++ b/app/ui/MainWindow.ui
@@ -85,7 +85,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QWidget" name="dateSourceWidget" native="true"/>
+           <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/>
           </item>
           <item>
            <widget class="QWidget" name="dateTimeWidget" native="true"/>
@@ -193,13 +193,19 @@
   <customwidget>
    <class>VisualizationWidget</class>
    <extends>QWidget</extends>
-   <header location="global">visualization/VisualizationWidget.h</header>
+   <header location="global">Visualization/VisualizationWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>SqpSidePane</class>
    <extends>QWidget</extends>
-   <header location="global">sidepane/SqpSidePane.h</header>
+   <header location="global">SidePane/SqpSidePane.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>DataSourceWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">DataSource/DataSourceWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/core/include/DataSource/DataSourceController.h b/core/include/DataSource/DataSourceController.h
index ef886ab..6d3df61 100644
--- a/core/include/DataSource/DataSourceController.h
+++ b/core/include/DataSource/DataSourceController.h
@@ -49,7 +49,7 @@ public slots:
 
 signals:
     /// Signal emitted when a structure has been set for a data source
-    void dataSourceItemSet(const DataSourceItem &dataSourceItem);
+    void dataSourceItemSet(DataSourceItem *dataSourceItem);
 
 private:
     void waitForFinish();
diff --git a/core/include/DataSource/DataSourceItem.h b/core/include/DataSource/DataSourceItem.h
index 2f71ec6..193a495 100644
--- a/core/include/DataSource/DataSourceItem.h
+++ b/core/include/DataSource/DataSourceItem.h
@@ -7,6 +7,11 @@
 #include <QVector>
 
 /**
+ * Possible types of an item
+ */
+enum class DataSourceItemType { NODE, PRODUCT };
+
+/**
  * @brief The DataSourceItem class aims to represent a structure element of a data source.
  * A data source has a tree structure that is made up of a main DataSourceItem object (root)
  * containing other DataSourceItem objects (children).
@@ -14,7 +19,7 @@
  */
 class DataSourceItem {
 public:
-    explicit DataSourceItem(QVector<QVariant> data = {});
+    explicit DataSourceItem(DataSourceItemType type, QVector<QVariant> data = {});
 
     /**
      * Adds a child to the item. The item takes ownership of the child.
@@ -44,6 +49,8 @@ public:
      */
     DataSourceItem *parentItem() const noexcept;
 
+    DataSourceItemType type() const noexcept;
+
 private:
     class DataSourceItemPrivate;
     spimpl::unique_impl_ptr<DataSourceItemPrivate> impl;
diff --git a/core/src/DataSource/DataSourceController.cpp b/core/src/DataSource/DataSourceController.cpp
index f3def90..c8066c1 100644
--- a/core/src/DataSource/DataSourceController.cpp
+++ b/core/src/DataSource/DataSourceController.cpp
@@ -49,7 +49,7 @@ void DataSourceController::setDataSourceItem(
         // Retrieves the data source item to emit the signal with it
         auto it = impl->m_DataSourceItems.find(dataSourceUid);
         if (it != impl->m_DataSourceItems.end()) {
-            emit dataSourceItemSet(*it->second);
+            emit dataSourceItemSet(it->second.get());
         }
     }
     else {
diff --git a/core/src/DataSource/DataSourceItem.cpp b/core/src/DataSource/DataSourceItem.cpp
index 2d7e242..43c884b 100644
--- a/core/src/DataSource/DataSourceItem.cpp
+++ b/core/src/DataSource/DataSourceItem.cpp
@@ -3,18 +3,19 @@
 #include <QVector>
 
 struct DataSourceItem::DataSourceItemPrivate {
-    explicit DataSourceItemPrivate(QVector<QVariant> data)
-            : m_Parent{nullptr}, m_Children{}, m_Data{std::move(data)}
+    explicit DataSourceItemPrivate(DataSourceItemType type, QVector<QVariant> data)
+            : m_Parent{nullptr}, m_Children{}, m_Type{type}, m_Data{std::move(data)}
     {
     }
 
     DataSourceItem *m_Parent;
     std::vector<std::unique_ptr<DataSourceItem> > m_Children;
+    DataSourceItemType m_Type;
     QVector<QVariant> m_Data;
 };
 
-DataSourceItem::DataSourceItem(QVector<QVariant> data)
-        : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(data)}
+DataSourceItem::DataSourceItem(DataSourceItemType type, QVector<QVariant> data)
+        : impl{spimpl::make_unique_impl<DataSourceItemPrivate>(type, std::move(data))}
 {
 }
 
@@ -48,3 +49,8 @@ DataSourceItem *DataSourceItem::parentItem() const noexcept
 {
     return impl->m_Parent;
 }
+
+DataSourceItemType DataSourceItem::type() const noexcept
+{
+    return impl->m_Type;
+}
diff --git a/core/tests/DataSource/TestDataSourceController.cpp b/core/tests/DataSource/TestDataSourceController.cpp
index 03279dc..24429e2 100644
--- a/core/tests/DataSource/TestDataSourceController.cpp
+++ b/core/tests/DataSource/TestDataSourceController.cpp
@@ -26,12 +26,13 @@ void TestDataSourceController::testSetDataSourceItem()
     DataSourceController dataSourceController{};
 
     // Spy to test controllers' signals
-    QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(const DataSourceItem &))};
+    QSignalSpy signalSpy{&dataSourceController, SIGNAL(dataSourceItemSet(DataSourceItem *))};
 
     // Create a data source item
     auto source1Name = QStringLiteral("Source1");
     auto source1Values = QVector<QVariant>{source1Name};
-    auto source1Item = std::make_unique<DataSourceItem>(std::move(source1Values));
+    auto source1Item
+        = std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT, std::move(source1Values));
 
     // Add data source item to the controller and check that a signal has been emitted after setting
     // data source item in the controller
@@ -41,7 +42,8 @@ void TestDataSourceController::testSetDataSourceItem()
 
     // Try to a data source item with an unregistered uid and check that no signal has been emitted
     auto unregisteredUid = QUuid::createUuid();
-    dataSourceController.setDataSourceItem(unregisteredUid, std::make_unique<DataSourceItem>());
+    dataSourceController.setDataSourceItem(
+        unregisteredUid, std::make_unique<DataSourceItem>(DataSourceItemType::PRODUCT));
     QCOMPARE(signalSpy.count(), 1);
 }
 
diff --git a/core/vera-exclusions/exclusions.txt b/core/vera-exclusions/exclusions.txt
index 15b0dba..7b0007c 100644
--- a/core/vera-exclusions/exclusions.txt
+++ b/core/vera-exclusions/exclusions.txt
@@ -1,3 +1,6 @@
 # On ignore toutes les règles vera++ pour le fichier spimpl
 Common/spimpl\.h:\d+:.*
 
+# Ignore false positive relative to two class definitions in a same file
+DataSourceItem\.h:\d+:.*IPSIS_S01.*
+
diff --git a/formatting/vera-exclusions/exclusions.txt b/formatting/vera-exclusions/exclusions.txt
index 2b00cc6..18e7e8b 100644
--- a/formatting/vera-exclusions/exclusions.txt
+++ b/formatting/vera-exclusions/exclusions.txt
@@ -6,3 +6,7 @@
 # Ignore false positive relative to 'noexcept' keyword
 .*IPSIS_S04_VARIABLE.*found: noexcept
 .*IPSIS_S06.*found: noexcept
+
+# Ignore false positive relative to 'override' keyword
+.*IPSIS_S04_VARIABLE.*found: override
+.*IPSIS_S06.*found: override
diff --git a/gui/include/DataSource/DataSourceTreeWidgetItem.h b/gui/include/DataSource/DataSourceTreeWidgetItem.h
new file mode 100644
index 0000000..02b0122
--- /dev/null
+++ b/gui/include/DataSource/DataSourceTreeWidgetItem.h
@@ -0,0 +1,32 @@
+#ifndef SCIQLOP_DATASOURCETREEWIDGETITEM_H
+#define SCIQLOP_DATASOURCETREEWIDGETITEM_H
+
+#include <Common/spimpl.h>
+
+#include <QLoggingCategory>
+#include <QTreeWidgetItem>
+
+Q_DECLARE_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem)
+
+class DataSourceItem;
+
+/**
+ * @brief The DataSourceTreeWidgetItem is the graphical representation of a data source item. It is
+ * intended to be displayed in a QTreeWidget.
+ * @sa DataSourceItem
+ */
+class DataSourceTreeWidgetItem : public QTreeWidgetItem {
+public:
+    explicit DataSourceTreeWidgetItem(const DataSourceItem *data, int type = Type);
+    explicit DataSourceTreeWidgetItem(QTreeWidget *parent, const DataSourceItem *data,
+                                      int type = Type);
+
+    virtual QVariant data(int column, int role) const override;
+    virtual void setData(int column, int role, const QVariant &value) override;
+
+private:
+    class DataSourceTreeWidgetItemPrivate;
+    spimpl::unique_impl_ptr<DataSourceTreeWidgetItemPrivate> impl;
+};
+
+#endif // SCIQLOP_DATASOURCETREEWIDGETITEM_H
diff --git a/gui/include/DataSource/DataSourceWidget.h b/gui/include/DataSource/DataSourceWidget.h
new file mode 100644
index 0000000..19d351f
--- /dev/null
+++ b/gui/include/DataSource/DataSourceWidget.h
@@ -0,0 +1,33 @@
+#ifndef SCIQLOP_DATASOURCEWIDGET_H
+#define SCIQLOP_DATASOURCEWIDGET_H
+
+#include <Common/spimpl.h>
+
+#include <QWidget>
+
+class DataSourceItem;
+
+/**
+ * @brief The DataSourceWidget handles the graphical representation (as a tree) of the data sources
+ * attached to SciQlop.
+ */
+class DataSourceWidget : public QWidget {
+    Q_OBJECT
+
+public:
+    explicit DataSourceWidget(QWidget *parent = 0);
+
+public slots:
+    /**
+     * Adds a data source. An item associated to the data source is created and then added to the
+     * representation tree
+     * @param dataSource the data source to add. The pointer has to be not null
+     */
+    void addDataSource(DataSourceItem *dataSource) noexcept;
+
+private:
+    class DataSourceWidgetPrivate;
+    spimpl::unique_impl_ptr<DataSourceWidgetPrivate> impl;
+};
+
+#endif // SCIQLOP_DATASOURCEWIDGET_H
diff --git a/gui/include/sidepane/SqpSidePane.h b/gui/include/SidePane/SqpSidePane.h
similarity index 100%
rename from gui/include/sidepane/SqpSidePane.h
rename to gui/include/SidePane/SqpSidePane.h
diff --git a/gui/include/visualization/VisualizationGraphWidget.h b/gui/include/Visualization/VisualizationGraphWidget.h
similarity index 100%
rename from gui/include/visualization/VisualizationGraphWidget.h
rename to gui/include/Visualization/VisualizationGraphWidget.h
diff --git a/gui/include/visualization/VisualizationTabWidget.h b/gui/include/Visualization/VisualizationTabWidget.h
similarity index 100%
rename from gui/include/visualization/VisualizationTabWidget.h
rename to gui/include/Visualization/VisualizationTabWidget.h
diff --git a/gui/include/visualization/VisualizationWidget.h b/gui/include/Visualization/VisualizationWidget.h
similarity index 93%
rename from gui/include/visualization/VisualizationWidget.h
rename to gui/include/Visualization/VisualizationWidget.h
index 645d5df..280783a 100644
--- a/gui/include/visualization/VisualizationWidget.h
+++ b/gui/include/Visualization/VisualizationWidget.h
@@ -1,8 +1,11 @@
 #ifndef SCIQLOP_VISUALIZATIONWIDGET_H
 #define SCIQLOP_VISUALIZATIONWIDGET_H
 
+#include <QLoggingCategory>
 #include <QWidget>
 
+Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationWidget)
+
 namespace Ui {
 class VisualizationWidget;
 } // namespace Ui
diff --git a/gui/include/visualization/VisualizationZoneWidget.h b/gui/include/Visualization/VisualizationZoneWidget.h
similarity index 100%
rename from gui/include/visualization/VisualizationZoneWidget.h
rename to gui/include/Visualization/VisualizationZoneWidget.h
diff --git a/gui/include/visualization/qcustomplot.h b/gui/include/Visualization/qcustomplot.h
similarity index 100%
rename from gui/include/visualization/qcustomplot.h
rename to gui/include/Visualization/qcustomplot.h
diff --git a/gui/src/DataSource/DataSourceTreeWidgetItem.cpp b/gui/src/DataSource/DataSourceTreeWidgetItem.cpp
new file mode 100644
index 0000000..236f0b4
--- /dev/null
+++ b/gui/src/DataSource/DataSourceTreeWidgetItem.cpp
@@ -0,0 +1,75 @@
+#include <DataSource/DataSourceItem.h>
+#include <DataSource/DataSourceTreeWidgetItem.h>
+
+#include <SqpApplication.h>
+
+Q_LOGGING_CATEGORY(LOG_DataSourceTreeWidgetItem, "DataSourceTreeWidgetItem")
+
+namespace {
+
+QIcon itemIcon(const DataSourceItem *dataSource)
+{
+    if (dataSource) {
+        auto dataSourceType = dataSource->type();
+        switch (dataSourceType) {
+            case DataSourceItemType::NODE:
+                return sqpApp->style()->standardIcon(QStyle::SP_DirIcon);
+            case DataSourceItemType::PRODUCT:
+                return sqpApp->style()->standardIcon(QStyle::SP_FileIcon);
+            default:
+                // No action
+                break;
+        }
+
+        qCWarning(LOG_DataSourceTreeWidgetItem())
+            << QObject::tr("Can't set data source icon : unknown data source type");
+    }
+    else {
+        qCWarning(LOG_DataSourceTreeWidgetItem())
+            << QObject::tr("Can't set data source icon : the data source is null");
+    }
+
+    // Default cases
+    return QIcon{};
+}
+
+} // namespace
+
+struct DataSourceTreeWidgetItem::DataSourceTreeWidgetItemPrivate {
+    explicit DataSourceTreeWidgetItemPrivate(const DataSourceItem *data) : m_Data{data} {}
+
+    /// Model used to retrieve data source information
+    const DataSourceItem *m_Data;
+};
+
+DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(const DataSourceItem *data, int type)
+        : DataSourceTreeWidgetItem{nullptr, data, type}
+{
+}
+
+DataSourceTreeWidgetItem::DataSourceTreeWidgetItem(QTreeWidget *parent, const DataSourceItem *data,
+                                                   int type)
+        : QTreeWidgetItem{parent, type},
+          impl{spimpl::make_unique_impl<DataSourceTreeWidgetItemPrivate>(data)}
+{
+    // Sets the icon depending on the data source
+    setIcon(0, itemIcon(impl->m_Data));
+}
+
+QVariant DataSourceTreeWidgetItem::data(int column, int role) const
+{
+    if (role == Qt::DisplayRole) {
+        return (impl->m_Data) ? impl->m_Data->data(column) : QVariant{};
+    }
+    else {
+        return QTreeWidgetItem::data(column, role);
+    }
+}
+
+void DataSourceTreeWidgetItem::setData(int column, int role, const QVariant &value)
+{
+    // Data can't be changed by edition
+    if (role != Qt::EditRole) {
+        QTreeWidgetItem::setData(column, role, value);
+    }
+}
diff --git a/gui/src/DataSource/DataSourceWidget.cpp b/gui/src/DataSource/DataSourceWidget.cpp
new file mode 100644
index 0000000..79749aa
--- /dev/null
+++ b/gui/src/DataSource/DataSourceWidget.cpp
@@ -0,0 +1,63 @@
+#include <DataSource/DataSourceWidget.h>
+
+#include <ui_DataSourceWidget.h>
+
+#include <DataSource/DataSourceItem.h>
+#include <DataSource/DataSourceTreeWidgetItem.h>
+
+namespace {
+
+/// Number of columns displayed in the tree
+const auto TREE_NB_COLUMNS = 1;
+
+/// Header labels for the tree
+const auto TREE_HEADER_LABELS = QStringList{QObject::tr("Name")};
+
+/**
+ * Creates the item associated to a data source
+ * @param dataSource the data source for which to create the item
+ * @return the new item
+ */
+DataSourceTreeWidgetItem *createTreeWidgetItem(DataSourceItem *dataSource)
+{
+    // Creates item for the data source
+    auto item = new DataSourceTreeWidgetItem{dataSource};
+
+    // Generates items for the children of the data source
+    for (auto i = 0; i < dataSource->childCount(); ++i) {
+        item->addChild(createTreeWidgetItem(dataSource->child(i)));
+    }
+
+    return item;
+}
+
+} // namespace
+
+class DataSourceWidget::DataSourceWidgetPrivate {
+public:
+    explicit DataSourceWidgetPrivate(DataSourceWidget &widget)
+            : m_Ui{std::make_unique<Ui::DataSourceWidget>()}
+    {
+        m_Ui->setupUi(&widget);
+
+        // Set tree properties
+        m_Ui->treeWidget->setColumnCount(TREE_NB_COLUMNS);
+        m_Ui->treeWidget->setHeaderLabels(TREE_HEADER_LABELS);
+    }
+
+    std::unique_ptr<Ui::DataSourceWidget> m_Ui;
+};
+
+DataSourceWidget::DataSourceWidget(QWidget *parent)
+        : QWidget{parent}, impl{spimpl::make_unique_impl<DataSourceWidgetPrivate>(*this)}
+{
+}
+
+void DataSourceWidget::addDataSource(DataSourceItem *dataSource) noexcept
+{
+    // Creates the item associated to the source and adds it to the tree widget. The tree widget
+    // takes the ownership of the item
+    if (dataSource) {
+        impl->m_Ui->treeWidget->addTopLevelItem(createTreeWidgetItem(dataSource));
+    }
+}
diff --git a/gui/src/sidepane/SqpSidePane.cpp b/gui/src/SidePane/SqpSidePane.cpp
similarity index 92%
rename from gui/src/sidepane/SqpSidePane.cpp
rename to gui/src/SidePane/SqpSidePane.cpp
index 9214834..da69e6c 100644
--- a/gui/src/sidepane/SqpSidePane.cpp
+++ b/gui/src/SidePane/SqpSidePane.cpp
@@ -1,4 +1,4 @@
-#include "sidepane/SqpSidePane.h"
+#include "SidePane/SqpSidePane.h"
 #include "ui_SqpSidePane.h"
 
 #include <QAction>
@@ -22,7 +22,7 @@ static const QString SQPSIDEPANESTYLESHEET
       " }";
 }
 
-SqpSidePane::SqpSidePane(QWidget *parent) : QWidget(parent), ui(new Ui::SqpSidePane)
+SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
 {
     QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
     sidePaneLayout->setContentsMargins(0, 0, 0, 0);
diff --git a/gui/src/visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
similarity index 90%
rename from gui/src/visualization/VisualizationGraphWidget.cpp
rename to gui/src/Visualization/VisualizationGraphWidget.cpp
index 2b470af..275198e 100644
--- a/gui/src/visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -1,4 +1,4 @@
-#include "visualization/VisualizationGraphWidget.h"
+#include "Visualization/VisualizationGraphWidget.h"
 #include "ui_VisualizationGraphWidget.h"
 
 VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
diff --git a/gui/src/visualization/VisualizationTabWidget.cpp b/gui/src/Visualization/VisualizationTabWidget.cpp
similarity index 81%
rename from gui/src/visualization/VisualizationTabWidget.cpp
rename to gui/src/Visualization/VisualizationTabWidget.cpp
index ec83c62..7a3655a 100644
--- a/gui/src/visualization/VisualizationTabWidget.cpp
+++ b/gui/src/Visualization/VisualizationTabWidget.cpp
@@ -1,8 +1,8 @@
-#include "visualization/VisualizationTabWidget.h"
+#include "Visualization/VisualizationTabWidget.h"
 #include "ui_VisualizationTabWidget.h"
 
 VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)
-        : QWidget(parent), ui(new Ui::VisualizationTabWidget)
+        : QWidget{parent}, ui{new Ui::VisualizationTabWidget}
 {
     ui->setupUi(this);
 }
diff --git a/gui/src/Visualization/VisualizationWidget.cpp b/gui/src/Visualization/VisualizationWidget.cpp
new file mode 100644
index 0000000..14b8f90
--- /dev/null
+++ b/gui/src/Visualization/VisualizationWidget.cpp
@@ -0,0 +1,43 @@
+#include "Visualization/VisualizationWidget.h"
+#include "Visualization/VisualizationTabWidget.h"
+#include "ui_VisualizationWidget.h"
+
+#include <QDebug>
+#include <QToolButton>
+
+#include "iostream"
+
+Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
+
+VisualizationWidget::VisualizationWidget(QWidget *parent)
+        : QWidget{parent}, ui{new Ui::VisualizationWidget}
+{
+    ui->setupUi(this);
+
+    auto addTabViewButton = new QToolButton{ui->tabWidget};
+    addTabViewButton->setText(tr("Add View"));
+    addTabViewButton->setCursor(Qt::ArrowCursor);
+    addTabViewButton->setAutoRaise(true);
+    ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);
+
+    auto addTabView = [&](bool checked) {
+        auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
+                                           QString("View %1").arg(ui->tabWidget->count() + 1));
+        qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
+    };
+
+    auto removeTabView = [&](int index) {
+        ui->tabWidget->removeTab(index);
+        qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index);
+    };
+
+    ui->tabWidget->setTabsClosable(true);
+
+    connect(addTabViewButton, &QToolButton::clicked, addTabView);
+    connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
+}
+
+VisualizationWidget::~VisualizationWidget()
+{
+    delete ui;
+}
diff --git a/gui/src/visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
similarity index 81%
rename from gui/src/visualization/VisualizationZoneWidget.cpp
rename to gui/src/Visualization/VisualizationZoneWidget.cpp
index 2d213c9..ea7a0fb 100644
--- a/gui/src/visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -1,8 +1,8 @@
-#include "visualization/VisualizationZoneWidget.h"
+#include "Visualization/VisualizationZoneWidget.h"
 #include "ui_VisualizationZoneWidget.h"
 
 VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
-        : QWidget(parent), ui(new Ui::VisualizationZoneWidget)
+        : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
 {
     ui->setupUi(this);
 }
diff --git a/gui/src/visualization/qcustomplot.cpp b/gui/src/Visualization/qcustomplot.cpp
similarity index 100%
rename from gui/src/visualization/qcustomplot.cpp
rename to gui/src/Visualization/qcustomplot.cpp
index 457a019..809e1f3 100644
--- a/gui/src/visualization/qcustomplot.cpp
+++ b/gui/src/Visualization/qcustomplot.cpp
@@ -23,7 +23,7 @@
 **          Version: 2.0.0-beta                                           **
 ****************************************************************************/
 
-#include "visualization/qcustomplot.h"
+#include "Visualization/qcustomplot.h"
 
 
 /* including file 'src/vector2d.cpp', size 7340                              */
diff --git a/gui/src/visualization/VisualizationWidget.cpp b/gui/src/visualization/VisualizationWidget.cpp
deleted file mode 100644
index ccea179..0000000
--- a/gui/src/visualization/VisualizationWidget.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "visualization/VisualizationWidget.h"
-#include "ui_VisualizationWidget.h"
-
-VisualizationWidget::VisualizationWidget(QWidget *parent)
-        : QWidget(parent), ui(new Ui::VisualizationWidget)
-{
-    ui->setupUi(this);
-}
-
-VisualizationWidget::~VisualizationWidget()
-{
-    delete ui;
-}
diff --git a/gui/ui/DataSource/DataSourceWidget.ui b/gui/ui/DataSource/DataSourceWidget.ui
new file mode 100644
index 0000000..a7cf875
--- /dev/null
+++ b/gui/ui/DataSource/DataSourceWidget.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DataSourceWidget</class>
+ <widget class="QWidget" name="DataSourceWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Data sources</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QTreeWidget" name="treeWidget"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/gui/ui/visualization/VisualizationWidget.ui b/gui/ui/visualization/VisualizationWidget.ui
index 182401d..6e84bbb 100644
--- a/gui/ui/visualization/VisualizationWidget.ui
+++ b/gui/ui/visualization/VisualizationWidget.ui
@@ -19,20 +19,23 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="firstView">
+     <widget class="VisualizationTabWidget" name="firstView">
       <attribute name="title">
        <string>View 1</string>
       </attribute>
      </widget>
-     <widget class="QWidget" name="secondView">
-      <attribute name="title">
-       <string>+</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/vera-exclusions/exclusions.txt b/gui/vera-exclusions/exclusions.txt
index 21506de..0bcc8be 100644
--- a/gui/vera-exclusions/exclusions.txt
+++ b/gui/vera-exclusions/exclusions.txt
@@ -1,8 +1,11 @@
-# Ignore false positive relative to App macro
 \.h:\d+:.IPSIS_S04.*found: ui
 qcustomplot\.h:\d+:.IPSIS
 qcustomplot\.cpp:\d+:.IPSIS
+
+# Ignore false positive relative to App macro
 SqpApplication\.h:\d+:.IPSIS_S03.*found: sqpApp
 SqpApplication\.h:\d+:.IPSIS_S04_VARIABLE.*found: sqpApp
 
+# Ignore false positive relative to unnamed namespace
+DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.*