Switched mostly to using deserialized component versions

[Mograsim.git] / net.mograsim.logic.ui.am2900 / test / net / mograsim / logic / ui / am2900 / Am2901Testbench.java

diff --git a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Testbench.java b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Testbench.java
index 34c4cbe..c35402b 100644 (file)
--- a/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Testbench.java
+++ b/net.mograsim.logic.ui.am2900/test/net/mograsim/logic/ui/am2900/Am2901Testbench.java
@@ -1,17 +1,19 @@
 package net.mograsim.logic.ui.am2900;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.mograsim.logic.ui.SimpleLogicUIStandalone;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 import net.mograsim.logic.ui.model.components.atomic.GUIAndGate;
 import net.mograsim.logic.ui.model.components.atomic.GUIBitDisplay;
 import net.mograsim.logic.ui.model.components.atomic.GUIManualSwitch;
 import net.mograsim.logic.ui.model.components.atomic.GUINotGate;
 import net.mograsim.logic.ui.model.components.atomic.TextComponent;
-import net.mograsim.logic.ui.model.components.mi.nandbased.GUIdff;
-import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901;
-import net.mograsim.logic.ui.model.components.submodels.SimpleRectangularSubmodelComponent;
-import net.mograsim.logic.ui.model.wires.ConnectionPoint;
+import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
+import net.mograsim.logic.ui.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.ui.util.ModellingTool;
 
 public class Am2901Testbench
@@ -23,7 +25,7 @@ public class Am2901Testbench
 
        public static void createTestbench(ViewModelModifiable model)
        {
-               SimpleRectangularSubmodelComponent comp = new GUIAm2901(model);
+               GUIComponent comp = IndirectGUIComponentCreator.createComponent(model, "GUIAm2901");
                ModellingTool tool = ModellingTool.createFor(model);
 
                comp.moveTo(240, 0);
@@ -46,24 +48,34 @@ public class Am2901Testbench
                not2.moveTo(80, -20);
                not3.moveTo(110, -20);
                and.moveTo(135, -30);
-               ConnectionPoint last = and.getPin("Y");
+               Pin last = and.getPin("Y");
+
+               // guess which pins are outputs and which are inputs
+               // TODO this code exists three 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);
 
-               for (int i = 0; i < comp.getInputPinNames().size(); i++)
+               for (int i = 0; i < inputPinNames.size(); i++)
                {
                        double x = 55 + 70 * (i % 2);
                        double y = 10 * i;
 
                        WireCrossPoint wcp = new WireCrossPoint(model, 1);
-                       GUIdff d_ff = new GUIdff(model);
+                       GUIComponent d_ff = IndirectGUIComponentCreator.createComponent(model, "GUIdff");
                        GUIManualSwitch sw = new GUIManualSwitch(model);
 
                        tool.connect(last, wcp);
                        tool.connect(wcp, d_ff, "C");
                        tool.connect(sw, d_ff, "", "D");
-                       tool.connect(d_ff, comp, "Q", comp.getInputPinNames().get(i));
+                       tool.connect(d_ff, comp, "Q", inputPinNames.get(i));
                        last = wcp.getPin();
 
-                       TextComponent label = new TextComponent(model, comp.getInputPinNames().get(i));
+                       TextComponent label = new TextComponent(model, inputPinNames.get(i));
 
                        sw.moveTo(x, y + 7.5);
                        wcp.moveTo(160, y);
@@ -71,15 +83,15 @@ public class Am2901Testbench
                        label.moveTo(x - 25, y + 15);
                }
 
-               for (int i = 0; i < comp.getOutputPinNames().size(); i++)
+               for (int i = 0; i < outputPinNames.size(); i++)
                {
                        double x = 300 + 75 * (i % 2);
                        double y = 10 * i - 2.5;
                        GUIBitDisplay bd = new GUIBitDisplay(model);
                        bd.moveTo(x, y);
-                       tool.connect(bd.getInputPin(), comp, comp.getOutputPinNames().get(i));
+                       tool.connect(bd.getInputPin(), comp, outputPinNames.get(i));
 
-                       TextComponent label = new TextComponent(model, comp.getOutputPinNames().get(i));
+                       TextComponent label = new TextComponent(model, outputPinNames.get(i));
                        label.moveTo(x + 50, y + 8);
                }
        }