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=45f538cc5dbc44607dffd4ca85f34cbcbfb3927b;hb=422779cc67647f9495b06f5fb84e9b27de95e0c2;hp=b8db984b68081611723b8ee7abdd50ef914522eb;hpb=e2d193c0ae869ab9d3d8d50c3d193c0c164ac846;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 b8db984b..45f538cc 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,7 +5,6 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.mograsim.logic.model.SimpleLogicUIStandalone;
-import net.mograsim.logic.model.am2900.components.GUIor12;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.components.atomic.GUIBitDisplay;
@@ -14,6 +13,7 @@ import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcod
 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.serializing.IndirectGUIComponentCreator;
 
 public class GUIComponentTestbench
 {
@@ -25,8 +25,8 @@ 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 GUIor12(model, "or12");
+		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model,
+				"class:net.mograsim.logic.model.am2900.components.am2904.GUIAm2904RegCTInstrDecode");
 
 		// 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
@@ -54,22 +54,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