estimateCenter

Author: ItchyTrack

src/backend/circuit/circuit.cpp

@@ -24,6 +24,15 @@ void Circuit::clear(bool clearUndoTree) {
 	}
 }
 
+Position Circuit::estimateCenter() const {
+	for (auto& pair : blockContainer) {
+		if (pair.second.getPosition().x != stackBottom.x) {
+			return pair.second.getPosition();
+		}
+	}
+	return Position();
+}
+
 void Circuit::connectListener(void* object, CircuitDiffListenerFunction func, unsigned int priority) {
 	listenerFunctions.emplace_back(object, priority, func);
 	std::sort(listenerFunctions.begin(), listenerFunctions.end(), [](const CircuitDiffListenerData& a, const CircuitDiffListenerData& b) { return a.priority < b.priority; });
@@ -614,6 +623,9 @@ void Circuit::popOffStack(Position position, Orientation transformAmount, bool r
 	const Block* block = blockContainer.getBlock(stackTop);
 	if (!block) {
 		logError("Can't find block on stack, this should never happen", "Circuit");
+		if (stackTop.y > stackBottom.y) {
+			stackTop.y--; // take one off the stack to try to save what I can
+		}
 		return;
 	}
 	stackTop.y -= block->size().h-1;

src/backend/circuit/circuit.h

@@ -37,6 +37,8 @@ class Circuit {
 	bool isEditable() { return editable; }
 	void setEditable(bool isEditable) { editable = isEditable; }
 
+	Position estimateCenter() const;
+
 	/* ----------- listener ----------- */
 	// subject to change
 	void connectListener(void* object, CircuitDiffListenerFunction func, unsigned int priority = 100);

src/backend/container/blockContainer.h

@@ -117,6 +117,7 @@ class BlockContainer {
 	void removeBlockCells(const Block* block);
 	block_id_t getNewId() { return ++lastId; }
 
+
 	BlockType selfBlockType = BlockType::NONE;
 	CircuitManager* circuitManager;
 	BlockDataManager* blockDataManager;

src/gui/viewportManager/circuitView/viewManager/viewManager.cpp

@@ -1,9 +1,8 @@
 #include "viewManager.h"
 
-#include "backend/circuit/circuit.h"
-#include "../events/customEvents.h"
-#include "../events/eventRegister.h"
 #include "backend/position/position.h"
+#include "../events/eventRegister.h"
+#include "../events/customEvents.h"
 
 void ViewManager::setUpEvents(EventRegister& eventRegister) {
 	this->eventRegister = &eventRegister;

src/gui/viewportManager/circuitView/viewManager/viewManager.h

@@ -1,8 +1,8 @@
 #ifndef viewManager_h
 #define viewManager_h
 
-#include "backend/circuit/circuit.h"
 #include "backend/position/position.h"
+#include "backend/circuit/circuit.h"
 #include "util/vec2.h"
 
 class EventRegister;