HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1349:3fc54ca0e4e0

(•̀ᴗ•́)و ̑̑ Some cleaning, remover previous implementation of VariableController...

jeandet -

r1349:3fc54ca0e4e0

parent child

Context file:

r1349:3fc54ca0e4e0

app/src/MainWindow.cpp 0 -1

             #include <Time/TimeController.h>
             #include <TimeWidget/TimeWidget.h>
             #include <Variable/Variable.h>
-            #include <Variable/VariableController.h>
             #include <Visualization/VisualizationController.h>
             #include <QAction>

core +1 -1

	@@ -1,1 +1,1
	1	Subproject commit 5f4f9560990ba00394322fa1d06d4a30feaf7075		1	Subproject commit de55e7be90966d1efbd34a10df9a3231c50e245b

gui/src/Catalogue/CatalogueEventsWidget.cpp 0 -1

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

gui/src/SqpApplication.cpp 0 -2

             #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")

gui/src/Visualization/VisualizationGraphWidget.cpp +1 -1

             #include <SqpApplication.h>
             #include <Time/TimeController.h>
             #include <Variable/Variable.h>
-            #include <Variable/VariableController.h>
+            #include <Variable/VariableController2.h>
             #include <unordered_map>

plugins/amda/tests/FuzzingOperations.cpp +11 -12

             #include <Data/IDataProvider.h>
             #include <Variable/Variable.h>
-            #include <Variable/VariableController.h>
+            #include <Variable/VariableController2.h>
             #include <QUuid>
                 }
                 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
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
-                             VariableController &variableController, const Properties &) const override
+                             VariableController2 &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
-                             VariableController &variableController,
+                             VariableController2 &variableController,
                              const Properties &properties) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     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);
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
-                             VariableController &variableController, const Properties &) const override
+                             VariableController2 &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     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,
+                    variableController.changeRange({variableState.m_Variable}, variableState.m_Range);
-                                                            false);
                 }
             };
                 }
                 void execute(VariableId variableId, FuzzingState &fuzzingState,
-                             VariableController &variableController, const Properties &) const override
+                             VariableController2 &variableController, const Properties &) const override
                 {
                     auto &variableState = fuzzingState.variableState(variableId);
                     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);
             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
                 {
                 }

plugins/amda/tests/FuzzingOperations.h +2 -1

             #include <QLoggingCategory>
             #include <QMetaType>
+            #include <Variable/VariableController2.h>
             Q_DECLARE_LOGGING_CATEGORY(LOG_FuzzingOperations)
                 /// @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;
             };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	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