From: Daniel Kirschten Date: Wed, 5 Jun 2019 17:33:09 +0000 (+0200) Subject: Hardcoded a wire path in GUImux1 X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=578d3762ffbce21993064320741eb14d311a17b6;p=Mograsim.git Hardcoded a wire path in GUImux1 --- 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 9ff84c00..0f5e3459 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 @@ -5,7 +5,7 @@ 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.SimpleRectangularSubmodelComponent; -import net.mograsim.logic.ui.model.components.mi.nandbased.GUInot4; +import net.mograsim.logic.ui.model.components.mi.nandbased.GUImux1; import net.mograsim.logic.ui.model.wires.GUIWire; public class SubmodelComponentTestbench @@ -18,7 +18,7 @@ public class SubmodelComponentTestbench @SuppressWarnings("unused") // for GUIWires being created public static void createTestbench(ViewModelModifiable model) { - SimpleRectangularSubmodelComponent comp = new GUInot4(model); + SimpleRectangularSubmodelComponent comp = new GUImux1(model); comp.moveTo(100, 0); for (int i = 0; i < comp.getInputPins().size(); i++) diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java index 056b6966..14a612b2 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1.java @@ -52,8 +52,7 @@ public class GUImux1 extends SimpleRectangularSubmodelComponent new GUIWire(submodelModifiable, nandS0.getOutputPin(), nandI0.getInputPins().get(0)); new GUIWire(submodelModifiable, I0, nandI0.getInputPins().get(1), new Point[0]); - new GUIWire(submodelModifiable, cp1, nandI1.getInputPins().get(0), - new Point(cp1.getPin().getPos().x, nandI1.getInputPins().get(0).getPos().y)); + new GUIWire(submodelModifiable, cp1, nandI1.getInputPins().get(0), new Point(5, 52)); new GUIWire(submodelModifiable, I1, nandI1.getInputPins().get(1), new Point[0]); new GUIWire(submodelModifiable, nandI0.getOutputPin(), nandY.getInputPins().get(0));