X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIhalfadder.java;h=a75d1624603a0054119320aca03ea18a74945c1b;hb=7d29de9658db31195b8b13d54b1efe2f72e0b157;hp=2571ff7c3e78d03a8ff97ec5d1d7074a705a9b02;hpb=4c7ed08d1aa934f919e0bed29c868b553680a8ef;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIhalfadder.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIhalfadder.java
index 2571ff7c..a75d1624 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIhalfadder.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIhalfadder.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 GUIhalfadder extends SubmodelComponent
+public class GUIhalfadder extends SimpleRectangularSubmodelComponent
 {
-	private final Pin pinA;
-	private final Pin pinB;
-	private final Pin pinY;
-	private final Pin pin_Z;
-
 	public GUIhalfadder(ViewModelModifiable model)
 	{
-		super(model, "GUIhalfadder");
-		setSize(35, 25);
+		super(model, 1, "GUIhalfadder");
 		setSubmodelScale(.4);
-
-		Pin A = addSubmodelInterface(1, 0, 5);
-		Pin B = addSubmodelInterface(1, 0, 20);
-		Pin Y = addSubmodelInterface(1, 35, 5);
-		Pin _Z = addSubmodelInterface(1, 35, 20);
-
-		this.pinA = getSupermodelPin(A);
-		this.pinB = getSupermodelPin(B);
-		this.pinY = getSupermodelPin(Y);
-		this.pin_Z = getSupermodelPin(_Z);
-
-		initSubmodelComponents(A, B, Y, _Z);
+		setInputCount(2);
+		setOutputCount(2);
+		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused") // for GUIWires being created
-	private void initSubmodelComponents(Pin A, Pin B, Pin Y, Pin _Z)
+	private void initSubmodelComponents()
 	{
+		Pin A = getInputSubmodelPins().get(0);
+		Pin B = getInputSubmodelPins().get(1);
+		Pin Y = getOutputSubmodelPins().get(0);
+		Pin _Z = getOutputSubmodelPins().get(1);
+
 		GUINandGate nand_Z = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandYA = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nandYB = new GUINandGate(submodelModifiable, 1);
@@ -46,46 +36,26 @@ public class GUIhalfadder extends SubmodelComponent
 		WireCrossPoint cpB = new WireCrossPoint(submodelModifiable, 1);
 		WireCrossPoint cp_Z = new WireCrossPoint(submodelModifiable, 1);
 
-		nand_Z.moveTo(10, 21.25);
+		nand_Z.moveTo(10, 15);
 		nandYA.moveTo(40, 2.5);
-		nandYB.moveTo(40, 40);
+		nandYB.moveTo(40, 27.5);
 		nandY.moveTo(65, 2.5);
-		cpA.moveTo(5, 12.5);
-		cpB.moveTo(5, 50);
-		cp_Z.moveTo(35, 31.25);
+		cpA.moveCenterTo(5, 12.5);
+		cpB.moveCenterTo(5, 37.5);
+		cp_Z.moveCenterTo(35, 25);
 
-		new GUIWire(submodelModifiable, A, cpA);
+		new GUIWire(submodelModifiable, A, cpA, new Point[0]);
 		new GUIWire(submodelModifiable, cpA, nandYA.getInputPins().get(0), new Point(5, 7.5));
-		new GUIWire(submodelModifiable, cpA, nand_Z.getInputPins().get(0), new Point(5, 26.25));
-		new GUIWire(submodelModifiable, B, cpB);
-		new GUIWire(submodelModifiable, cpB, nandYB.getInputPins().get(1), new Point(5, 55));
-		new GUIWire(submodelModifiable, cpB, nand_Z.getInputPins().get(1), new Point(5, 36.25));
-		new GUIWire(submodelModifiable, nand_Z.getOutputPin(), cp_Z);
-		new GUIWire(submodelModifiable, cp_Z, _Z, new Point(80, 31.25), new Point(80, 50));
+		new GUIWire(submodelModifiable, cpA, nand_Z.getInputPins().get(0), new Point(5, 20));
+		new GUIWire(submodelModifiable, B, cpB, new Point[0]);
+		new GUIWire(submodelModifiable, cpB, nandYB.getInputPins().get(1), new Point(5, 42.5));
+		new GUIWire(submodelModifiable, cpB, nand_Z.getInputPins().get(1), new Point(5, 30));
+		new GUIWire(submodelModifiable, nand_Z.getOutputPin(), cp_Z, new Point[0]);
+		new GUIWire(submodelModifiable, cp_Z, _Z, new Point(80, 25), new Point(80, 37.5));
 		new GUIWire(submodelModifiable, cp_Z, nandYA.getInputPins().get(1), new Point(35, 17.5));
-		new GUIWire(submodelModifiable, cp_Z, nandYB.getInputPins().get(0), new Point(35, 45));
+		new GUIWire(submodelModifiable, cp_Z, nandYB.getInputPins().get(0), new Point(35, 32.5));
 		new GUIWire(submodelModifiable, nandYA.getOutputPin(), nandY.getInputPins().get(0), new Point(62.5, 12.5), new Point(62.5, 7.5));
-		new GUIWire(submodelModifiable, nandYB.getOutputPin(), nandY.getInputPins().get(1), new Point(62.5, 50), new Point(62.5, 17.5));
-		new GUIWire(submodelModifiable, nandY.getOutputPin(), Y);
-	}
-
-	public Pin getPinA()
-	{
-		return pinA;
-	}
-
-	public Pin getPinB()
-	{
-		return pinB;
-	}
-
-	public Pin getPinY()
-	{
-		return pinY;
-	}
-
-	public Pin getPin_Z()
-	{
-		return pin_Z;
+		new GUIWire(submodelModifiable, nandYB.getOutputPin(), nandY.getInputPins().get(1), new Point(62.5, 37.5), new Point(62.5, 17.5));
+		new GUIWire(submodelModifiable, nandY.getOutputPin(), Y, new Point[0]);
 	}
 }
\ No newline at end of file