more powerful bus creation ui

Author: niknal357

src/backend/blockData/blockDataManager.cpp

@@ -252,11 +252,19 @@ void BlockDataManager::initializeDefaults() {
 }
 
 BlockType BlockDataManager::getBusBlock(unsigned int bitWidth) {
+	return getBusBlock(bitWidth, 1);
+}
+
+BlockType BlockDataManager::getBusBlock(unsigned int numInputs, unsigned int inputBitwidth) {
 	std::vector<BusConnectionData> busConnections;
-	for (unsigned int i = 0; i < bitWidth; i++) {
-		busConnections.emplace_back(Vector(0, i), std::vector<unsigned int>{ i });
+	for (unsigned int i = 0; i < numInputs; i++) {
+		std::vector<unsigned int> bitConfig;
+		for (unsigned int j = 0; j < inputBitwidth; j++) {
+			bitConfig.push_back(i * inputBitwidth + j);
+		}
+		busConnections.emplace_back(Vector(0, i), bitConfig);
 	}
-	busConnections.emplace_back(Vector(1, 0), bitWidth);
+	busConnections.emplace_back(Vector(1, 0), numInputs * inputBitwidth);
 	return getBusBlock(busConnections);
 }
 

src/backend/blockData/blockDataManager.h

@@ -140,6 +140,7 @@ class BlockDataManager {
 	}
 
 	BlockType getBusBlock(unsigned int bitwith);
+	BlockType getBusBlock(unsigned int numInputs, unsigned int inputBitwidth);
 	struct BusConnectionData {
 		Vector positionOnBlock;
 		std::variant<unsigned int, std::vector<unsigned int>> bitConfiguration = static_cast<unsigned int>(1);

src/gui/mainWindow/sideBar/selector/selectorWindow.cpp

@@ -56,17 +56,21 @@ SelectorWindow::SelectorWindow(
 			this->toolManagerManager->setBlock(selectedProceduralCircuit->getBlockType(proceduralCircuitParameters));
 		} else if (selectedBus) {
 			Rml::Element* parametersElement = parameterMenu->GetElementById("parameter-menu-parameters");
-			assert(parametersElement->GetNumChildren() == 1);
+			assert(parametersElement->GetNumChildren() == 2);
 			Rml::ElementList elements;
-			parametersElement->GetFirstChild()->GetElementsByClassName(elements, "parameter-input");
-			Rml::ElementFormControlInput* parameterInput = rmlui_dynamic_cast<Rml::ElementFormControlInput*>(elements[0]);
-			std::string str = parameterInput->GetValue();
+			parametersElement->GetChild(0)->GetElementsByClassName(elements, "parameter-input");
+			Rml::ElementFormControlInput* numInputsInput = rmlui_dynamic_cast<Rml::ElementFormControlInput*>(elements[0]);
+			elements.clear();
+			parametersElement->GetChild(1)->GetElementsByClassName(elements, "parameter-input");
+			Rml::ElementFormControlInput* inputBitWidthInput = rmlui_dynamic_cast<Rml::ElementFormControlInput*>(elements[0]);
+			std::string numInputsStr = numInputsInput->GetValue();
+			std::string inputBitWidthStr = inputBitWidthInput->GetValue();
 			try {
-				int value = std::stoi(str);
-
-				this->toolManagerManager->setBlock(this->blockDataManager->getBusBlock(value));
+				int numInputs = std::stoi(numInputsStr);
+				int inputBitWidth = std::stoi(inputBitWidthStr);
+				this->toolManagerManager->setBlock(this->blockDataManager->getBusBlock(numInputs, inputBitWidth));
 			} catch (std::exception const& ex) {
-				logError("Invalid bus bit width  {}. {}", "", str, ex.what());
+				logError("Invalid bus parameters: {} inputs of {} bits each. {}", "", numInputsStr, inputBitWidthStr, ex.what());
 				return;
 			}
 		}
@@ -239,7 +243,8 @@ void SelectorWindow::setupBusParameterMenu() {
 		return;
 	}
 	ProceduralCircuitParameters parameters;
-	parameters.parameters.emplace("Bit Width", 8);
+	parameters.parameters.emplace("Number of Ports", 8);
+	parameters.parameters.emplace("Port Bit Widths", 1);
 	addParametersToParameterMenu(parameters, "Bus");
 }