X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUIdlatch4.java;h=440cfb40e19bd6a19a21eab2a85ac7097e6a4341;hb=19ee1a7fdb06a1df65cd7df78fed935124496707;hp=282bb4b51be092413bf80582f84bbeb15bf3b553;hpb=1cdf25bdcce0cda33c8019439df190d66ed4e38f;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
index 282bb4b5..440cfb40 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
@@ -2,55 +2,35 @@ 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.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 GUIdlatch4 extends SubmodelComponent
+public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
 {
-	private final Pin pinD1;
-	private final Pin pinD2;
-	private final Pin pinD3;
-	private final Pin pinD4;
-	private final Pin pinC;
-	private final Pin pinQ1;
-	private final Pin pinQ2;
-	private final Pin pinQ3;
-	private final Pin pinQ4;
-
 	public GUIdlatch4(ViewModelModifiable model)
 	{
-		super(model, "GUIdlatch4");
-		setSize(35, 55);
+		super(model, 1, "GUIdlatch4");
 		setSubmodelScale(.4);
-
-		Pin D1 = addSubmodelInterface(1, 0, 5);
-		Pin D2 = addSubmodelInterface(1, 0, 15);
-		Pin D3 = addSubmodelInterface(1, 0, 25);
-		Pin D4 = addSubmodelInterface(1, 0, 35);
-		Pin C = addSubmodelInterface(1, 0, 50);
-		Pin Q1 = addSubmodelInterface(1, 35, 5);
-		Pin Q2 = addSubmodelInterface(1, 35, 15);
-		Pin Q3 = addSubmodelInterface(1, 35, 25);
-		Pin Q4 = addSubmodelInterface(1, 35, 35);
-
-		this.pinC = getSupermodelPin(C);
-		this.pinD1 = getSupermodelPin(D1);
-		this.pinD2 = getSupermodelPin(D2);
-		this.pinD3 = getSupermodelPin(D3);
-		this.pinD4 = getSupermodelPin(D4);
-		this.pinQ1 = getSupermodelPin(Q1);
-		this.pinQ2 = getSupermodelPin(Q2);
-		this.pinQ3 = getSupermodelPin(Q3);
-		this.pinQ4 = getSupermodelPin(Q4);
-
-		initSubmodelComponents(C, D1, D2, D3, D4, Q1, Q2, Q3, Q4);
+		setInputPins("D1", "D2", "D3", "D4", "C");
+		setOutputPins("Q1", "Q2", "Q3", "Q4");
+		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused") // for GUIWires being created
-	private void initSubmodelComponents(Pin C, Pin D1, Pin D2, Pin D3, Pin D4, Pin Q1, Pin Q2, Pin Q3, Pin Q4)
+	private void initSubmodelComponents()
 	{
+		Pin D1 = getSubmodelPin("D1");
+		Pin D2 = getSubmodelPin("D2");
+		Pin D3 = getSubmodelPin("D3");
+		Pin D4 = getSubmodelPin("D4");
+		Pin C = getSubmodelPin("C");
+		Pin Q1 = getSubmodelPin("Q1");
+		Pin Q2 = getSubmodelPin("Q2");
+		Pin Q3 = getSubmodelPin("Q3");
+		Pin Q4 = getSubmodelPin("Q4");
+
 		GUIdlatch dlatch1 = new GUIdlatch(submodelModifiable);
 		GUIdlatch dlatch2 = new GUIdlatch(submodelModifiable);
 		GUIdlatch dlatch3 = new GUIdlatch(submodelModifiable);
@@ -64,69 +44,24 @@ public class GUIdlatch4 extends SubmodelComponent
 		dlatch2.moveTo(30, 32.5);
 		dlatch3.moveTo(30, 57.5);
 		dlatch4.moveTo(30, 82.5);
-		cp2.moveTo(15, 52.5);
-		cp3.moveTo(15, 77.5);
-		cp4.moveTo(15, 102.5);
-
-		new GUIWire(submodelModifiable, C, cp4.getPin(), new Point(15, 125));
-		new GUIWire(submodelModifiable, cp4.getPin(), dlatch4.getPinE());
-		new GUIWire(submodelModifiable, cp4.getPin(), cp3.getPin());
-		new GUIWire(submodelModifiable, cp3.getPin(), dlatch3.getPinE());
-		new GUIWire(submodelModifiable, cp3.getPin(), cp2.getPin());
-		new GUIWire(submodelModifiable, cp2.getPin(), dlatch2.getPinE());
-		new GUIWire(submodelModifiable, cp2.getPin(), dlatch1.getPinE(), new Point(15, 27.5));
-		new GUIWire(submodelModifiable, D1, dlatch1.getPinD());
-		new GUIWire(submodelModifiable, D2, dlatch2.getPinD());
-		new GUIWire(submodelModifiable, D3, dlatch3.getPinD());
-		new GUIWire(submodelModifiable, D4, dlatch4.getPinD());
-		new GUIWire(submodelModifiable, dlatch1.getPinQ(), Q1);
-		new GUIWire(submodelModifiable, dlatch2.getPinQ(), Q2);
-		new GUIWire(submodelModifiable, dlatch3.getPinQ(), Q3);
-		new GUIWire(submodelModifiable, dlatch4.getPinQ(), Q4);
-	}
-
-	public Pin getPinC()
-	{
-		return pinC;
-	}
-
-	public Pin getPinD1()
-	{
-		return pinD1;
-	}
-
-	public Pin getPinD2()
-	{
-		return pinD2;
-	}
-
-	public Pin getPinD3()
-	{
-		return pinD3;
-	}
-
-	public Pin getPinD4()
-	{
-		return pinD4;
-	}
-
-	public Pin getPinQ1()
-	{
-		return pinQ1;
-	}
-
-	public Pin getPinQ2()
-	{
-		return pinQ2;
-	}
-
-	public Pin getPinQ3()
-	{
-		return pinQ3;
-	}
-
-	public Pin getPinQ4()
-	{
-		return pinQ4;
+		cp2.moveCenterTo(15, 47.5);
+		cp3.moveCenterTo(15, 72.5);
+		cp4.moveCenterTo(15, 97.5);
+
+		new GUIWire(submodelModifiable, C, cp4, new Point(15, 112.5));
+		new GUIWire(submodelModifiable, cp4, dlatch4.getPin("E"), new Point[0]);
+		new GUIWire(submodelModifiable, cp4, cp3, new Point[0]);
+		new GUIWire(submodelModifiable, cp3, dlatch3.getPin("E"), new Point[0]);
+		new GUIWire(submodelModifiable, cp3, cp2, new Point[0]);
+		new GUIWire(submodelModifiable, cp2, dlatch2.getPin("E"), new Point[0]);
+		new GUIWire(submodelModifiable, cp2, dlatch1.getPin("E"), new Point(15, 22.5));
+		new GUIWire(submodelModifiable, D1, dlatch1.getPin("D"), new Point[0]);
+		new GUIWire(submodelModifiable, D2, dlatch2.getPin("D"), new Point[0]);
+		new GUIWire(submodelModifiable, D3, dlatch3.getPin("D"), new Point[0]);
+		new GUIWire(submodelModifiable, D4, dlatch4.getPin("D"), new Point[0]);
+		new GUIWire(submodelModifiable, dlatch1.getPin("Q"), Q1, new Point[0]);
+		new GUIWire(submodelModifiable, dlatch2.getPin("Q"), Q2, new Point[0]);
+		new GUIWire(submodelModifiable, dlatch3.getPin("Q"), Q3, new Point[0]);
+		new GUIWire(submodelModifiable, dlatch4.getPin("Q"), Q4, new Point[0]);
 	}
 }
\ No newline at end of file