X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fexamples%2FSubmodelComponentTestbench.java;h=5de6912a39949de08717030d362e6dbf4e77a482;hb=de20dccd3df4280c7634f7520ccc77fff4312e3f;hp=e7e38ff5d19f5fd0732a812442e3e238ff672be4;hpb=c1a8e2103a1a79039163ad2e414c0650f8cee3ea;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java index e7e38ff5..5de6912a 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/examples/SubmodelComponentTestbench.java @@ -4,7 +4,7 @@ import net.mograsim.logic.ui.SimpleLogicUIStandalone; import net.mograsim.logic.ui.model.ViewModelModifiable; import net.mograsim.logic.ui.model.components.GUIBitDisplay; import net.mograsim.logic.ui.model.components.GUIManualSwitch; -import net.mograsim.logic.ui.model.components.SubmodelComponent; +import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent; import net.mograsim.logic.ui.model.components.mi.nandbased.GUIhalfadder; import net.mograsim.logic.ui.model.wires.GUIWire; @@ -18,21 +18,20 @@ public class SubmodelComponentTestbench @SuppressWarnings("unused") // for GUIWires being created public static void createTestbench(ViewModelModifiable model) { - SubmodelComponent comp = new GUIhalfadder(model); - int inputCount = 2; + SimpleRectangularSubmodelComponent comp = new GUIhalfadder(model); comp.moveTo(100, 0); - for (int i = 0; i < inputCount; i++) + for (int i = 0; i < comp.getInputPins().size(); i++) { GUIManualSwitch sw = new GUIManualSwitch(model); sw.moveTo(0, 20 * i); - new GUIWire(model, comp.getPins().get(i), sw.getOutputPin()); + new GUIWire(model, comp.getInputPins().get(i), sw.getOutputPin()); } - for (int i = inputCount; i < comp.getPins().size(); i++) + for (int i = 0; i < comp.getOutputPins().size(); i++) { GUIBitDisplay bd = new GUIBitDisplay(model); - bd.moveTo(200, 20 * (i - inputCount)); - new GUIWire(model, comp.getPins().get(i), bd.getInputPin()); + bd.moveTo(200, 20 * i); + new GUIWire(model, comp.getOutputPins().get(i), bd.getInputPin()); } } } \ No newline at end of file