X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fsubmodels%2FSubmodelComponent.java;h=bcf85aeed0684b487a8c1fc91604739987a2339b;hb=4b580a621ec0b174c70b1d9e3937f46394656aef;hp=45c36bfb236df5a3018c2518f3461ad9172356b8;hpb=a47c9b1f38bbb6d2f5a3c482f3b09d1f42270401;p=Mograsim.git

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 45c36bfb..bcf85aee 100644
--- 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,11 +112,18 @@ 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);
 
-		submodelModifiable.addRedrawListener(this::requestRedraw);
+		Consumer<Runnable> redrawHandlerChangedListener = submodelModifiable::setRedrawHandler;
+		model.addRedrawHandlerChangedListener(redrawHandlerChangedListener);
+		model.addComponentRemovedListener(c ->
+		{
+			if (c == this)
+				model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
+		});
+		submodelModifiable.setRedrawHandler(model.getRedrawHandler());
 	}
 
 	// pins
@@ -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 ->
 		{
@@ -266,7 +295,7 @@ public abstract class SubmodelComponent extends GUIComponent
 		for (Entry<String, MovablePin> e : supermodelPins.entrySet())
 			getSubmodelMovablePin(e.getKey()).setRelPos(e.getValue().getRelX() * submodelScale, e.getValue().getRelY() * submodelScale);
 
-		requestRedraw();// needed if there is no submodel interface pin
+		model.requestRedraw();// needed if there is no submodel interface pin
 	}
 
 	/**
@@ -287,7 +316,7 @@ public abstract class SubmodelComponent extends GUIComponent
 	protected void setSymbolRenderer(Renderer symbolRenderer)
 	{
 		this.symbolRenderer = symbolRenderer;
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -308,7 +337,7 @@ public abstract class SubmodelComponent extends GUIComponent
 	protected void setOutlineRenderer(Renderer outlineRenderer)
 	{
 		this.outlineRenderer = outlineRenderer;
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -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