X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMerger.java;h=1bf8c80c80671eda62e75e43637199dac9b7e662;hb=32a3d41c11b96c2530c25b6059b4341a8b34a2e2;hp=cc23cebf1a8dae9dc49179cddcca40b73f6aa426;hpb=9c31e87700d7a4872f9caaa8bd3afe1f023d9926;p=Mograsim.git diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java index cc23cebf..1bf8c80c 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) {