remove evaluator state interface

niknal357 · niknal357 · commit 3fe1390f8238 · 2025-08-17T22:23:06.000+02:00
diff --git a/src/backend/evaluator/evaluatorStateInterface.h b/src/backend/evaluator/evaluatorStateInterface.h
diff --git a/src/gui/viewPortManager/circuitView/circuitView.cpp b/src/gui/viewPortManager/circuitView/circuitView.cpp
@@ -16,15 +16,13 @@ void CircuitView::setBackend(Backend* backend) {
 		this->circuit = nullptr;
 		renderer->setEvaluator(nullptr);
 		renderer->setCircuit(nullptr);
-		evaluatorStateInterface = EvaluatorStateInterface();
 		toolManager.setCircuit(nullptr);
 	} else if (this->backend != backend) {
 		this->backend = backend;
 		this->evaluator = nullptr;
 		this->circuit = nullptr;
 		renderer->setEvaluator(nullptr);
 		renderer->setCircuit(nullptr);
-		evaluatorStateInterface = EvaluatorStateInterface();
 		toolManager.setCircuit(nullptr);
 	}
 }
@@ -39,7 +37,6 @@ void CircuitView::setEvaluator(Backend* backend, evaluator_id_t evaluatorId, con
 			this->circuit = nullptr;
 			renderer->setEvaluator(nullptr);
 			renderer->setCircuit(nullptr);
-			evaluatorStateInterface = EvaluatorStateInterface();
 			toolManager.setCircuit(nullptr);
 		}
 	} else {
@@ -59,7 +56,6 @@ void CircuitView::setEvaluator(Backend* backend, evaluator_id_t evaluatorId, con
 			renderer->setAddress(address);
 			renderer->setCircuit(circuit.get());
 
-			evaluatorStateInterface = EvaluatorStateInterface(evaluator.get());
 			toolManager.setCircuit(circuit.get());
 		}
 	}
@@ -75,7 +71,6 @@ void CircuitView::setEvaluator(Backend* backend, std::shared_ptr<Evaluator> eval
 			this->circuit = nullptr;
 			renderer->setEvaluator(nullptr);
 			renderer->setCircuit(nullptr);
-			evaluatorStateInterface = EvaluatorStateInterface();
 			toolManager.setCircuit(nullptr);
 		}
 	} else if (backend->getEvaluatorManager().getEvaluator(evaluator->getEvaluatorId()) != evaluator) {
@@ -94,7 +89,6 @@ void CircuitView::setEvaluator(Backend* backend, std::shared_ptr<Evaluator> eval
 		renderer->setAddress(address);
 		renderer->setCircuit(circuit.get());
 		
-		evaluatorStateInterface = EvaluatorStateInterface(evaluator.get());
 		toolManager.setCircuit(circuit.get());
 	}
 }
@@ -109,7 +103,6 @@ void CircuitView::setCircuit(Backend* backend, circuit_id_t circuitId) {
 			this->circuit = nullptr;
 			renderer->setEvaluator(nullptr);
 			renderer->setCircuit(nullptr);
-			evaluatorStateInterface = EvaluatorStateInterface();
 			toolManager.setCircuit(nullptr);
 		}
 	} else {
@@ -124,7 +117,6 @@ void CircuitView::setCircuit(Backend* backend, circuit_id_t circuitId) {
 			this->circuit = circuit;
 			renderer->setEvaluator(nullptr);
 			renderer->setCircuit(circuit.get());
-			evaluatorStateInterface = EvaluatorStateInterface();
 			toolManager.setCircuit(circuit.get());
 		}
 	}
@@ -140,7 +132,6 @@ void CircuitView::setCircuit(Backend* backend, SharedCircuit circuit) {
 			this->circuit = nullptr;
 			renderer->setEvaluator(nullptr);
 			renderer->setCircuit(nullptr);
-			evaluatorStateInterface = EvaluatorStateInterface();
 			toolManager.setCircuit(nullptr);
 		}
 	} else if (backend->getCircuit(circuit->getCircuitId()) != circuit) {
@@ -153,7 +144,6 @@ void CircuitView::setCircuit(Backend* backend, SharedCircuit circuit) {
 		this->circuit = circuit;
 		renderer->setEvaluator(nullptr);
 		renderer->setCircuit(circuit.get());
-		evaluatorStateInterface = EvaluatorStateInterface();
 		toolManager.setCircuit(circuit.get());
 	}
 }
diff --git a/src/gui/viewPortManager/circuitView/circuitView.h b/src/gui/viewPortManager/circuitView/circuitView.h
@@ -1,7 +1,6 @@
 #ifndef circuitView_h
 #define circuitView_h
 
-#include "backend/evaluator/evaluatorStateInterface.h"
 #include "events/eventRegister.h"
 #include "tools/toolManager.h"
 #include "viewManager/viewManager.h"
@@ -23,9 +22,6 @@ class CircuitView {
 	inline Evaluator* getEvaluator() { return evaluator.get(); }
 	inline const Evaluator* getEvaluator() const { return evaluator.get(); }
 
-	inline EvaluatorStateInterface& getEvaluatorStateInterface() { return evaluatorStateInterface; }
-	inline const EvaluatorStateInterface& getEvaluatorStateInterface() const { return evaluatorStateInterface; }
-
 	inline EventRegister& getEventRegister() { return eventRegister; }
 	inline const EventRegister& getEventRegister() const { return eventRegister; }
 
@@ -61,7 +57,6 @@ class CircuitView {
 
 	DataUpdateEventManager* dataUpdateEventManager = nullptr;
 
-	EvaluatorStateInterface evaluatorStateInterface;
 	EventRegister eventRegister;
 	ViewManager viewManager;
 	ToolManager toolManager;
diff --git a/src/gui/viewPortManager/circuitView/tools/other/logicToucher.cpp b/src/gui/viewPortManager/circuitView/tools/other/logicToucher.cpp
@@ -13,7 +13,10 @@ void LogicToucher::activate() {
 
 
 bool LogicToucher::press(const Event* event) {
-	if (!circuitView || !circuit || !circuitView->getEvaluatorStateInterface().isSetup()) return false;
+	if (!circuitView || !circuit) return false;
+	Evaluator* evaluator = circuitView->getEvaluator();
+	if (!evaluator) return false;
+
 	const PositionEvent* positionEvent = event->cast<PositionEvent>();
 	if (!positionEvent) return false;
 
@@ -25,19 +28,22 @@ bool LogicToucher::press(const Event* event) {
 			bool stateToSet = true;
 			Address address = circuitView->getAddress();
 			address.addBlockId(clickPosition);
-			circuitView->getEvaluatorStateInterface().setState(address, !circuitView->getEvaluatorStateInterface().getBoolState(address));
+			evaluator->setState(address, !evaluator->getBoolState(address));
 		}
 		clicked = true;
 		return true;
 	}
 }
 
 bool LogicToucher::unpress(const Event* event) {
-	if (!circuitView || !circuit || !circuitView->getEvaluatorStateInterface().isSetup()) return false;
+	if (!circuitView || !circuit) return false;
+	Evaluator* evaluator = circuitView->getEvaluator();
+	if (!evaluator) return false;
+
 	if (clicked) {
 		const Block* block = circuit->getBlockContainer()->getBlock(clickPosition);
 		if (block && block->type() == BlockType::BUTTON) {
-			circuitView->getEvaluatorStateInterface().setState(Address(clickPosition), false);
+			evaluator->setState(Address(clickPosition), false);
 		}
 		clicked = false;
 		return true;
@@ -46,16 +52,18 @@ bool LogicToucher::unpress(const Event* event) {
 }
 
 bool LogicToucher::pointerMove(const Event* event) {
-	if (!circuitView || !circuit || !circuitView->getEvaluatorStateInterface().isSetup()) return false;
+	if (!circuitView || !circuit) return false;
+	Evaluator* evaluator = circuitView->getEvaluator();
+	if (!evaluator) return false;
 
 	if (clicked && lastPointerPosition != clickPosition) {
 		const Block* block = circuit->getBlockContainer()->getBlock(clickPosition);
 		if (block && block->type() == BlockType::BUTTON) {
-			circuitView->getEvaluatorStateInterface().setState(Address(clickPosition), false);
+			evaluator->setState(Address(clickPosition), false);
 		}
 		clickPosition = lastPointerPosition;
 		if (circuit->getBlockContainer()->checkCollision(clickPosition)) {
-			circuitView->getEvaluatorStateInterface().setState(Address(clickPosition), !circuitView->getEvaluatorStateInterface().getBoolState(Address(clickPosition)));
+			evaluator->setState(Address(clickPosition), !evaluator->getBoolState(Address(clickPosition)));
 		}
 	}
 	return false;

Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,13 @@ void CircuitView::setBackend(Backend* backend) {`
`16`	`16`	`this->circuit = nullptr;`
`17`	`17`	`renderer->setEvaluator(nullptr);`
`18`	`18`	`renderer->setCircuit(nullptr);`
`19`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`20`	`19`	`toolManager.setCircuit(nullptr);`
`21`	`20`	`} else if (this->backend != backend) {`
`22`	`21`	`this->backend = backend;`
`23`	`22`	`this->evaluator = nullptr;`
`24`	`23`	`this->circuit = nullptr;`
`25`	`24`	`renderer->setEvaluator(nullptr);`
`26`	`25`	`renderer->setCircuit(nullptr);`
`27`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`28`	`26`	`toolManager.setCircuit(nullptr);`
`29`	`27`	`}`
`30`	`28`	`}`
`@@ -39,7 +37,6 @@ void CircuitView::setEvaluator(Backend* backend, evaluator_id_t evaluatorId, con`
`39`	`37`	`this->circuit = nullptr;`
`40`	`38`	`renderer->setEvaluator(nullptr);`
`41`	`39`	`renderer->setCircuit(nullptr);`
`42`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`43`	`40`	`toolManager.setCircuit(nullptr);`
`44`	`41`	`}`
`45`	`42`	`} else {`
`@@ -59,7 +56,6 @@ void CircuitView::setEvaluator(Backend* backend, evaluator_id_t evaluatorId, con`
`59`	`56`	`renderer->setAddress(address);`
`60`	`57`	`renderer->setCircuit(circuit.get());`
`61`	`58`
`62`		`- evaluatorStateInterface = EvaluatorStateInterface(evaluator.get());`
`63`	`59`	`toolManager.setCircuit(circuit.get());`
`64`	`60`	`}`
`65`	`61`	`}`
`@@ -75,7 +71,6 @@ void CircuitView::setEvaluator(Backend* backend, std::shared_ptr<Evaluator> eval`
`75`	`71`	`this->circuit = nullptr;`
`76`	`72`	`renderer->setEvaluator(nullptr);`
`77`	`73`	`renderer->setCircuit(nullptr);`
`78`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`79`	`74`	`toolManager.setCircuit(nullptr);`
`80`	`75`	`}`
`81`	`76`	`} else if (backend->getEvaluatorManager().getEvaluator(evaluator->getEvaluatorId()) != evaluator) {`
`@@ -94,7 +89,6 @@ void CircuitView::setEvaluator(Backend* backend, std::shared_ptr<Evaluator> eval`
`94`	`89`	`renderer->setAddress(address);`
`95`	`90`	`renderer->setCircuit(circuit.get());`
`96`	`91`
`97`		`- evaluatorStateInterface = EvaluatorStateInterface(evaluator.get());`
`98`	`92`	`toolManager.setCircuit(circuit.get());`
`99`	`93`	`}`
`100`	`94`	`}`
`@@ -109,7 +103,6 @@ void CircuitView::setCircuit(Backend* backend, circuit_id_t circuitId) {`
`109`	`103`	`this->circuit = nullptr;`
`110`	`104`	`renderer->setEvaluator(nullptr);`
`111`	`105`	`renderer->setCircuit(nullptr);`
`112`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`113`	`106`	`toolManager.setCircuit(nullptr);`
`114`	`107`	`}`
`115`	`108`	`} else {`
`@@ -124,7 +117,6 @@ void CircuitView::setCircuit(Backend* backend, circuit_id_t circuitId) {`
`124`	`117`	`this->circuit = circuit;`
`125`	`118`	`renderer->setEvaluator(nullptr);`
`126`	`119`	`renderer->setCircuit(circuit.get());`
`127`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`128`	`120`	`toolManager.setCircuit(circuit.get());`
`129`	`121`	`}`
`130`	`122`	`}`
`@@ -140,7 +132,6 @@ void CircuitView::setCircuit(Backend* backend, SharedCircuit circuit) {`
`140`	`132`	`this->circuit = nullptr;`
`141`	`133`	`renderer->setEvaluator(nullptr);`
`142`	`134`	`renderer->setCircuit(nullptr);`
`143`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`144`	`135`	`toolManager.setCircuit(nullptr);`
`145`	`136`	`}`
`146`	`137`	`} else if (backend->getCircuit(circuit->getCircuitId()) != circuit) {`
`@@ -153,7 +144,6 @@ void CircuitView::setCircuit(Backend* backend, SharedCircuit circuit) {`
`153`	`144`	`this->circuit = circuit;`
`154`	`145`	`renderer->setEvaluator(nullptr);`
`155`	`146`	`renderer->setCircuit(circuit.get());`
`156`		`- evaluatorStateInterface = EvaluatorStateInterface();`
`157`	`147`	`toolManager.setCircuit(circuit.get());`
`158`	`148`	`}`
`159`	`149`	`}`