@@ -33,7 +33,6 | |||
|
33 | 33 | #include <Time/TimeController.h> |
|
34 | 34 | #include <TimeWidget/TimeWidget.h> |
|
35 | 35 | #include <Variable/Variable.h> |
|
36 | #include <Variable/VariableController.h> | |
|
37 | 36 | #include <Visualization/VisualizationController.h> |
|
38 | 37 | |
|
39 | 38 | #include <QAction> |
@@ -1,1 +1,1 | |||
|
1 | Subproject commit 5f4f9560990ba00394322fa1d06d4a30feaf7075 | |
|
1 | Subproject commit de55e7be90966d1efbd34a10df9a3231c50e245b |
@@ -11,7 +11,6 | |||
|
11 | 11 | #include <DataSource/DataSourceItem.h> |
|
12 | 12 | #include <SqpApplication.h> |
|
13 | 13 | #include <Variable/Variable.h> |
|
14 | #include <Variable/VariableController.h> | |
|
15 | 14 | #include <Variable/VariableController2.h> |
|
16 | 15 | #include <Visualization/VisualizationGraphWidget.h> |
|
17 | 16 | #include <Visualization/VisualizationTabWidget.h> |
@@ -9,10 +9,8 | |||
|
9 | 9 | #include <QThread> |
|
10 | 10 | #include <Time/TimeController.h> |
|
11 | 11 | #include <Variable/Variable.h> |
|
12 | #include <Variable/VariableController.h> | |
|
13 | 12 | #include <Variable/VariableController2.h> |
|
14 | 13 | #include <Variable/VariableModel2.h> |
|
15 | #include <Variable/VariableModel.h> | |
|
16 | 14 | #include <Visualization/VisualizationController.h> |
|
17 | 15 | |
|
18 | 16 | Q_LOGGING_CATEGORY(LOG_SqpApplication, "SqpApplication") |
@@ -22,7 +22,7 | |||
|
22 | 22 | #include <SqpApplication.h> |
|
23 | 23 | #include <Time/TimeController.h> |
|
24 | 24 | #include <Variable/Variable.h> |
|
25 | #include <Variable/VariableController.h> | |
|
25 | #include <Variable/VariableController2.h> | |
|
26 | 26 | |
|
27 | 27 | #include <unordered_map> |
|
28 | 28 |
@@ -4,7 +4,7 | |||
|
4 | 4 | #include <Data/IDataProvider.h> |
|
5 | 5 | |
|
6 | 6 | #include <Variable/Variable.h> |
|
7 | #include <Variable/VariableController.h> | |
|
7 | #include <Variable/VariableController2.h> | |
|
8 | 8 | |
|
9 | 9 | #include <QUuid> |
|
10 | 10 | |
@@ -22,7 +22,7 struct CreateOperation : public IFuzzingOperation { | |||
|
22 | 22 | } |
|
23 | 23 | |
|
24 | 24 | void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
25 | VariableController &variableController, | |
|
25 | VariableController2 &variableController, | |
|
26 | 26 | const Properties &properties) const override |
|
27 | 27 | { |
|
28 | 28 | // Retrieves metadata pool from properties, and choose one of the metadata entries to |
@@ -56,7 +56,7 struct DeleteOperation : public IFuzzingOperation { | |||
|
56 | 56 | } |
|
57 | 57 | |
|
58 | 58 | void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
59 | VariableController &variableController, const Properties &) const override | |
|
59 | VariableController2 &variableController, const Properties &) const override | |
|
60 | 60 | { |
|
61 | 61 | auto &variableState = fuzzingState.variableState(variableId); |
|
62 | 62 | |
@@ -112,7 +112,7 struct MoveOperation : public IFuzzingOperation { | |||
|
112 | 112 | } |
|
113 | 113 | |
|
114 | 114 | void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
115 | VariableController &variableController, | |
|
115 | VariableController2 &variableController, | |
|
116 | 116 | const Properties &properties) const override |
|
117 | 117 | { |
|
118 | 118 | auto &variableState = fuzzingState.variableState(variableId); |
@@ -142,7 +142,7 struct MoveOperation : public IFuzzingOperation { | |||
|
142 | 142 | qCInfo(LOG_FuzzingOperations()).noquote() << "Performing" << m_Label << "on" |
|
143 | 143 | << variable->name() << "(from" << variableRange |
|
144 | 144 | << "to" << newVariableRange << ")..."; |
|
145 |
variableController. |
|
|
145 | variableController.changeRange({variable}, newVariableRange); | |
|
146 | 146 | |
|
147 | 147 | // Updates state |
|
148 | 148 | fuzzingState.updateRanges(variableId, newVariableRange); |
@@ -163,7 +163,7 struct SynchronizeOperation : public IFuzzingOperation { | |||
|
163 | 163 | } |
|
164 | 164 | |
|
165 | 165 | void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
166 | VariableController &variableController, const Properties &) const override | |
|
166 | VariableController2 &variableController, const Properties &) const override | |
|
167 | 167 | { |
|
168 | 168 | auto &variableState = fuzzingState.variableState(variableId); |
|
169 | 169 | |
@@ -172,13 +172,12 struct SynchronizeOperation : public IFuzzingOperation { | |||
|
172 | 172 | qCInfo(LOG_FuzzingOperations()).noquote() << "Adding" << variableState.m_Variable->name() |
|
173 | 173 | << "into synchronization group" << syncGroupId |
|
174 | 174 | << "..."; |
|
175 | variableController.onAddSynchronized(variableState.m_Variable, syncGroupId); | |
|
175 | //variableController.onAddSynchronized(variableState.m_Variable, syncGroupId); | |
|
176 | 176 | |
|
177 | 177 | // Updates state |
|
178 | 178 | fuzzingState.synchronizeVariable(variableId, syncGroupId); |
|
179 | 179 | |
|
180 |
variableController. |
|
|
181 | false); | |
|
180 | variableController.changeRange({variableState.m_Variable}, variableState.m_Range); | |
|
182 | 181 | } |
|
183 | 182 | }; |
|
184 | 183 | |
@@ -190,7 +189,7 struct DesynchronizeOperation : public IFuzzingOperation { | |||
|
190 | 189 | } |
|
191 | 190 | |
|
192 | 191 | void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
193 | VariableController &variableController, const Properties &) const override | |
|
192 | VariableController2 &variableController, const Properties &) const override | |
|
194 | 193 | { |
|
195 | 194 | auto &variableState = fuzzingState.variableState(variableId); |
|
196 | 195 | |
@@ -200,7 +199,7 struct DesynchronizeOperation : public IFuzzingOperation { | |||
|
200 | 199 | qCInfo(LOG_FuzzingOperations()).noquote() << "Removing" << variableState.m_Variable->name() |
|
201 | 200 | << "from synchronization group" << syncGroupId |
|
202 | 201 | << "..."; |
|
203 | variableController.desynchronize(variableState.m_Variable, syncGroupId); | |
|
202 | //variableController.desynchronize(variableState.m_Variable, syncGroupId); | |
|
204 | 203 | |
|
205 | 204 | // Updates state |
|
206 | 205 | fuzzingState.desynchronizeVariable(variableId, syncGroupId); |
@@ -210,7 +209,7 struct DesynchronizeOperation : public IFuzzingOperation { | |||
|
210 | 209 | struct UnknownOperation : public IFuzzingOperation { |
|
211 | 210 | bool canExecute(VariableId, const FuzzingState &) const override { return false; } |
|
212 | 211 | |
|
213 | void execute(VariableId, FuzzingState &, VariableController &, | |
|
212 | void execute(VariableId, FuzzingState &, VariableController2 &, | |
|
214 | 213 | const Properties &) const override |
|
215 | 214 | { |
|
216 | 215 | } |
@@ -8,6 +8,7 | |||
|
8 | 8 | |
|
9 | 9 | #include <QLoggingCategory> |
|
10 | 10 | #include <QMetaType> |
|
11 | #include <Variable/VariableController2.h> | |
|
11 | 12 | |
|
12 | 13 | Q_DECLARE_LOGGING_CATEGORY(LOG_FuzzingOperations) |
|
13 | 14 | |
@@ -43,7 +44,7 struct IFuzzingOperation { | |||
|
43 | 44 | /// @remarks fuzzingState is passed as a reference because, according to the operation, it can |
|
44 | 45 | /// be modified (in/out parameter) |
|
45 | 46 | virtual void execute(VariableId variableId, FuzzingState &fuzzingState, |
|
46 | VariableController &variableController, | |
|
47 | VariableController2 &variableController, | |
|
47 | 48 | const Properties &properties = {}) const = 0; |
|
48 | 49 | }; |
|
49 | 50 |
General Comments 0
You need to be logged in to leave comments.
Login now