Implemented GUISplitter and GUIMerger

diff --git a/LogicUI/src/LogicUI.java b/LogicUI/src/LogicUI.java
index 3bce12d..34ac68b 100644 (file)
--- a/LogicUI/src/LogicUI.java
+++ b/LogicUI/src/LogicUI.java
@@ -9,10 +9,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;\r
 \r
 import era.mi.components.gui.BasicGUIComponent;\r
+import era.mi.components.gui.GUIMerger;\r
 import era.mi.components.gui.GUIMux;\r
+import era.mi.components.gui.GUISplitter;\r
 import era.mi.logic.Simulation;\r
-import era.mi.logic.components.Merger;\r
-import era.mi.logic.components.Splitter;\r
 import era.mi.logic.components.gates.AndGate;\r
 import era.mi.logic.components.gates.NotGate;\r
 import era.mi.logic.wires.WireArray;\r
@@ -52,9 +52,9 @@ public class LogicUI
                                f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1), j = new WireArray(1, 1), k = new WireArray(1, 1);\r
                new AndGate(1, f, a, b);\r
                new NotGate(1, f, g);\r
-               new Merger(h, c, g);\r
+               addComponent(new GUIMerger(h, c, g), 70, 10);\r
                addComponent(new GUIMux(1, i, e, h, d), 10, 10);\r
-               new Splitter(i, k, j);\r
+               addComponent(new GUISplitter(i, k, j), 40, 10);\r
        }\r
        private void addComponent(BasicGUIComponent component, double x, double y)\r
        {\r

diff --git a/LogicUI/src/era/mi/components/gui/GUIMerger.java b/LogicUI/src/era/mi/components/gui/GUIMerger.java
new file mode 100644 (file)
index 0000000..0abe968
--- /dev/null
+++ b/LogicUI/src/era/mi/components/gui/GUIMerger.java
@@ -0,0 +1,69 @@
+package era.mi.components.gui;\r
+\r
+import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.Collections;\r
+import java.util.List;\r
+\r
+import era.mi.logic.components.Merger;\r
+import era.mi.logic.wires.WireArray;\r
+import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
+\r
+public class GUIMerger extends Merger implements BasicGUIComponent\r
+{\r
+       private final int                               inputCount;\r
+       private final double                    height;\r
+       private final List<WireArray>   connectedWireArrays;\r
+       private final List<Point>               wireArrayConnectionPoints;\r
+\r
+       public GUIMerger(WireArray union, WireArray... inputs)\r
+       {\r
+               super(union, inputs);\r
+\r
+               List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
+               List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
+\r
+               this.inputCount = inputs.length;\r
+               this.height = (inputCount - 1) * 10;\r
+\r
+               {\r
+                       connectedWireArraysModifiable.addAll(Arrays.asList(inputs));\r
+                       double inputHeight = 0;\r
+                       for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                               wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
+               }\r
+\r
+               connectedWireArraysModifiable.add(union);\r
+               wireArrayConnectionPointsModifiable.add(new Point(20, height / 2));\r
+\r
+               this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);\r
+               this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);\r
+       }\r
+\r
+       @Override\r
+       public void render(GeneralGC gc)\r
+       {\r
+               double inputHeight = 0;\r
+               for(int i = 0; i < inputCount; i ++, inputHeight += 10)\r
+                       gc.drawLine(0, inputHeight, 10, inputHeight);\r
+               gc.drawLine(10, 0, 10, height);\r
+               gc.drawLine(10, height / 2, 20, height / 2);\r
+       }\r
+\r
+       @Override\r
+       public int getConnectedWireArraysCount()\r
+       {\r
+               return connectedWireArrays.size();\r
+       }\r
+       @Override\r
+       public WireArray getConnectedWireArray(int connectionIndex)\r
+       {\r
+               return connectedWireArrays.get(connectionIndex);\r
+       }\r
+       @Override\r
+       public Point getWireArrayConnectionPoint(int connectionI)\r
+       {\r
+               return wireArrayConnectionPoints.get(connectionI);\r
+       }\r
+}
\ No newline at end of file

diff --git a/LogicUI/src/era/mi/components/gui/GUISplitter.java b/LogicUI/src/era/mi/components/gui/GUISplitter.java
new file mode 100644 (file)
index 0000000..b8a67f2
--- /dev/null
+++ b/LogicUI/src/era/mi/components/gui/GUISplitter.java
@@ -0,0 +1,69 @@
+package era.mi.components.gui;\r
+\r
+import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.Collections;\r
+import java.util.List;\r
+\r
+import era.mi.logic.components.Splitter;\r
+import era.mi.logic.wires.WireArray;\r
+import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
+\r
+public class GUISplitter extends Splitter implements BasicGUIComponent\r
+{\r
+       private final int                               outputCount;\r
+       private final double                    height;\r
+       private final List<WireArray>   connectedWireArrays;\r
+       private final List<Point>               wireArrayConnectionPoints;\r
+\r
+       public GUISplitter(WireArray input, WireArray... outputs)\r
+       {\r
+               super(input, outputs);\r
+\r
+               List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
+               List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
+\r
+               this.outputCount = outputs.length;\r
+               this.height = (outputCount - 1) * 10;\r
+\r
+               connectedWireArraysModifiable.add(input);\r
+               wireArrayConnectionPointsModifiable.add(new Point(0, height / 2));\r
+\r
+               {\r
+                       connectedWireArraysModifiable.addAll(Arrays.asList(outputs));\r
+                       double outputHeight = 0;\r
+                       for(int i = 0; i < outputCount; i ++, outputHeight += 10)\r
+                               wireArrayConnectionPointsModifiable.add(new Point(20, outputHeight));\r
+               }\r
+\r
+               this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);\r
+               this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);\r
+       }\r
+\r
+       @Override\r
+       public void render(GeneralGC gc)\r
+       {\r
+               gc.drawLine(0, height / 2, 10, height / 2);\r
+               gc.drawLine(10, 0, 10, height);\r
+               double outputHeight = 0;\r
+               for(int i = 0; i < outputCount; i ++, outputHeight += 10)\r
+                       gc.drawLine(10, outputHeight, 20, outputHeight);\r
+       }\r
+\r
+       @Override\r
+       public int getConnectedWireArraysCount()\r
+       {\r
+               return connectedWireArrays.size();\r
+       }\r
+       @Override\r
+       public WireArray getConnectedWireArray(int connectionIndex)\r
+       {\r
+               return connectedWireArrays.get(connectionIndex);\r
+       }\r
+       @Override\r
+       public Point getWireArrayConnectionPoint(int connectionI)\r
+       {\r
+               return wireArrayConnectionPoints.get(connectionI);\r
+       }\r
+}
\ No newline at end of file