Vastly improved orientation calculation and implementation

[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 1d38516..daa7bd9 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,21 +2,24 @@ 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.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.IndirectGUIComponentCreator;
 import net.mograsim.preferences.Preferences;
 
@@ -26,11 +29,11 @@ public class GUIManualSwitch extends GUIComponent
        private static final double height = 15;
        private static final double fontHeight = 5;
 
+       public final int logicWidth;
        private final Pin outputPin;
 
        private final LogicObserver logicObs;
        private ManualSwitch logicSwitch;
-       private ReadEnd end;
 
        public GUIManualSwitch(ViewModelModifiable model, int logicWidth)
        {
@@ -40,21 +43,21 @@ public class GUIManualSwitch extends GUIComponent
        public GUIManualSwitch(ViewModelModifiable model, int logicWidth, String name)
        {
                super(model, name);
+               this.logicWidth = logicWidth;
                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);
@@ -66,14 +69,13 @@ public class GUIManualSwitch extends GUIComponent
                gc.setFont(oldFont);
        }
 
-       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()
@@ -110,18 +112,6 @@ 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)
        {
@@ -140,6 +130,12 @@ public class GUIManualSwitch extends GUIComponent
                return outputPin;
        }
 
+       @Override
+       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+       {
+               return new JsonPrimitive(logicWidth);
+       }
+
        static
        {
                ViewLogicModelAdapter.addComponentAdapter(new ManualSwitchAdapter());