X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Futil%2FModellingTool.java;h=1f19edb7451996e1656d06bcf3567fa3d1c32393;hb=4c9a2240352c246c76a056687a2d68208137b667;hp=f3b9424d3885a339a38e41185e446c96a16c0033;hpb=47ea68ed5c444dd14864412639f6a6fd60ab8a0f;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java index f3b9424d..1f19edb7 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/ModellingTool.java @@ -17,47 +17,92 @@ public class ModellingTool public GUIWire connect(GUIComponent a, GUIComponent b, String pinA, String pinB) { - return connect(a.getPin(pinA), b.getPin(pinB)); + return connect(null, a, b, pinA, pinB); } public GUIWire connect(WireCrossPoint a, GUIComponent b, String pinB) { - return connect(a.getPin(), b.getPin(pinB)); + return connect(null, a, b, pinB); } public GUIWire connect(Pin a, GUIComponent b, String pinB) { - return connect(a, b.getPin(pinB)); + return connect(null, a, b, pinB); } public GUIWire connect(GUIComponent a, WireCrossPoint b, String pinA) { - return connect(a.getPin(pinA), b.getPin()); + return connect(null, a, b, pinA); } public GUIWire connect(WireCrossPoint a, WireCrossPoint b) { - return connect(a.getPin(), b.getPin()); + return connect(null, a, b); } public GUIWire connect(Pin a, WireCrossPoint b) { - return connect(a, b.getPin()); + return connect(null, a, b); } public GUIWire connect(GUIComponent a, Pin b, String pinA) { - return connect(a.getPin(pinA), b); + return connect(null, a, b, pinA); } public GUIWire connect(WireCrossPoint a, Pin b) { - return connect(a.getPin(), b); + return connect(null, a, b); } public GUIWire connect(Pin a, Pin b) { - return new GUIWire(model, a, b); + return connect(null, a, b); + } + + public GUIWire connect(String name, GUIComponent a, GUIComponent b, String pinA, String pinB) + { + return connect(name, a.getPin(pinA), b.getPin(pinB)); + } + + public GUIWire connect(String name, WireCrossPoint a, GUIComponent b, String pinB) + { + return connect(name, a.getPin(), b.getPin(pinB)); + } + + public GUIWire connect(String name, Pin a, GUIComponent b, String pinB) + { + return connect(name, a, b.getPin(pinB)); + } + + public GUIWire connect(String name, GUIComponent a, WireCrossPoint b, String pinA) + { + return connect(name, a.getPin(pinA), b.getPin()); + } + + public GUIWire connect(String name, WireCrossPoint a, WireCrossPoint b) + { + return connect(name, a.getPin(), b.getPin()); + } + + public GUIWire connect(String name, Pin a, WireCrossPoint b) + { + return connect(name, a, b.getPin()); + } + + public GUIWire connect(String name, GUIComponent a, Pin b, String pinA) + { + return connect(name, a.getPin(pinA), b); + } + + public GUIWire connect(String name, WireCrossPoint a, Pin b) + { + return connect(name, a.getPin(), b); + } + + public GUIWire connect(String name, Pin a, Pin b) + { + return new GUIWire(model, name, a, b); } public static ModellingTool createFor(ViewModelModifiable model)