X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUInand3.java;h=f102c3ba06076d10485e1d0cfb3d4e8505ffefcc;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=d126dfeccf4364209ffaa82c96c6b160ac24495a;hpb=f84fb965a1f4dc6d6675445426d4e68aa5b989fb;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInand3.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInand3.java
index d126dfec..f102c3ba 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInand3.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUInand3.java
@@ -3,40 +3,30 @@ package net.mograsim.logic.ui.model.components.mi.nandbased;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUINandGate;
-import net.mograsim.logic.ui.model.components.SubmodelComponent;
+import net.mograsim.logic.ui.model.components.SimpleRectangularSubmodelComponent;
 import net.mograsim.logic.ui.model.wires.GUIWire;
 import net.mograsim.logic.ui.model.wires.Pin;
 import net.mograsim.logic.ui.model.wires.WireCrossPoint;
 
-public class GUInand3 extends SubmodelComponent
+public class GUInand3 extends SimpleRectangularSubmodelComponent
 {
-	private final Pin pinA;
-	private final Pin pinB;
-	private final Pin pinC;
-	private final Pin pinY;
-
 	public GUInand3(ViewModelModifiable model)
 	{
-		super(model, "GUInand3");
-		setSize(40, 30);
+		super(model, 1, "GUInand3");
 		setSubmodelScale(.4);
-
-		Pin A = addSubmodelInterface(1, 0, 5);
-		Pin B = addSubmodelInterface(1, 0, 15);
-		Pin C = addSubmodelInterface(1, 0, 25);
-		Pin Y = addSubmodelInterface(1, 40, 15);
-
-		this.pinA = getSupermodelPin(A);
-		this.pinB = getSupermodelPin(B);
-		this.pinC = getSupermodelPin(C);
-		this.pinY = getSupermodelPin(Y);
-
-		initSubmodelComponents(A, B, C, Y);
+		setInputPins("A", "B", "C");
+		setOutputPins("Y");
+		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused") // for GUIWires being created
-	private void initSubmodelComponents(Pin A, Pin B, Pin C, Pin Y)
+	private void initSubmodelComponents()
 	{
+		Pin A = getSubmodelPin("A");
+		Pin B = getSubmodelPin("B");
+		Pin C = getSubmodelPin("C");
+		Pin Y = getSubmodelPin("Y");
+
 		GUINandGate nandAB = new GUINandGate(submodelModifiable, 1);
 		GUINandGate andAB = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandABC = new GUINandGate(submodelModifiable, 1);
@@ -44,37 +34,17 @@ public class GUInand3 extends SubmodelComponent
 		WireCrossPoint cpNandAB = new WireCrossPoint(submodelModifiable, 1);
 
 		nandAB.moveTo(10, 15);
-		andAB.moveTo(40, 15);
-		nandABC.moveTo(70, 27.5);
-		cpNandAB.moveTo(35, 25);
-
-		new GUIWire(submodelModifiable, A, nandAB.getInputPins().get(0), new Point(5, 12.5), new Point(5, 20));
-		new GUIWire(submodelModifiable, B, nandAB.getInputPins().get(1), new Point(5, 37.5), new Point(5, 30));
-		new GUIWire(submodelModifiable, nandAB.getOutputPin(), cpNandAB);
-		new GUIWire(submodelModifiable, cpNandAB, andAB.getInputPins().get(0), new Point(35, 20));
-		new GUIWire(submodelModifiable, cpNandAB, andAB.getInputPins().get(1), new Point(35, 30));
-		new GUIWire(submodelModifiable, andAB.getOutputPin(), nandABC.getInputPins().get(0), new Point(65, 25), new Point(65, 32.5));
-		new GUIWire(submodelModifiable, C, nandABC.getInputPins().get(1), new Point(65, 62.5), new Point(65, 42.5));
-		new GUIWire(submodelModifiable, nandABC.getOutputPin(), Y);
-	}
-
-	public Pin getPinA()
-	{
-		return pinA;
-	}
-
-	public Pin getPinB()
-	{
-		return pinB;
-	}
-
-	public Pin getPinC()
-	{
-		return pinC;
-	}
-
-	public Pin getPinY()
-	{
-		return pinY;
+		andAB.moveTo(35, 15);
+		nandABC.moveTo(62.5, 2.5);
+		cpNandAB.moveCenterTo(32.5, 25);
+
+		new GUIWire(submodelModifiable, A, nandAB.getPin("A"));
+		new GUIWire(submodelModifiable, B, nandAB.getPin("B"));
+		new GUIWire(submodelModifiable, nandAB.getPin("Y"), cpNandAB, new Point[0]);
+		new GUIWire(submodelModifiable, cpNandAB, andAB.getPin("A"), new Point(32.5, 20));
+		new GUIWire(submodelModifiable, cpNandAB, andAB.getPin("B"), new Point(32.5, 30));
+		new GUIWire(submodelModifiable, andAB.getPin("Y"), nandABC.getPin("A"), new Point(57.5, 25), new Point(57.5, 7.5));
+		new GUIWire(submodelModifiable, C, nandABC.getPin("B"), new Point(60, 62.5), new Point(60, 17.5));
+		new GUIWire(submodelModifiable, nandABC.getPin("Y"), Y, new Point[0]);
 	}
 }
\ No newline at end of file