X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model.am2900%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fexamples%2FGUIComponentTestbench.java;h=25c90ae0d1a1a0f5f6caee62aa0b5eeb657c6f85;hb=d85136c6ced4145e62d704de27abaab0465504a7;hp=b57522d2b1e7f6a8b46a7e0f3f0fd862f5021df3;hpb=755dd287af38d41b225e5976466111bc69249edb;p=Mograsim.git

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
index b57522d2..25c90ae0 100644
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/examples/GUIComponentTestbench.java
@@ -5,15 +5,14 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.mograsim.logic.model.SimpleLogicUIStandalone;
-import net.mograsim.logic.model.am2900.components.am2910.GUIAm2910RegCntr;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
 import net.mograsim.logic.model.model.components.atomic.GUIManualSwitch;
-import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
-import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent.Usage;
 import net.mograsim.logic.model.model.wires.GUIWire;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 
 public class GUIComponentTestbench
 {
@@ -25,27 +24,16 @@ public class GUIComponentTestbench
 	@SuppressWarnings("unused") // for GUIWires being created
 	public static void createTestbench(ViewModelModifiable model)
 	{
-//		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901", "Am2901");
-		GUIComponent comp = new GUIAm2910RegCntr(model, "RegCntr");
+		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model,
+				"resource:net.mograsim.logic.model.am2900.Am2900Loader:/components/GUIAm2900.json");
 
-		// guess which pins are outputs and which are inputs
-		// TODO this code exists four times... but it seems too "hacky" to put it in a helper class
 		List<String> inputPinNames = new ArrayList<>();
 		List<String> outputPinNames = new ArrayList<>();
-		if (comp instanceof SimpleRectangularHardcodedGUIComponent)
-		{
-			SimpleRectangularHardcodedGUIComponent compCasted = (SimpleRectangularHardcodedGUIComponent) comp;
-			for (Pin p : comp.getPins().values())
-				if (compCasted.getPinUsage(p) == Usage.INPUT)
-					inputPinNames.add(p.name);
-				else
-					outputPinNames.add(p.name);
-		} else
-			for (Pin p : comp.getPins().values())
-				if (p.getRelX() == 0)
-					inputPinNames.add(p.name);
-				else
-					outputPinNames.add(p.name);
+		for (Pin p : comp.getPins().values())
+			if (p.usage == PinUsage.INPUT)
+				inputPinNames.add(p.name);
+			else
+				outputPinNames.add(p.name);
 
 		inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
 		outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
@@ -54,22 +42,16 @@ public class GUIComponentTestbench
 		for (int i = 0; i < inputPinNames.size(); i++)
 		{
 			String pinName = inputPinNames.get(i);
-			if (comp.getPin(pinName).logicWidth == 1)
-			{
-				GUIManualSwitch sw = new GUIManualSwitch(model);
-				sw.moveTo(0, 20 * i);
-				new GUIWire(model, comp.getPin(pinName), sw.getOutputPin());
-			}
+			GUIManualSwitch sw = new GUIManualSwitch(model, comp.getPin(pinName).logicWidth);
+			sw.moveTo(0, 20 * i);
+			new GUIWire(model, comp.getPin(pinName), sw.getOutputPin());
 		}
 		for (int i = 0; i < outputPinNames.size(); i++)
 		{
 			String pinName = outputPinNames.get(i);
-			if (comp.getPin(pinName).logicWidth == 1)
-			{
-				GUIBitDisplay bd = new GUIBitDisplay(model);
-				bd.moveTo(200, 20 * i);
-				new GUIWire(model, comp.getPin(pinName), bd.getInputPin());
-			}
+			GUIBitDisplay bd = new GUIBitDisplay(model, comp.getPin(pinName).logicWidth);
+			bd.moveTo(200, 20 * i);
+			new GUIWire(model, comp.getPin(pinName), bd.getInputPin());
 		}
 	}
 }
\ No newline at end of file