From d1ba435fd66a9d37568bbdcc74c4a736e3a4c326 2019-07-22 18:01:14
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2019-07-22 18:01:14
Subject: [PATCH] Removed useless Visualization CTRLR component

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

---

diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index 9772cc8..0c74276 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -32,7 +32,6 @@
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 #include <TimeWidget/TimeWidget.h>
-#include <Visualization/VisualizationController.h>
 
 #include "toolbar.h"
 
@@ -198,15 +197,6 @@ MainWindow::MainWindow(QWidget* parent)
     connect(mainToolBar, &ToolBar::timeUpdated, &sqpApp->timeController(),
         &TimeController::setDateTimeRange);
 
-    // Visualization
-    connect(&sqpApp->visualizationController(),
-        SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable2>)), m_Ui->view,
-        SLOT(onVariableAboutToBeDeleted(std::shared_ptr<Variable2>)));
-
-    connect(&sqpApp->visualizationController(),
-        SIGNAL(rangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)), m_Ui->view,
-        SLOT(onRangeChanged(std::shared_ptr<Variable2>, const DateTimeRange&)));
-
     // Widgets / widgets connections
 
     // For the following connections, we use DirectConnection to allow each widget that can
diff --git a/core b/core
index 521f954..64a22e9 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 521f9540ac01f61c92600a4aa6c8d3c148abc74a
+Subproject commit 64a22e9756a85346e7aef52d26bc5c50c4778d86
diff --git a/gui/include/SqpApplication.h b/gui/include/SqpApplication.h
index 4e2e9c6..ba5dc59 100644
--- a/gui/include/SqpApplication.h
+++ b/gui/include/SqpApplication.h
@@ -27,7 +27,6 @@ class TimeController;
 class VariableController;
 class VariableController2;
 class VariableModel2;
-class VisualizationController;
 class DragDropGuiController;
 class ActionsGuiController;
 class CatalogueController;
@@ -76,9 +75,6 @@ public:
     TimeController& timeController() noexcept;
     VariableController2& variableController() noexcept;
     std::shared_ptr<VariableController2> variableControllerOwner() noexcept;
-    //@TODO there should not be any global model it's just GUI impl detail
-    //    VariableModel2 &variableModel() noexcept;
-    VisualizationController& visualizationController() noexcept;
     CatalogueController& catalogueController() noexcept;
 
     /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index e3288ba..4b09291 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -10,7 +10,6 @@
 #include <Time/TimeController.h>
 #include <Variable/VariableController2.h>
 #include <Variable/VariableModel2.h>
-#include <Visualization/VisualizationController.h>
 
 Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
 
@@ -34,25 +33,11 @@ public:
                     variableProvider, sqpApp->timeController().dateTime());
             });
 
-        // VariableController <-> VisualizationController
-        //        connect(m_VariableController.get(),
-        //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
-        //                m_VisualizationController.get(),
-        //                SIGNAL(variableAboutToBeDeleted(std::shared_ptr<Variable>)),
-        //                Qt::DirectConnection);
-
-        //        connect(m_VariableController.get(),
-        //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)),
-        //                m_VisualizationController.get(),
-        //                SIGNAL(rangeChanged(std::shared_ptr<Variable>, const DateTimeRange &)));
-
 
         m_DataSourceController.moveToThread(&m_DataSourceControllerThread);
         m_DataSourceControllerThread.setObjectName("DataSourceControllerThread");
         m_NetworkController.moveToThread(&m_NetworkControllerThread);
         m_NetworkControllerThread.setObjectName("NetworkControllerThread");
-        m_VisualizationController.moveToThread(&m_VisualizationControllerThread);
-        m_VisualizationControllerThread.setObjectName("VsualizationControllerThread");
 
         // Additionnal init
         // m_VariableController->setTimeController(m_TimeController.get());
@@ -65,21 +50,16 @@ public:
 
         m_NetworkControllerThread.quit();
         m_NetworkControllerThread.wait();
-
-        m_VisualizationControllerThread.quit();
-        m_VisualizationControllerThread.wait();
     }
 
     DataSourceController m_DataSourceController;
     std::shared_ptr<VariableController2> m_VariableController;
     TimeController m_TimeController;
     NetworkController m_NetworkController;
-    VisualizationController m_VisualizationController;
     CatalogueController m_CatalogueController;
 
     QThread m_DataSourceControllerThread;
     QThread m_NetworkControllerThread;
-    QThread m_VisualizationControllerThread;
 
     DragDropGuiController m_DragDropGuiController;
     ActionsGuiController m_ActionsGuiController;
@@ -107,15 +87,8 @@ SqpApplication::SqpApplication(int& argc, char** argv)
     connect(&impl->m_NetworkControllerThread, &QThread::finished, &impl->m_NetworkController,
         &NetworkController::finalize);
 
-    connect(&impl->m_VisualizationControllerThread, &QThread::started,
-        &impl->m_VisualizationController, &VisualizationController::initialize);
-    connect(&impl->m_VisualizationControllerThread, &QThread::finished,
-        &impl->m_VisualizationController, &VisualizationController::finalize);
-
     impl->m_DataSourceControllerThread.start();
     impl->m_NetworkControllerThread.start();
-    impl->m_VisualizationControllerThread.start();
-    // impl->m_CatalogueController.initialize();
 }
 
 SqpApplication::~SqpApplication() {}
@@ -147,16 +120,6 @@ std::shared_ptr<VariableController2> SqpApplication::variableControllerOwner() n
     return impl->m_VariableController;
 }
 
-// VariableModel2 &SqpApplication::variableModel() noexcept
-//{
-//    return impl->m_VariableModel;
-//}
-
-VisualizationController& SqpApplication::visualizationController() noexcept
-{
-    return impl->m_VisualizationController;
-}
-
 CatalogueController& SqpApplication::catalogueController() noexcept
 {
     return impl->m_CatalogueController;