Improved rendering of GUIMerger and GUISplitter

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / atomic / GUISplitter.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
index 856eed9..08ce951 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUISplitter.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.model.components.atomic;\r
 \r
+import org.eclipse.swt.SWT;\r
+\r
 import com.google.gson.JsonElement;\r
 import com.google.gson.JsonPrimitive;\r
 \r
@@ -20,23 +22,24 @@ import net.mograsim.preferences.Preferences;
 \r
 public class GUISplitter extends GUIComponent\r
 {\r
-       private static final double width = 20;\r
+       private static final double width = 10;\r
        private static final double heightPerPin = 10;\r
 \r
        public final int logicWidth;\r
 \r
        private ReadEnd inputEnd;\r
-       private ReadEnd[] outputEnds;\r
+       private final ReadEnd[] outputEnds;\r
 \r
        public GUISplitter(ViewModelModifiable model, int logicWidth, String name)\r
        {\r
                super(model, name);\r
                this.logicWidth = logicWidth;\r
                setSize(width, logicWidth * heightPerPin);\r
-               addPin(new Pin(this, "I", logicWidth, 0, logicWidth * heightPerPin / 2));\r
+               addPin(new Pin(this, "I", logicWidth, 0, (logicWidth - 1) * heightPerPin / 2));\r
                double outputHeight = 0;\r
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)\r
                        addPin(new Pin(this, "O" + i, 1, width, outputHeight));\r
+               outputEnds = new ReadEnd[logicWidth];\r
        }\r
 \r
        @Override\r
@@ -48,9 +51,15 @@ public class GUISplitter extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnd);\r
                if (c != null)\r
                        gc.setForeground(ColorManager.current().toColor(c));\r
-               gc.drawLine(posX, posY + heightPerPin * logicWidth / 2, posX + width / 2, posY + heightPerPin * logicWidth / 2);\r
+               double inLineY = posY + (logicWidth - 1) * heightPerPin / 2;\r
+               gc.drawLine(posX, inLineY, posX + width / 2, inLineY);\r
                gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));\r
+               int oldLineCap = gc.getLineCap();\r
+               int lineJoin = gc.getLineJoin();\r
+               // TODO find better "replacement" for JOIN_BEVEL\r
+               gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);\r
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));\r
+               gc.setLineCap(oldLineCap);\r
                double outputHeight = posY;\r
                for (int i = 0; i < logicWidth; i++, outputHeight += 10)\r
                {\r
@@ -70,7 +79,7 @@ public class GUISplitter extends GUIComponent
        public void setLogicModelBinding(ReadEnd inputEnd, ReadEnd[] outputEnds)\r
        {\r
                this.inputEnd = inputEnd;\r
-               this.outputEnds = outputEnds;\r
+               System.arraycopy(outputEnds, 0, this.outputEnds, 0, logicWidth);\r
        }\r
 \r
        static\r