From 3fc54ca0e4e07f274a84f75b47fdeadc0d9a80db 2018-08-16 19:57:42
From: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Date: 2018-08-16 19:57:42
Subject: [PATCH] (•̀ᴗ•́)و ̑̑ Some cleaning, remover previous implementation of VariableController
and related classes

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

---

diff --git a/app/src/MainWindow.cpp b/app/src/MainWindow.cpp
index f603c6a..c3dee91 100644
--- a/app/src/MainWindow.cpp
+++ b/app/src/MainWindow.cpp
@@ -33,7 +33,6 @@
 #include <Time/TimeController.h>
 #include <TimeWidget/TimeWidget.h>
 #include <Variable/Variable.h>
-#include <Variable/VariableController.h>
 #include <Visualization/VisualizationController.h>
 
 #include <QAction>
diff --git a/core b/core
index 5f4f956..de55e7b 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 5f4f9560990ba00394322fa1d06d4a30feaf7075
+Subproject commit de55e7be90966d1efbd34a10df9a3231c50e245b
diff --git a/gui/src/Catalogue/CatalogueEventsWidget.cpp b/gui/src/Catalogue/CatalogueEventsWidget.cpp
index e8d770e..635f471 100644
--- a/gui/src/Catalogue/CatalogueEventsWidget.cpp
+++ b/gui/src/Catalogue/CatalogueEventsWidget.cpp
@@ -11,7 +11,6 @@
 #include <DataSource/DataSourceItem.h>
 #include <SqpApplication.h>
 #include <Variable/Variable.h>
-#include <Variable/VariableController.h>
 #include <Variable/VariableController2.h>
 #include <Visualization/VisualizationGraphWidget.h>
 #include <Visualization/VisualizationTabWidget.h>
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 38ead16..9332642 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -9,10 +9,8 @@
 #include <QThread>
 #include <Time/TimeController.h>
 #include <Variable/Variable.h>
-#include <Variable/VariableController.h>
 #include <Variable/VariableController2.h>
 #include <Variable/VariableModel2.h>
-#include <Variable/VariableModel.h>
 #include <Visualization/VisualizationController.h>
 
 Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication")
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index 05fb972..a73b784 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -22,7 +22,7 @@
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 #include <Variable/Variable.h>
-#include <Variable/VariableController.h>
+#include <Variable/VariableController2.h>
 
 #include <unordered_map>
 
diff --git a/plugins/amda/tests/FuzzingOperations.cpp b/plugins/amda/tests/FuzzingOperations.cpp
index e279afa..3f257ff 100644
--- a/plugins/amda/tests/FuzzingOperations.cpp
+++ b/plugins/amda/tests/FuzzingOperations.cpp
@@ -4,7 +4,7 @@
 #include <Data/IDataProvider.h>
 
 #include <Variable/Variable.h>
-#include <Variable/VariableController.h>
+#include <Variable/VariableController2.h>
 
 #include <QUuid>
 
@@ -22,7 +22,7 @@ struct CreateOperation : public IFuzzingOperation {
     }
 
     void execute(VariableId variableId, FuzzingState &fuzzingState,
-                 VariableController &variableController,
+                 VariableController2 &variableController,
                  const Properties &properties) const override
     {
         // Retrieves metadata pool from properties, and choose one of the metadata entries to
@@ -56,7 +56,7 @@ struct DeleteOperation : public IFuzzingOperation {
     }
 
     void execute(VariableId variableId, FuzzingState &fuzzingState,
-                 VariableController &variableController, const Properties &) const override
+                 VariableController2 &variableController, const Properties &) const override
     {
         auto &variableState = fuzzingState.variableState(variableId);
 
@@ -112,7 +112,7 @@ struct MoveOperation : public IFuzzingOperation {
     }
 
     void execute(VariableId variableId, FuzzingState &fuzzingState,
-                 VariableController &variableController,
+                 VariableController2 &variableController,
                  const Properties &properties) const override
     {
         auto &variableState = fuzzingState.variableState(variableId);
@@ -142,7 +142,7 @@ struct MoveOperation : public IFuzzingOperation {
         qCInfo(LOG_FuzzingOperations()).noquote() << "Performing" << m_Label << "on"
                                                   << variable->name() << "(from" << variableRange
                                                   << "to" << newVariableRange << ")...";
-        variableController.onRequestDataLoading({variable}, newVariableRange, isSynchronized);
+        variableController.changeRange({variable}, newVariableRange);
 
         // Updates state
         fuzzingState.updateRanges(variableId, newVariableRange);
@@ -163,7 +163,7 @@ struct SynchronizeOperation : public IFuzzingOperation {
     }
 
     void execute(VariableId variableId, FuzzingState &fuzzingState,
-                 VariableController &variableController, const Properties &) const override
+                 VariableController2 &variableController, const Properties &) const override
     {
         auto &variableState = fuzzingState.variableState(variableId);
 
@@ -172,13 +172,12 @@ struct SynchronizeOperation : public IFuzzingOperation {
         qCInfo(LOG_FuzzingOperations()).noquote() << "Adding" << variableState.m_Variable->name()
                                                   << "into synchronization group" << syncGroupId
                                                   << "...";
-        variableController.onAddSynchronized(variableState.m_Variable, syncGroupId);
+        //variableController.onAddSynchronized(variableState.m_Variable, syncGroupId);
 
         // Updates state
         fuzzingState.synchronizeVariable(variableId, syncGroupId);
 
-        variableController.onRequestDataLoading({variableState.m_Variable}, variableState.m_Range,
-                                                false);
+        variableController.changeRange({variableState.m_Variable}, variableState.m_Range);
     }
 };
 
@@ -190,7 +189,7 @@ struct DesynchronizeOperation : public IFuzzingOperation {
     }
 
     void execute(VariableId variableId, FuzzingState &fuzzingState,
-                 VariableController &variableController, const Properties &) const override
+                 VariableController2 &variableController, const Properties &) const override
     {
         auto &variableState = fuzzingState.variableState(variableId);
 
@@ -200,7 +199,7 @@ struct DesynchronizeOperation : public IFuzzingOperation {
         qCInfo(LOG_FuzzingOperations()).noquote() << "Removing" << variableState.m_Variable->name()
                                                   << "from synchronization group" << syncGroupId
                                                   << "...";
-        variableController.desynchronize(variableState.m_Variable, syncGroupId);
+        //variableController.desynchronize(variableState.m_Variable, syncGroupId);
 
         // Updates state
         fuzzingState.desynchronizeVariable(variableId, syncGroupId);
@@ -210,7 +209,7 @@ struct DesynchronizeOperation : public IFuzzingOperation {
 struct UnknownOperation : public IFuzzingOperation {
     bool canExecute(VariableId, const FuzzingState &) const override { return false; }
 
-    void execute(VariableId, FuzzingState &, VariableController &,
+    void execute(VariableId, FuzzingState &, VariableController2 &,
                  const Properties &) const override
     {
     }
diff --git a/plugins/amda/tests/FuzzingOperations.h b/plugins/amda/tests/FuzzingOperations.h
index 98a0a63..ff3f0e8 100644
--- a/plugins/amda/tests/FuzzingOperations.h
+++ b/plugins/amda/tests/FuzzingOperations.h
@@ -8,6 +8,7 @@
 
 #include <QLoggingCategory>
 #include <QMetaType>
+#include <Variable/VariableController2.h>
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_FuzzingOperations)
 
@@ -43,7 +44,7 @@ struct IFuzzingOperation {
     /// @remarks fuzzingState is passed as a reference because, according to the operation, it can
     /// be modified (in/out parameter)
     virtual void execute(VariableId variableId, FuzzingState &fuzzingState,
-                         VariableController &variableController,
+                         VariableController2 &variableController,
                          const Properties &properties = {}) const = 0;
 };