paste added

Author: ItchyTrack

src/backend/circuit/circuit.cpp

@@ -152,6 +152,28 @@ bool Circuit::tryInsertParsedCircuit(const ParsedCircuit& parsedCircuit, const P
 	return true;
 }
 
+bool Circuit::tryInsertCopiedBlocks(const SharedCopiedBlocks& copiedBlocks, const Position& position) {
+	Vector totalOffset = Vector(position.x, position.y) + (Position() - copiedBlocks->getMinPosition());
+	for (const CopiedBlocks::CopiedBlockData& block : copiedBlocks->getCopiedBlocks()) {
+		if (blockContainer.checkCollision(block.position + totalOffset, block.rotation, block.blockType)) {
+			return false;
+		}
+	}
+	DifferenceSharedPtr difference = std::make_shared<Difference>();
+	for (const CopiedBlocks::CopiedBlockData& block : copiedBlocks->getCopiedBlocks()) {
+		if (!blockContainer.tryInsertBlock(block.position + totalOffset, block.rotation, block.blockType, difference.get())) {
+			logError("Failed to insert block while inserting block.");
+		}
+	}
+	for (const std::pair<Position, Position>& conn : copiedBlocks->getCopiedConnections()) {
+		if (!blockContainer.tryCreateConnection(conn.second + totalOffset, conn.first + totalOffset, difference.get())) {
+			logError("Failed to create connection while inserting block.");
+		}
+	}
+	sendDifference(difference);
+	return true;
+}
+
 bool Circuit::trySetBlockData(const Position& positionOfBlock, block_data_t data) {
 	DifferenceSharedPtr difference = std::make_shared<Difference>();
 	bool out = blockContainer.trySetBlockData(positionOfBlock, data, difference.get());

src/backend/circuit/circuit.h

@@ -7,6 +7,7 @@
 #include "backend/selection.h"
 #include "parsedCircuit.h"
 #include "undoSystem.h"
+#include "backend/container/copiedBlocks.h"
 
 typedef unsigned int circuit_id_t;
 typedef unsigned int circuit_update_count;
@@ -59,6 +60,7 @@ class Circuit {
 
 	// Trys to place a parsed circuit at a position
 	bool tryInsertParsedCircuit(const ParsedCircuit& parsedCircuit, const Position& position);
+	bool tryInsertCopiedBlocks(const SharedCopiedBlocks& copiedBlocks, const Position& position);
 
 	/* ----------- block data ----------- */
 

src/backend/circuitView/circuitView.h

@@ -44,7 +44,7 @@ class CircuitView {
 	}
 
 	inline void paste() {
-		
+		toolManager.selectTool("paste tool");
 	}
 
 	// --------------- Gettters ---------------

src/backend/circuitView/tools/other/pasteTool.cpp

@@ -0,0 +1,47 @@
+#include "pasteTool.h"
+#include "backend/backend.h"
+
+void PasteTool::activate() {
+	CircuitTool::activate();
+	registerFunction("Tool Primary Activate", std::bind(&PasteTool::place, this, std::placeholders::_1));
+}
+
+bool PasteTool::validatePlacement() const {
+	SharedCopiedBlocks copiedBlocks = circuitView->getBackend()->getClipboard();
+	if (!copiedBlocks) return false;
+
+	Vector totalOffset = Vector(lastPointerPosition.x, lastPointerPosition.y) + (Position() - copiedBlocks->getMinPosition());
+
+	for (const CopiedBlocks::CopiedBlockData& block : copiedBlocks->getCopiedBlocks()) {
+		Position testPos = block.position + totalOffset;
+		if (circuit->getBlockContainer()->checkCollision(testPos)) {
+			return false;
+		}
+	}
+	return true;
+}
+
+bool PasteTool::place(const Event* event) {
+	if (!validatePlacement()) { return true; }
+
+	SharedCopiedBlocks copiedBlocks = circuitView->getBackend()->getClipboard();
+	circuit->tryInsertCopiedBlocks(copiedBlocks, lastPointerPosition);
+
+	return true;
+}
+
+// Preview is only shown for the primary parsed circuit, not the dependencies that will be created in a different circuit
+void PasteTool::updateElements() {
+	if (!elementCreator.isSetup()) return;
+	elementCreator.clear();
+	if (!pointerInView) return;
+	
+	SharedCopiedBlocks copiedBlocks = circuitView->getBackend()->getClipboard();
+	if (!copiedBlocks) return;
+
+	Vector totalOffset = Vector(lastPointerPosition.x, lastPointerPosition.y) + (Position() - copiedBlocks->getMinPosition());
+
+	for (const CopiedBlocks::CopiedBlockData& block : copiedBlocks->getCopiedBlocks()) {
+		elementCreator.addBlockPreview(BlockPreview(block.blockType, block.position + totalOffset, block.rotation));
+	}
+}

src/backend/circuitView/tools/other/pasteTool.h

@@ -0,0 +1,19 @@
+#ifndef pasteTool_h
+#define pasteTool_h
+
+#include "../circuitTool.h"
+#include "backend/circuit/parsedCircuit.h"
+#include "computerAPI/circuits/circuitFileManager.h"
+class Backend;
+
+class PasteTool : public CircuitTool {
+public:
+    void activate() override final;
+	void updateElements() override final;
+    bool place(const Event* event);
+
+private:
+    bool validatePlacement() const;
+};
+
+#endif /* pasteTool_h */ 

src/backend/circuitView/tools/other/previewPlacementTool.cpp

@@ -1,6 +1,4 @@
 #include "previewPlacementTool.h"
-#include "backend/backend.h"
-#include "backend/circuitView/renderer/elementCreator.h"
 #include <QMessageBox>
 
 // Preview is only shown for the primary parsed circuit, not the dependencies that will be created in a different circuit
@@ -41,6 +39,7 @@ bool PreviewPlacementTool::commitPlacement(const Event* event) {
 
 	if (!validatePlacement()) {
 		QMessageBox::warning(nullptr, "Collision Detected", "Cannot place circuit in occupied positions");
+		logWarning("Collision Detected, Cannot place circuit in occupied positions", "PreviewPlacementTool");
 		return true;
 	}
 	circuit->tryInsertParsedCircuit(*parsedCircuit, lastPointerPosition);

src/backend/circuitView/tools/other/previewPlacementTool.h

@@ -3,8 +3,6 @@
 
 #include "../circuitTool.h"
 #include "backend/circuit/parsedCircuit.h"
-#include "computerAPI/circuits/circuitFileManager.h"
-class Backend;
 
 class PreviewPlacementTool : public CircuitTool {
 public:

src/backend/circuitView/tools/toolManager.cpp

@@ -4,6 +4,7 @@
 #include "placement/blockPlacementTool.h"
 #include "connection/connectionTool.h"
 #include "other/previewPlacementTool.h"
+#include "other/pasteTool.h"
 #include "other/logicToucher.h"
 #include "movement/moveTool.h"
 #include "selection/selectionMakerTool.h"
@@ -52,6 +53,7 @@ void ToolManager::selectTool(std::string toolName) {
 		else if (toolName == "placement/move") instanceNewtool<MoveTool>(toolName, 0);
 		else if (toolName == "connection/connection") instanceNewtool<ConnectionTool>(toolName, 0);
 		else if (toolName == "preview placement tool") instanceNewtool<PreviewPlacementTool>(toolName, 0);
+		else if (toolName == "paste tool") instanceNewtool<PasteTool>(toolName, 0);
 		else if (toolName == "interactive/state changer") instanceNewtool<LogicToucher>(toolName, 1);
 		else if (toolName == "selection/selection maker") instanceNewtool<SelectionMakerTool>(toolName, 0);
 		else logError("Unknown tool name \"{}\"", "", toolName);

src/backend/container/copiedBlocks.cpp

@@ -5,10 +5,19 @@
 CopiedBlocks::CopiedBlocks(const BlockContainer* blockContainer, SharedSelection selection) {
 	std::unordered_set<Position> positions;
 	std::unordered_set<const Block*> blocksSet;
+	bool foundPos = false;
 	flattenSelection(selection, positions);
 	for (Position position : positions) {
 		const Block* block = blockContainer->getBlock(position);
 		if (!block) continue;
+		if (foundPos) {
+			if (minPosition.x > position.x) minPosition.x = position.x;
+			else if (maxPosition.x > position.x) maxPosition.x = position.x;
+			if (minPosition.y > position.y) minPosition.y = position.y;
+			else if (maxPosition.y > position.y) maxPosition.y = position.y;
+		} else {
+			minPosition = maxPosition = position;
+		}
 		if (blocksSet.contains(block)) continue;
 		blocksSet.insert(block);
 		blocks.emplace_back(

src/backend/container/copiedBlocks.h

@@ -9,14 +9,22 @@ class CopiedBlocks {
 public:
 	CopiedBlocks(const BlockContainer* blockContainer, SharedSelection selection);
 
-private:
 	struct CopiedBlockData {
 		BlockType blockType;
 		Position position;
 		Rotation rotation;
 		block_data_t data;
 	};
 
+	const std::vector<CopiedBlockData> getCopiedBlocks() const { return blocks; }
+	const std::vector<std::pair<Position, Position>> getCopiedConnections() const { return connections; }
+	const Position& getMinPosition() { return minPosition; }
+	const Position& getMaxPosition() { return maxPosition; }
+
+private:
+	
+	Position minPosition;
+	Position maxPosition;
 	std::vector<CopiedBlockData> blocks;
 	std::vector<std::pair<Position, Position>> connections;
 };