From 59126047c462536a4000a859e21b30784c73bf12 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Wed, 5 Jun 2019 22:20:08 +0200 Subject: [PATCH] Made MI component formatting uniform --- .../components/mi/nandbased/GUIfulladder.java | 1 - .../components/mi/nandbased/GUImux1.java | 12 +++--------- .../components/mi/nandbased/GUImux1_4.java | 19 ------------------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java index 111b644d..ef4c54e1 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIfulladder.java @@ -12,7 +12,6 @@ public class GUIfulladder extends SimpleRectangularSubmodelComponent public GUIfulladder(ViewModelModifiable model) { super(model, 1, "GUIfulladder"); - setSize(50, 40); setSubmodelScale(.4); setInputCount(3); setOutputCount(2); 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 72b96b6a..19c410eb 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 @@ -13,7 +13,6 @@ public class GUImux1 extends SimpleRectangularSubmodelComponent public GUImux1(ViewModelModifiable model) { super(model, 1, "GUImux1"); - setSize(80, 40); setSubmodelScale(.4); setInputCount(3); setOutputCount(1); @@ -33,14 +32,13 @@ public class GUImux1 extends SimpleRectangularSubmodelComponent GUINandGate nandI1 = new GUINandGate(submodelModifiable, 1); GUINandGate nandY = new GUINandGate(submodelModifiable, 1); + WireCrossPoint cp0 = new WireCrossPoint(submodelModifiable, 1); + WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1); + nandS0.moveTo(10, 7.5); nandI0.moveTo(35, 22.5); nandI1.moveTo(35, 47.5); nandY.moveTo(60, 30); - - WireCrossPoint cp0 = new WireCrossPoint(submodelModifiable, 1); - WireCrossPoint cp1 = new WireCrossPoint(submodelModifiable, 1); - cp0.moveTo(5, 12.5); cp1.moveTo(5, 22.5); @@ -48,16 +46,12 @@ public class GUImux1 extends SimpleRectangularSubmodelComponent new GUIWire(submodelModifiable, cp0, nandS0.getInputPins().get(0), new Point[0]); new GUIWire(submodelModifiable, cp0, cp1, new Point[0]); new GUIWire(submodelModifiable, cp1, nandS0.getInputPins().get(1), new Point[0]); - 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(5, 52.5)); new GUIWire(submodelModifiable, I1, nandI1.getInputPins().get(1), new Point[0]); - new GUIWire(submodelModifiable, nandI0.getOutputPin(), nandY.getInputPins().get(0)); new GUIWire(submodelModifiable, nandI1.getOutputPin(), nandY.getInputPins().get(1)); - new GUIWire(submodelModifiable, nandY.getOutputPin(), Y); } } \ No newline at end of file diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java index 6e2be51a..9d110aa0 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUImux1_4.java @@ -7,25 +7,6 @@ import net.mograsim.logic.ui.model.wires.GUIWire; import net.mograsim.logic.ui.model.wires.Pin; import net.mograsim.logic.ui.model.wires.WireCrossPoint; -/** - * @formatter:off - * Inputs: - * 0: select - * 1: I0_0 - * 2: I0_1 - * 3: I0_2 - * 4: I0_3 - * 5: I1_0 - * 6: I1_1 - * 7: I1_2 - * 8: I1_3 - * Outputs: - * 0: Y0 - * 1: Y1 - * 2: Y2 - * 3: Y3 - * @formatter:on - */ public class GUImux1_4 extends SimpleRectangularSubmodelComponent { public GUImux1_4(ViewModelModifiable model) -- 2.17.1