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=f725d5ee026a035dc4a380f2b71923d4f0ff7853;hb=572f0419cbadcca24323417a17b01bb8a28d804d;hp=f2acc618f90e6317d47ab6a23bd63da0623506c6;hpb=e3d7905ec00f7515817ab9921724fd0eb51f79e7;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 f2acc618..f725d5ee 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,11 +5,13 @@ import java.util.Comparator;
 import java.util.List;
 
 import net.mograsim.logic.model.SimpleLogicUIStandalone;
-import net.mograsim.logic.model.am2900.components.am2910.GUIAm2910InstrPLA;
+import net.mograsim.logic.model.am2900.components.GUInor12;
 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;
 
@@ -24,20 +26,26 @@ public class GUIComponentTestbench
 	public static void createTestbench(ViewModelModifiable model)
 	{
 //		GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901", "Am2901");
-		GUIComponent comp = new GUIAm2910InstrPLA(model, "Am2910");
+		GUIComponent comp = new GUInor12(model, "or12");
 
 		// 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<>();
-		for (Pin p : comp.getPins().values())
-			if (p.getRelX() == 0)
-				inputPinNames.add(p.name);
-			else
-				outputPinNames.add(p.name);
-
-		outputPinNames.remove("R=0");
-		inputPinNames.add("R=0");
+		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);
 
 		inputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
 		outputPinNames.sort(Comparator.comparing(comp::getPin, Comparator.comparing(Pin::getRelY)));
@@ -45,15 +53,23 @@ public class GUIComponentTestbench
 		comp.moveTo(100, 0);
 		for (int i = 0; i < inputPinNames.size(); i++)
 		{
-			GUIManualSwitch sw = new GUIManualSwitch(model);
-			sw.moveTo(0, 20 * i);
-			new GUIWire(model, comp.getPin(inputPinNames.get(i)), sw.getOutputPin());
+			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());
+			}
 		}
 		for (int i = 0; i < outputPinNames.size(); i++)
 		{
-			GUIBitDisplay bd = new GUIBitDisplay(model);
-			bd.moveTo(200, 20 * i);
-			new GUIWire(model, comp.getPin(outputPinNames.get(i)), bd.getInputPin());
+			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());
+			}
 		}
 	}
 }
\ No newline at end of file