Implemented SubmodelComponent#getParamsForSerializing

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / submodels / SubmodelComponent.java

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
index 51e74dd..bcf85ae 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import net.haspamelodica.swt.helper.gcs.GCConfig;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
@@ -15,13 +16,18 @@ import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
+import net.mograsim.logic.model.serializing.SubmodelComponentParams;
+import net.mograsim.logic.model.serializing.SubmodelComponentSerializer;
 import net.mograsim.logic.model.snippets.Renderer;
+import net.mograsim.logic.model.util.JsonHandler;
 
 /**
  * A {@link GUIComponent} consisting of another model. A <code>SubmodelComponent</code> can have so-called "interface pins" connecting the
  * inner and outer models.
  */
-//TODO override getParams
 public abstract class SubmodelComponent extends GUIComponent
 {
        public static final String SUBMODEL_INTERFACE_NAME = "_submodelinterface";
@@ -106,10 +112,17 @@ public abstract class SubmodelComponent extends GUIComponent
                this.submodelInterface = new SubmodelInterface(submodelModifiable, SUBMODEL_INTERFACE_NAME);
 
                this.submodelScale = 1;
-               this.maxVisibleRegionFillRatioForAlpha0 = 0.4;
-               this.minVisibleRegionFillRatioForAlpha1 = 0.8;
+               this.maxVisibleRegionFillRatioForAlpha0 = 0.8;
+               this.minVisibleRegionFillRatioForAlpha1 = 0.9;
                this.renderer = new LogicUIRenderer(submodelModifiable);
 
+               Consumer<Runnable> redrawHandlerChangedListener = submodelModifiable::setRedrawHandler;
+               model.addRedrawHandlerChangedListener(redrawHandlerChangedListener);
+               model.addComponentRemovedListener(c ->
+               {
+                       if (c == this)
+                               model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
+               });
                submodelModifiable.setRedrawHandler(model.getRedrawHandler());
        }
 
@@ -129,8 +142,24 @@ public abstract class SubmodelComponent extends GUIComponent
                super.addPin(supermodelPin);// do this first to be fail-fast if the supermodel does not belong to this component
 
                String name = supermodelPin.name;
-               MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, supermodelPin.getRelX() / submodelScale,
-                               supermodelPin.getRelY() / submodelScale);
+               // TODO if we upgrade to Java 12, replace with switch-expression
+               PinUsage submodelPinUsage;
+               switch (supermodelPin.usage)
+               {
+               case INPUT:
+                       submodelPinUsage = PinUsage.OUTPUT;
+                       break;
+               case OUTPUT:
+                       submodelPinUsage = PinUsage.INPUT;
+                       break;
+               case TRISTATE:
+                       submodelPinUsage = PinUsage.TRISTATE;
+                       break;
+               default:
+                       throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage);
+               }
+               MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
+                               supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale);
 
                submodelPin.addPinMovedListener(p ->
                {
@@ -321,6 +350,17 @@ public abstract class SubmodelComponent extends GUIComponent
                return outlineRenderer;
        }
 
+       @Override
+       public boolean clicked(double x, double y)
+       {
+               double scaledX = (x - getPosX()) / submodelScale;
+               double scaledY = (y - getPosY()) / submodelScale;
+               for (GUIComponent component : submodel.getComponentsByName().values())
+                       if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
+                               return true;
+               return false;
+       }
+
        @Override
        public void render(GeneralGC gc, Rectangle visibleRegion)
        {
@@ -376,15 +416,12 @@ public abstract class SubmodelComponent extends GUIComponent
                return mapMin + (val - valMin) * (mapMax - mapMin) / (valMax - valMin);
        }
 
+       // serializing
+
        @Override
-       public boolean clicked(double x, double y)
+       public SubmodelComponentParams getParamsForSerializing(IdentifierGetter idGetter)
        {
-               double scaledX = (x - getPosX()) / submodelScale;
-               double scaledY = (y - getPosY()) / submodelScale;
-               for (GUIComponent component : submodel.getComponentsByName().values())
-                       if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
-                               return true;
-               return false;
+               return SubmodelComponentSerializer.serialize(this, idGetter);
        }
 
        // operations no longer supported
@@ -400,4 +437,10 @@ public abstract class SubmodelComponent extends GUIComponent
        {
                throw new UnsupportedOperationException("Can't remove pins of a SubmodelComponent directly, call removeSubmodelInterface instead");
        }
+
+       static
+       {
+               IndirectGUIComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(),
+                               (m, p, n) -> SubmodelComponentSerializer.deserialize(m, JsonHandler.fromJsonTree(p, SubmodelComponentParams.class), n));
+       }
 }
\ No newline at end of file