X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Futil%2FModellingTool.java;h=c8cd5b92740292e16e6695e177ac82dd4eb70fa1;hb=a2eef1d1616d03af5b464f347f6176ea9d2cc75e;hp=61252ea4bb4ddc9244fed93b88c7d58889a8a190;hpb=6a7d43ee5a2b2964389e46fc027e47e426774ea1;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
index 61252ea4..c8cd5b92 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/ModellingTool.java
@@ -2,8 +2,9 @@ package net.mograsim.logic.ui.util;
 
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.components.GUIComponent;
-import net.mograsim.logic.ui.model.wires.ConnectionPoint;
 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 ModellingTool
 {
@@ -19,12 +20,42 @@ public class ModellingTool
 		return connect(a.getPin(pinA), b.getPin(pinB));
 	}
 
-	public GUIWire connect(ConnectionPoint a, GUIComponent b, String pinB)
+	public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB)
+	{
+		return connect(a.getPin(), b.getPin(pinB));
+	}
+
+	public GUIWire connect(Pin a, GUIComponent b, String pinB)
 	{
 		return connect(a, b.getPin(pinB));
 	}
 
-	public GUIWire connect(ConnectionPoint a, ConnectionPoint b)
+	public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA)
+	{
+		return connect(a.getPin(pinA), b.getPin());
+	}
+
+	public GUIWire connect(WireCrossPoint a, WireCrossPoint b)
+	{
+		return connect(a.getPin(), b.getPin());
+	}
+
+	public GUIWire connect(Pin a, WireCrossPoint b)
+	{
+		return connect(a, b.getPin());
+	}
+
+	public GUIWire connect(GUIComponent a, Pin b, String pinA)
+	{
+		return connect(a.getPin(pinA), b);
+	}
+
+	public GUIWire connect(WireCrossPoint a, Pin b)
+	{
+		return connect(a.getPin(), b);
+	}
+
+	public GUIWire connect(Pin a, Pin b)
 	{
 		return new GUIWire(model, a, b);
 	}