Fixed GUIMerger/GUISplitter rendering

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
index fc1743b..4d29042 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIMerger.java
@@ -1,5 +1,7 @@
 package net.mograsim.logic.model.model.components.atomic;
 
+import org.eclipse.swt.SWT;
+
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
@@ -10,6 +12,7 @@ import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter;
 import net.mograsim.logic.model.modeladapter.componentadapters.MergerAdapter;
 import net.mograsim.logic.model.serializing.IdentifierGetter;
@@ -20,23 +23,30 @@ import net.mograsim.preferences.Preferences;
 
 public class GUIMerger extends GUIComponent
 {
-       private static final double width = 20;
+       private static final double width = 10;
        private static final double heightPerPin = 10;
 
        public final int logicWidth;
+       private final Pin outputPin;
 
-       private ReadEnd[] inputEnds;
+       private final ReadEnd[] inputEnds;
        private ReadEnd outputEnd;
 
+       public GUIMerger(ViewModelModifiable model, int logicWidth)
+       {
+               this(model, logicWidth, null);
+       }
+
        public GUIMerger(ViewModelModifiable model, int logicWidth, String name)
        {
                super(model, name);
                this.logicWidth = logicWidth;
-               setSize(width, logicWidth * heightPerPin);
-               double inputHeight = 0;
-               for (int i = 0; i < logicWidth; i++, inputHeight += 10)
-                       addPin(new Pin(this, "I" + i, 1, 0, inputHeight));
-               addPin(new Pin(this, "O", logicWidth, width, logicWidth * heightPerPin / 2));
+               setSize(width, (logicWidth - 1) * heightPerPin);
+               double inputHeight = (logicWidth - 1) * heightPerPin;
+               for (int i = 0; i < logicWidth; i++, inputHeight -= 10)
+                       addPin(new Pin(this, "I" + i, 1, PinUsage.TRISTATE, 0, inputHeight));
+               addPin(this.outputPin = new Pin(this, "O", logicWidth, PinUsage.TRISTATE, width, (logicWidth - 1) * heightPerPin / 2));
+               inputEnds = new ReadEnd[logicWidth];
        }
 
        @Override
@@ -45,20 +55,26 @@ public class GUIMerger extends GUIComponent
                double posX = getPosX();
                double posY = getPosY();
 
-               double inputHeight = posY;
-               for (int i = 0; i < logicWidth; i++, inputHeight += 10)
+               ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
+               if (c != null)
+                       gc.setForeground(ColorManager.current().toColor(c));
+               double outLineY = posY + (logicWidth - 1) * heightPerPin / 2;
+               gc.drawLine(posX + width / 2, outLineY, posX + width, outLineY);
+               double inputHeight = posY + (logicWidth - 1) * heightPerPin;
+               for (int i = 0; i < logicWidth; i++, inputHeight -= 10)
                {
-                       ColorDefinition c = BitVectorFormatter.formatAsColor(inputEnds[i]);
+                       c = BitVectorFormatter.formatAsColor(inputEnds[i]);
                        if (c != null)
                                gc.setForeground(ColorManager.current().toColor(c));
                        gc.drawLine(posX, inputHeight, posX + width / 2, inputHeight);
                }
                gc.setForeground(Preferences.current().getColor("net.mograsim.logic.model.color.foreground"));
+               int oldLineCap = gc.getLineCap();
+               int lineJoin = gc.getLineJoin();
+               // TODO find better "replacement" for JOIN_BEVEL
+               gc.setLineCap(lineJoin == SWT.JOIN_MITER ? SWT.CAP_SQUARE : lineJoin == SWT.JOIN_ROUND ? SWT.CAP_ROUND : SWT.CAP_SQUARE);
                gc.drawLine(posX + width / 2, posY, posX + width / 2, posY + heightPerPin * (logicWidth - 1));
-               ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
-               if (c != null)
-                       gc.setForeground(ColorManager.current().toColor(c));
-               gc.drawLine(posX + width / 2, posY + heightPerPin * logicWidth / 2, posX + width, posY + heightPerPin * logicWidth / 2);
+               gc.setLineCap(oldLineCap);
        }
 
        @Override
@@ -69,10 +85,15 @@ public class GUIMerger extends GUIComponent
 
        public void setLogicModelBinding(ReadEnd[] inputEnds, ReadEnd outputEnd)
        {
-               this.inputEnds = inputEnds;
+               System.arraycopy(inputEnds, 0, this.inputEnds, 0, logicWidth);
                this.outputEnd = outputEnd;
        }
 
+       public Pin getOutputPin()
+       {
+               return outputPin;
+       }
+
        static
        {
                ViewLogicModelAdapter.addComponentAdapter(new MergerAdapter());