X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fexamples%2FSubmodelComponentTestbench.java;h=7218fecc2414e8e8eb90d5f04d16a53bc51b0a0d;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=e7e38ff5d19f5fd0732a812442e3e238ff672be4;hpb=4c7ed08d1aa934f919e0bed29c868b553680a8ef;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..7218fecc 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,8 +4,8 @@ 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.mi.nandbased.GUIhalfadder; +import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent; +import net.mograsim.logic.ui.model.components.mi.nandbased.am2901.GUIAm2901ALUInclDecode; import net.mograsim.logic.ui.model.wires.GUIWire; public class SubmodelComponentTestbench @@ -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 GUIAm2901ALUInclDecode(model); comp.moveTo(100, 0); - for (int i = 0; i < inputCount; i++) + for (int i = 0; i < comp.getInputPinNames().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.getPin(comp.getInputPinNames().get(i)), sw.getOutputPin()); } - for (int i = inputCount; i < comp.getPins().size(); i++) + for (int i = 0; i < comp.getOutputPinNames().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.getPin(comp.getOutputPinNames().get(i)), bd.getInputPin()); } } } \ No newline at end of file