X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2Fmi%2Fnandbased%2FGUI_rsLatch.java;h=b42a05ffd8f484eea97784d4e8fdb972f1b2be53;hb=a84700145147c263ad6692c99117a7cf37832378;hp=79315c90c40e1be7c25ca00de894b25e19200638;hpb=09197853bc44edb4fab75dccc8b870fd377e7df9;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
index 79315c90..b42a05ff 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUI_rsLatch.java
@@ -14,18 +14,18 @@ public class GUI_rsLatch extends SimpleRectangularSubmodelComponent
 	{
 		super(model, 1, "_rsLatch");
 		setSubmodelScale(.4);
-		setInputCount(2);
-		setOutputCount(2);
+		setInputPins("_S", "_R");
+		setOutputPins("Q", "_Q");
 		initSubmodelComponents();
 	}
 
 	@SuppressWarnings("unused") // for GUIWires being created
 	private void initSubmodelComponents()
 	{
-		Pin _S = getInputSubmodelPins().get(0);
-		Pin _R = getInputSubmodelPins().get(1);
-		Pin Q = getOutputSubmodelPins().get(0);
-		Pin _Q = getOutputSubmodelPins().get(1);
+		Pin _S = getSubmodelPin("_S");
+		Pin _R = getSubmodelPin("_R");
+		Pin Q = getSubmodelPin("Q");
+		Pin _Q = getSubmodelPin("_Q");
 
 		GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
@@ -35,15 +35,15 @@ public class GUI_rsLatch extends SimpleRectangularSubmodelComponent
 
 		nand1.moveTo(10, 7.5);
 		nand2.moveTo(40, 12.5);
-		cp1.moveTo(35, 17.5);
-		cp2.moveTo(65, 37.5);
+		cp1.moveCenterTo(35, 17.5);
+		cp2.moveCenterTo(65, 37.5);
 
-		new GUIWire(submodelModifiable, _S, nand1.getInputPins().get(0), new Point[0]);
-		new GUIWire(submodelModifiable, _R, nand2.getInputPins().get(1), new Point(35, 37.5), new Point(35, 27.5));
-		new GUIWire(submodelModifiable, nand1.getOutputPin(), cp1, new Point[0]);
-		new GUIWire(submodelModifiable, nand2.getOutputPin(), cp2, new Point(65, 22.5));
-		new GUIWire(submodelModifiable, cp1, nand2.getInputPins().get(0), new Point[0]);
-		new GUIWire(submodelModifiable, cp2, nand1.getInputPins().get(1), new Point(65, 42.5), new Point(5, 42.5), new Point(5, 22.5));
+		new GUIWire(submodelModifiable, _S, nand1.getPin("A"), new Point[0]);
+		new GUIWire(submodelModifiable, _R, nand2.getPin("B"), new Point(35, 37.5), new Point(35, 27.5));
+		new GUIWire(submodelModifiable, nand1.getPin("Y"), cp1, new Point[0]);
+		new GUIWire(submodelModifiable, nand2.getPin("Y"), cp2, new Point(65, 22.5));
+		new GUIWire(submodelModifiable, cp1, nand2.getPin("A"), new Point[0]);
+		new GUIWire(submodelModifiable, cp2, nand1.getPin("B"), new Point(65, 42.5), new Point(5, 42.5), new Point(5, 22.5));
 		new GUIWire(submodelModifiable, cp1, Q, new Point(35, 17.5), new Point(35, 7.5), new Point(65, 7.5), new Point(65, 12.5));
 		new GUIWire(submodelModifiable, cp2, _Q, new Point[0]);
 	}