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=4a2f46c147bf69ebd1505a2768bebe6a8c297a54;hb=1f645882d229fc3d4081e4c5060559d75dc2cc24;hp=bcf85aeed0684b487a8c1fc91604739987a2339b;hpb=4b580a621ec0b174c70b1d9e3937f46394656aef;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 bcf85aee..4a2f46c1 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
@@ -11,34 +11,35 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.LogicUIRenderer;
-import net.mograsim.logic.model.model.ViewModel;
-import net.mograsim.logic.model.model.ViewModelModifiable;
-import net.mograsim.logic.model.model.components.GUIComponent;
+import net.mograsim.logic.model.model.LogicModel;
+import net.mograsim.logic.model.model.LogicModelModifiable;
+import net.mograsim.logic.model.model.components.ModelComponent;
 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.IdentifyParams;
+import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
 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;
+import net.mograsim.preferences.Preferences;
 
 /**
- * A {@link GUIComponent} consisting of another model. A <code>SubmodelComponent</code> can have so-called "interface pins" connecting the
+ * A {@link ModelComponent} consisting of another model. A <code>SubmodelComponent</code> can have so-called "interface pins" connecting the
  * inner and outer models.
  */
-public abstract class SubmodelComponent extends GUIComponent
+public abstract class SubmodelComponent extends ModelComponent
 {
 	public static final String SUBMODEL_INTERFACE_NAME = "_submodelinterface";
 	/**
 	 * A modifiable view of {@link #submodel}.
 	 */
-	protected final ViewModelModifiable submodelModifiable;
+	protected final LogicModelModifiable submodelModifiable;
 	/**
 	 * The model this {@link SubmodelComponent} consists of.
 	 */
-	public final ViewModel submodel;
+	public final LogicModel submodel;
 	/**
 	 * The list of all submodel interface pins of this {@link SubmodelComponent} on the submodel side.
 	 */
@@ -98,10 +99,10 @@ public abstract class SubmodelComponent extends GUIComponent
 
 	// creation and destruction
 
-	public SubmodelComponent(ViewModelModifiable model, String name)
+	public SubmodelComponent(LogicModelModifiable model, String name)
 	{
 		super(model, name);
-		this.submodelModifiable = new ViewModelModifiable();
+		this.submodelModifiable = new LogicModelModifiable();
 		this.submodel = submodelModifiable;
 		this.submodelPins = new HashMap<>();
 		this.submodelMovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
@@ -158,7 +159,7 @@ public abstract class SubmodelComponent extends GUIComponent
 		default:
 			throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage);
 		}
-		MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
+		MovablePin submodelPin = new MovablePin(model, submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
 				supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale);
 
 		submodelPin.addPinMovedListener(p ->
@@ -355,7 +356,7 @@ public abstract class SubmodelComponent extends GUIComponent
 	{
 		double scaledX = (x - getPosX()) / submodelScale;
 		double scaledY = (y - getPosY()) / submodelScale;
-		for (GUIComponent component : submodel.getComponentsByName().values())
+		for (ModelComponent component : submodel.getComponentsByName().values())
 			if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
 				return true;
 		return false;
@@ -365,7 +366,7 @@ public abstract class SubmodelComponent extends GUIComponent
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
 		GCConfig conf = new GCConfig(gc);
-		TranslatedGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
+		GeneralGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
 		conf.reset(tgc);
 		double visibleRegionFillRatio = Math.max(getWidth() / visibleRegion.width, getHeight() / visibleRegion.height);
 		double alphaFactor = map(visibleRegionFillRatio, maxVisibleRegionFillRatioForAlpha0, minVisibleRegionFillRatioForAlpha1, 0, 1);
@@ -385,6 +386,8 @@ public abstract class SubmodelComponent extends GUIComponent
 			renderSymbol(gc, visibleRegion);
 		}
 		conf.reset(gc);
+		// reset line width explicitly to avoid rounding errors causing weird glitches
+		gc.setLineWidth(Preferences.current().getDouble("net.mograsim.logic.model.linewidth.default"));
 		// draw the outline after all other operations to make interface pins look better
 		renderOutline(gc, visibleRegion);
 	}
@@ -419,9 +422,15 @@ public abstract class SubmodelComponent extends GUIComponent
 	// serializing
 
 	@Override
-	public SubmodelComponentParams getParamsForSerializing(IdentifierGetter idGetter)
+	public String getIDForSerializing(IdentifyParams idParams)
 	{
-		return SubmodelComponentSerializer.serialize(this, idGetter);
+		return "submodel";// TODO what ID?
+	}
+
+	@Override
+	public SubmodelComponentParams getParamsForSerializing(IdentifyParams idParams)
+	{
+		return SubmodelComponentSerializer.serialize(this, idParams);
 	}
 
 	// operations no longer supported
@@ -440,7 +449,7 @@ public abstract class SubmodelComponent extends GUIComponent
 
 	static
 	{
-		IndirectGUIComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(),
+		IndirectModelComponentCreator.setComponentSupplier(SubmodelComponent.class.getCanonicalName(),
 				(m, p, n) -> SubmodelComponentSerializer.deserialize(m, JsonHandler.fromJsonTree(p, SubmodelComponentParams.class), n));
 	}
 }
\ No newline at end of file