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=5e16c099387b7f56f12ce1bd012c773ca67e5f50;hb=f84fb965a1f4dc6d6675445426d4e68aa5b989fb;hp=6f3e951e49096812940889c724971b5aba4a1524;hpb=506435012240652d7a71b8597cc868853409e397;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 6f3e951e..5e16c099 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
@@ -37,7 +37,6 @@ public class GUI_rsLatch extends SubmodelComponent
 	@SuppressWarnings("unused") // for GUIWires being created
 	private void initSubmodelComponents(Pin _S, Pin _R, Pin Q, Pin _Q)
 	{
-
 		GUINandGate nand1 = new GUINandGate(submodelModifiable, 1);
 		GUINandGate nand2 = new GUINandGate(submodelModifiable, 1);
 
@@ -51,14 +50,14 @@ public class GUI_rsLatch extends SubmodelComponent
 
 		new GUIWire(submodelModifiable, _S, nand1.getInputPins().get(0));
 		new GUIWire(submodelModifiable, _R, nand2.getInputPins().get(1));
-		new GUIWire(submodelModifiable, nand1.getOutputPin(), cp1.getPin());
-		new GUIWire(submodelModifiable, nand2.getOutputPin(), cp2.getPin());
-		new GUIWire(submodelModifiable, cp1.getPin(), nand2.getInputPins().get(0), new Point(120, 50), new Point(60, 75),
+		new GUIWire(submodelModifiable, nand1.getOutputPin(), cp1);
+		new GUIWire(submodelModifiable, nand2.getOutputPin(), cp2);
+		new GUIWire(submodelModifiable, cp1, nand2.getInputPins().get(0), new Point(120, 50), new Point(60, 75),
 				new Point(60, 90));
-		new GUIWire(submodelModifiable, cp2.getPin(), nand1.getInputPins().get(1), new Point(120, 75), new Point(60, 50),
+		new GUIWire(submodelModifiable, cp2, nand1.getInputPins().get(1), new Point(120, 75), new Point(60, 50),
 				new Point(60, 35));
-		new GUIWire(submodelModifiable, cp1.getPin(), Q, new Point(150, 30), new Point(150, 25));
-		new GUIWire(submodelModifiable, cp2.getPin(), _Q, new Point(150, 95), new Point(150, 100));
+		new GUIWire(submodelModifiable, cp1, Q, new Point(150, 30), new Point(150, 25));
+		new GUIWire(submodelModifiable, cp2, _Q, new Point(150, 95), new Point(150, 100));
 	}
 
 	public Pin getPin_S()