delete hotbar, you added a bunch of re what ever. stop typing whatever I'm saying omg, thats what the description is for

Author: ItchyTrack

src/backend/backend.h

@@ -1,15 +1,16 @@
 #ifndef backend_h
 #define backend_h
 
-#include "circuitView/circuitView.h"
 #include "evaluator/evaluatorManager.h"
-#include "circuit/circuitManager.h"
 #include "tools/toolManagerManager.h"
+#include "circuitView/circuitView.h"
+#include "dataUpdateEventManager.h"
+#include "circuit/circuitManager.h"
 #include "util/uuid.h"
 
 class Backend {
 public:
-	Backend() : toolManagerManager(&circuitViews) {}
+	Backend() : toolManagerManager(&circuitViews), circuitManager(&dataUpdateEventManager) { }
 
 	// Creates a new Circuit. Returns circuit_id_t.
 	circuit_id_t createCircuit(const std::string& uuid = generate_uuid_v4(), const std::string& name = "Circuit");
@@ -26,6 +27,8 @@ class Backend {
 	inline ToolManagerManager& getToolManagerManager() { return toolManagerManager; }
 	inline const ToolManagerManager& getToolManagerManager() const { return toolManagerManager; }
 
+	inline DataUpdateEventManager* getDataUpdateEventManager() { return &dataUpdateEventManager; }
+	
 	SharedCircuit getCircuit(circuit_id_t circuitId);
 	SharedEvaluator getEvaluator(evaluator_id_t evaluatorId);
 
@@ -41,6 +44,7 @@ class Backend {
 private:
 	std::set<CircuitView*> circuitViews;
 
+	DataUpdateEventManager dataUpdateEventManager;
 	CircuitManager circuitManager;
 	EvaluatorManager evaluatorManager;
 	ToolManagerManager toolManagerManager;

src/backend/circuit/circuitManager.h

@@ -7,6 +7,8 @@
 
 class CircuitManager {
 public:
+	CircuitManager(DataUpdateEventManager* dataUpdateEventManager) : dataUpdateEventManager(dataUpdateEventManager), blockDataManager(dataUpdateEventManager) {}
+
 	inline const BlockDataManager* getBlockDataManager() const { return &blockDataManager; }
 	inline const CircuitBlockDataManager* getCircuitBlockDataManager() const { return &circuitBlockDataManager; }
 
@@ -27,10 +29,13 @@ class CircuitManager {
 		blockData->setWidth(2);
 		blockData->setHeight(2);
 
+		dataUpdateEventManager->sendEvent("blockDataUpdate");
+
 		// blockData->trySetConnectionOutput(Vector(0, 0), 0);
 
 		// Circuit Block Data
 		circuitBlockDataManager.newCircuitBlockData(circuitId, blockType);
+
 		return blockType;
 	}
 
@@ -72,6 +77,7 @@ class CircuitManager {
 
 	BlockDataManager blockDataManager;
 	CircuitBlockDataManager circuitBlockDataManager;
+	DataUpdateEventManager* dataUpdateEventManager;
 
 	circuit_id_t lastId = 0;
 	std::map<circuit_id_t, SharedCircuit> circuits;

src/backend/container/block/blockDataManager.h

@@ -1,11 +1,12 @@
 #ifndef blockDataManager_h
 #define blockDataManager_h
 
+#include "../../dataUpdateEventManager.h"
 #include "blockData.h"
 
 class BlockDataManager {
 public:
-	BlockDataManager() {
+	BlockDataManager(DataUpdateEventManager* dataUpdateEventManager) : dataUpdateEventManager(dataUpdateEventManager) {
 		// load default data
 		blockData.resize(13);
 		getBlockData(BlockType::AND)->setName("And");
@@ -43,10 +44,13 @@ class BlockDataManager {
 		getBlockData(BlockType::LIGHT)->setName("Light");
 		getBlockData(BlockType::LIGHT)->setDefaultData(false);
 		getBlockData(BlockType::LIGHT)->trySetConnectionInput(Vector(0, 0), 0);
+		
+		dataUpdateEventManager->sendEvent("blockDataUpdate");
 	}
 
 	inline BlockType addBlock() noexcept {
 		blockData.emplace_back();
+		dataUpdateEventManager->sendEvent("blockDataUpdate");
 		return (BlockType) blockData.size();
 	}
 
@@ -130,6 +134,7 @@ class BlockDataManager {
 
 private:
 	std::vector<BlockData> blockData;
+	DataUpdateEventManager* dataUpdateEventManager;
 };
 
 #endif /* blockDataManager_h */

src/backend/dataUpdateEventManager.cpp

@@ -0,0 +1,22 @@
+#include "dataUpdateEventManager.h"
+
+DataUpdateEventReceiver::DataUpdateEventReceiver(DataUpdateEventManager* eventManager) : eventManager(eventManager) {
+	if (eventManager) eventManager->DataUpdateeventReceivers.emplace(this);
+}
+
+DataUpdateEventReceiver::DataUpdateEventReceiver(const DataUpdateEventReceiver& other) : eventManager(other.eventManager) {
+	if (eventManager) eventManager->DataUpdateeventReceivers.emplace(this); 
+}
+
+DataUpdateEventReceiver& DataUpdateEventReceiver::operator=(const DataUpdateEventReceiver& other) {
+	if (this != &other) {
+		eventManager = other.eventManager;
+		if (eventManager) eventManager->DataUpdateeventReceivers.emplace(this);
+		functions = other.functions;
+	}
+	return *this;
+};
+
+DataUpdateEventReceiver::~DataUpdateEventReceiver() {
+	eventManager->DataUpdateeventReceivers.erase(this);
+}

src/backend/dataUpdateEventManager.h

@@ -0,0 +1,37 @@
+#ifndef dataUpdateEventManager_h
+#define dataUpdateEventManager_h
+
+class DataUpdateEventManager;
+
+class DataUpdateEventReceiver {
+	friend class DataUpdateEventManager;
+public:
+	DataUpdateEventReceiver(DataUpdateEventManager* eventManager = nullptr);
+	DataUpdateEventReceiver(const DataUpdateEventReceiver& other);
+	DataUpdateEventReceiver& operator=(const DataUpdateEventReceiver& other);
+	~DataUpdateEventReceiver();
+
+	void linkFunction(const std::string& eventName, std::function<void()> function) { functions[eventName] = function; }
+
+private:
+	std::map<std::string, std::function<void()>> functions;
+	DataUpdateEventManager* eventManager = nullptr;
+};
+
+class DataUpdateEventManager {
+	friend class DataUpdateEventReceiver;
+public:
+	void sendEvent(const std::string& eventName) {
+		for (DataUpdateEventReceiver* DataUpdateeventReceiver : DataUpdateeventReceivers) {
+			for (auto pair : DataUpdateeventReceiver->functions) {
+				pair.second();
+			}
+		}
+	}
+
+private:
+	std::set<DataUpdateEventReceiver*> DataUpdateeventReceivers;
+
+};
+
+#endif /* dataUpdateEventManager_h */

src/gui/mainWindow.cpp

@@ -14,7 +14,6 @@
 #include "backend/circuitView/tools/other/previewPlacementTool.h"
 #include "backend/circuit/validateCircuit.h"
 #include "selection/selectorWindow.h"
-#include "selection/hotbarWindow.h"
 #include "circuitViewWidget.h"
 #include "mainWindow.h"
 
@@ -49,11 +48,6 @@ MainWindow::MainWindow(KDDockWidgets::MainWindowOptions options)
 	openNewSelectorWindow();
 
 	setUpMenuBar();
-
-	updateLoopTimer = new QTimer(this);
-	updateLoopTimer->setInterval((int)(updateInterval * 1000.0f));
-	updateLoopTimer->start();
-	connect(updateLoopTimer, &QTimer::timeout, this, &MainWindow::updateLoop);
 }
 
 // Utility methods
@@ -298,23 +292,15 @@ void MainWindow::exportProject() {
 }
 
 void MainWindow::openNewSelectorWindow() {
-	SelectorWindow* selector = new SelectorWindow(backend.getBlockDataManager());
+	SelectorWindow* selector = new SelectorWindow(backend.getBlockDataManager(), backend.getDataUpdateEventManager());
 	selector->updateBlockList();
 	connect(selector, &SelectorWindow::selectedBlockChange, this, &MainWindow::setBlock);
 	connect(selector, &SelectorWindow::selectedToolChange, this, &MainWindow::setTool);
 	connect(selector, &SelectorWindow::selectedModeChange, this, &MainWindow::setMode);
 	connect(this, &MainWindow::toolModeOptionsChanged, selector, &SelectorWindow::updateToolModeOptions);
-	connect(this, &MainWindow::updateBlockList, selector, &SelectorWindow::updateBlockList);
 	addDock(selector, KDDockWidgets::Location_OnLeft);
 }
 
-// void MainWindow::openNewHotbarWindow() {
-// 	HotbarWindow* selector = new HotbarWindow();
-// 	connect(selector, &HotbarWindow::selectedBlockChange, this, &MainWindow::setBlock);
-// 	connect(selector, &HotbarWindow::selectedToolChange, this, &MainWindow::setTool);
-// 	addDock(selector, KDDockWidgets::Location_OnBottom);
-// }
-
 CircuitViewWidget* MainWindow::openNewCircuitViewWindow() {
 	QWidget* w = new QWidget();
 	Ui::CircuitViewUi* circuitViewUi = new Ui::CircuitViewUi();
@@ -364,7 +350,3 @@ void MainWindow::setTool(std::string tool) {
 void MainWindow::setMode(std::string mode) {
 	backend.getToolManagerManager().setMode(mode);
 }
-
-void MainWindow::updateLoop() {
-	emit updateBlockList();
-}

src/gui/mainWindow.h

@@ -35,7 +35,6 @@ class MainWindow : public KDDockWidgets::QtWidgets::MainWindow {
     void loadCircuitInto(CircuitView* circuitWidget);
     void exportProject();
 	void openNewSelectorWindow();
-	void openNewHotbarWindow();
 
 private:
 	// utility
@@ -48,7 +47,6 @@ class MainWindow : public KDDockWidgets::QtWidgets::MainWindow {
 	// update loop
 	QTimer* updateLoopTimer;
 	const float updateInterval = 0.1f;
-	void updateLoop();
 
 	QGraphicsScene* scene;
     QMenu* saveSubMenu;
@@ -63,7 +61,6 @@ class MainWindow : public KDDockWidgets::QtWidgets::MainWindow {
 
 signals:
 	void toolModeOptionsChanged(const std::vector<std::string>* modes);
-	void updateBlockList();
 };
 
 #endif /* mainWindow_h */