Made finding the ID of a JsonSerializable less ugly

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
index b9a09e3..fce4fff 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java
@@ -2,25 +2,22 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.core.LogicObservable;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.components.ManualSwitch;
+import net.mograsim.logic.core.types.Bit;
 import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.types.BitVectorFormatter;
-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.ManualSwitchAdapter;
-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.Preferences;
 
@@ -29,13 +26,13 @@ public class GUIManualSwitch extends GUIComponent
        private static final double width = 20;
        private static final double height = 15;
        private static final double fontHeight = 5;
+       private static final double heightMiniButtons = 4; // 0 is disabled
 
        public final int logicWidth;
        private final Pin outputPin;
 
        private final LogicObserver logicObs;
        private ManualSwitch logicSwitch;
-       private ReadEnd end;
 
        public GUIManualSwitch(ViewModelModifiable model, int logicWidth)
        {
@@ -49,18 +46,17 @@ public class GUIManualSwitch extends GUIComponent
                logicObs = (i) -> model.requestRedraw();
 
                setSize(width, height);
-               addPin(this.outputPin = new Pin(this, "", logicWidth, width, height / 2));
+               addPin(this.outputPin = new Pin(this, "", logicWidth, PinUsage.OUTPUT, width, height / 2));
        }
 
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {
-               // TODO maybe draw switch state too?
                Color foreground = Preferences.current().getColor("net.mograsim.logic.model.color.foreground");
                if (foreground != null)
                        gc.setForeground(foreground);
                gc.drawRectangle(getBounds());
-               String label = BitVectorFormatter.formatValueAsString(end);
+               String label = BitVectorFormatter.formatAsString(logicSwitch == null ? null : logicSwitch.getValues());
                Font oldFont = gc.getFont();
                Font labelFont = new Font(oldFont.getName(), fontHeight, oldFont.getStyle());
                gc.setFont(labelFont);
@@ -70,16 +66,39 @@ public class GUIManualSwitch extends GUIComponent
                        gc.setForeground(textColor);
                gc.drawText(label, getPosX() + (width - textExtent.x) / 2, getPosY() + (height - textExtent.y) / 2, true);
                gc.setFont(oldFont);
+
+               if (logicSwitch != null && logicWidth > 1 && heightMiniButtons > 0 && visibleRegion.y < getPosY() + heightMiniButtons)
+               {
+                       double x = getPosX();
+                       double y = getPosY();
+                       gc.drawLine(x, y + heightMiniButtons, x + width, y + heightMiniButtons);
+                       Color c = gc.getBackground();
+                       gc.setBackground(gc.getForeground());
+                       BitVector bv = logicSwitch.getValues();
+                       double part = width / bv.length();
+                       for (int i = 0; i < bv.length(); i++)
+                       {
+                               double start = x + part * i;
+                               if (i != 0)
+                                       gc.drawLine(start, y, start, y + heightMiniButtons);
+                               if (bv.getMSBit(i) == Bit.ONE)
+                               {
+//                                     gc.fillRectangle(start, y, part, heightMiniButtons); // alternative, but not always visible what Bit is where 
+                                       gc.drawLine(start, y, start + part, y + heightMiniButtons);
+                                       gc.drawLine(start + part, y, start, y + heightMiniButtons);
+                               }
+                       }
+                       gc.setBackground(c);
+               }
        }
 
-       public void setLogicModelBinding(ManualSwitch logicSwitch, ReadEnd end)
+       public void setLogicModelBinding(ManualSwitch logicSwitch)
        {
-               deregisterLogicObs(this.end);
-               deregisterLogicObs(this.logicSwitch);
+               if (this.logicSwitch != null)
+                       this.logicSwitch.deregisterObserver(logicObs);
                this.logicSwitch = logicSwitch;
-               this.end = end;
-               registerLogicObs(end);
-               registerLogicObs(logicSwitch);
+               if (logicSwitch != null)
+                       logicSwitch.registerObserver(logicObs);
        }
 
        public boolean hasLogicModelBinding()
@@ -116,23 +135,20 @@ public class GUIManualSwitch extends GUIComponent
                }
        }
 
-       private void registerLogicObs(LogicObservable observable)
-       {
-               if (observable != null)
-                       observable.registerObserver(logicObs);
-       }
-
-       private void deregisterLogicObs(LogicObservable observable)
-       {
-               if (observable != null)
-                       observable.deregisterObserver(logicObs);
-       }
-
        @Override
        public boolean clicked(double x, double y)
        {
                if (logicSwitch != null)
-                       logicSwitch.toggle();
+               {
+                       if (heightMiniButtons > 0 && y - getPosY() < heightMiniButtons)
+                       {
+                               int part = (int) ((x - getPosX()) * logicWidth / width);
+                               logicSwitch.setState(logicSwitch.getValues().withBitChanged(part, Bit::not));
+                       } else
+                       {
+                               logicSwitch.toggle();
+                       }
+               }
                return true;
        }
 
@@ -147,9 +163,15 @@ public class GUIManualSwitch extends GUIComponent
        }
 
        @Override
-       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "GUIManualSwitch";
+       }
+
+       @Override
+       public Integer getParamsForSerializing(IdentifyParams idParams)
        {
-               return new JsonPrimitive(logicWidth);
+               return logicWidth;
        }
 
        static