X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMerger.java;fp=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMerger.java;h=dd15f1734d98afcbd95eb9bde7d58eb6d4f37bf3;hb=873c7cd58e0a035e68b5af352260da9f4d667c96;hp=601b434dae6d4245f26db6f3cffbc594f46fa7c8;hpb=340eb95b6ab64f2c1a784d1dc36002537b1cbd15;p=Mograsim.git diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java index 601b434d..dd15f173 100644 --- a/LogicUI/src/era/mi/gui/components/GUIMerger.java +++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java @@ -13,10 +13,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; public class GUIMerger extends Merger implements BasicGUIComponent { - private final int inputCount; - private final double height; - private final List connectedWireArrays; - private final List wireArrayConnectionPoints; + private final int inputCount; + private final double height; + private final List connectedWireArrays; + private final List wireArrayConnectionPoints; public GUIMerger(WireArray union, WireArray... inputs) { @@ -31,7 +31,7 @@ public class GUIMerger extends Merger implements BasicGUIComponent { connectedWireArraysModifiable.addAll(Arrays.asList(inputs)); double inputHeight = 0; - for(int i = 0; i < inputCount; i ++, inputHeight += 10) + for (int i = 0; i < inputCount; i++, inputHeight += 10) wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight)); } @@ -47,11 +47,12 @@ public class GUIMerger extends Merger implements BasicGUIComponent { return new Rectangle(0, 0, 20, height); } + @Override public void render(GeneralGC gc) { double inputHeight = 0; - for(int i = 0; i < inputCount; i ++, inputHeight += 10) + for (int i = 0; i < inputCount; i++, inputHeight += 10) gc.drawLine(0, inputHeight, 10, inputHeight); gc.drawLine(10, 0, 10, height); gc.drawLine(10, height / 2, 20, height / 2); @@ -62,11 +63,13 @@ public class GUIMerger extends Merger implements BasicGUIComponent { return connectedWireArrays.size(); } + @Override public WireArray getConnectedWireArray(int connectionIndex) { return connectedWireArrays.get(connectionIndex); } + @Override public Point getWireArrayConnectionPoint(int connectionI) {