Renamed core components to have the common prefix Core

[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 313a51a..804f871 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
@@ -5,14 +5,14 @@ import org.eclipse.swt.SWT;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.types.BitVectorFormatter;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire.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;
+import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.preferences.ColorDefinition;
 import net.mograsim.preferences.ColorManager;
@@ -55,10 +55,13 @@ public class GUIMerger extends GUIComponent
                ColorDefinition c = BitVectorFormatter.formatAsColor(outputEnd);
                if (c != null)
                        gc.setForeground(ColorManager.current().toColor(c));
+               gc.setLineWidth(
+                               Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire." + (logicWidth == 1 ? "singlebit" : "multibit")));
                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)
+               gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.wire.singlebit"));
+               double inputHeight = posY;
+               for (int i = 0; i < logicWidth; i++, inputHeight += 10)
                {
                        c = BitVectorFormatter.formatAsColor(inputEnds[i]);
                        if (c != null)
@@ -69,13 +72,21 @@ public class GUIMerger extends GUIComponent
                int oldLineCap = gc.getLineCap();
                int lineJoin = gc.getLineJoin();
                // TODO find better "replacement" for JOIN_BEVEL
+               // TODO it looks weird that the vertical line is thinner than the single multibit wire.
                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));
+               gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default"));
                gc.setLineCap(oldLineCap);
        }
 
        @Override
-       public Integer getParamsForSerializing(IdentifierGetter idGetter)
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "GUIMerger";
+       }
+
+       @Override
+       public Integer getParamsForSerializing(IdentifyParams idParams)
        {
                return logicWidth;
        }