X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FSubmodelComponent.java;h=a4fe1aa41d8785d75d52e74f525f9c9aea7e6040;hb=f05390137e98cbbffbbeccb8ed296fdfeeb222b0;hp=e62bea6206ba52c4eed1e8dd9015281b5ab10428;hpb=59794c0fc634d6833d60649295ab722aef68d00b;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
index e62bea62..a4fe1aa4 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/SubmodelComponent.java
@@ -8,15 +8,13 @@ import java.util.Map.Entry;
 import net.haspamelodica.swt.helper.gcs.GCConfig;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;
-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.ui.LogicUIRenderer;
 import net.mograsim.logic.ui.model.ViewModel;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
 import net.mograsim.logic.ui.model.wires.Pin;
 
-public class SubmodelComponent extends GUIComponent
+public abstract class SubmodelComponent extends GUIComponent
 {
 	protected final ViewModelModifiable submodelModifiable;
 	public final ViewModel submodel;
@@ -26,13 +24,12 @@ public class SubmodelComponent extends GUIComponent
 	private final Map<Pin, Pin> supermodelPinsPerSubmodelPinUnmodifiable;
 	private final SubmodelInterface submodelInterface;
 
-	private final String label;
 	private double submodelScale;
 	private double maxVisibleRegionFillRatioForAlpha0;
 	private double minVisibleRegionFillRatioForAlpha1;
 	private final LogicUIRenderer renderer;
 
-	public SubmodelComponent(ViewModelModifiable model, String label)
+	public SubmodelComponent(ViewModelModifiable model)
 	{
 		super(model);
 		this.submodelModifiable = new ViewModelModifiable();
@@ -43,9 +40,8 @@ public class SubmodelComponent extends GUIComponent
 		this.supermodelPinsPerSubmodelPinUnmodifiable = Collections.unmodifiableMap(supermodelPinsPerSubmodelPin);
 		this.submodelInterface = new SubmodelInterface(submodelModifiable);
 
-		this.label = label;
 		this.submodelScale = 1;
-		this.maxVisibleRegionFillRatioForAlpha0 = 0.1;
+		this.maxVisibleRegionFillRatioForAlpha0 = 0.4;
 		this.minVisibleRegionFillRatioForAlpha1 = 0.8;
 		this.renderer = new LogicUIRenderer(submodelModifiable);
 
@@ -147,25 +143,44 @@ public class SubmodelComponent extends GUIComponent
 		alphaFactor = Math.max(0, Math.min(1, alphaFactor));
 		// we need to take the old alpha into account to support nested submodules better.
 		int oldAlpha = gc.getAlpha();
-		gc.setAlpha(Math.max(0, Math.min(255, (int) (oldAlpha * alphaFactor))));
-		renderer.render(tgc, visibleRegion.translate(-posX, -posY, 1 / submodelScale));
-		gc.setAlpha(Math.max(0, Math.min(255, (int) (oldAlpha * (1 - alphaFactor)))));
-		Font oldFont = gc.getFont();
-		Font labelFont = new Font(oldFont.getName(), 6, oldFont.getStyle());
-		gc.setFont(labelFont);
-		Point textExtent = gc.textExtent(label);
-		gc.drawText(label, posX + (getBounds().width - textExtent.x) / 2, posY + (getBounds().height - textExtent.y) / 2, true);
-		gc.setFont(oldFont);
+		int submodelAlpha = Math.max(0, Math.min(255, (int) (oldAlpha * alphaFactor)));
+		int labelAlpha = Math.max(0, Math.min(255, (int) (oldAlpha * (1 - alphaFactor))));
+		if (submodelAlpha != 0)
+		{
+			gc.setAlpha(submodelAlpha);
+			renderer.render(tgc, visibleRegion.translate(posX / submodelScale, posY / submodelScale, 1 / submodelScale));
+		}
+		if (labelAlpha != 0)
+		{
+			gc.setAlpha(labelAlpha);
+			renderSymbol(gc, visibleRegion);
+		}
 		conf.reset(gc);
-		// draw the "bounding box" after all other operations to make interface pins look better
-		gc.drawRectangle(getBounds());
+		// draw the outline after all other operations to make interface pins look better
+		renderOutline(gc, visibleRegion);
 	}
 
+	protected abstract void renderOutline(GeneralGC gc, Rectangle visibleRegion);
+
+	protected abstract void renderSymbol(GeneralGC gc, Rectangle visibleRegion);
+
 	private static double map(double val, double valMin, double valMax, double mapMin, double mapMax)
 	{
 		return mapMin + (val - valMin) * (mapMax - mapMin) / (valMax - valMin);
 	}
 
+	@Override
+	public boolean clicked(double x, double y)
+	{
+		// TODO
+		double scaledX = (x - getBounds().x) / submodelScale;
+		double scaledY = (y - getBounds().y) / submodelScale;
+		double roundedScaledX = Math.round(scaledX / 5 * 2) * 5 / 2.;
+		double roundedScaledY = Math.round(scaledY / 5 * 2) * 5 / 2.;
+		System.out.println(scaledX + "|" + scaledY + ", rounded " + roundedScaledX + "|" + roundedScaledY);
+		return true;
+	}
+
 	private static class PinMovable extends Pin
 	{
 		public PinMovable(GUIComponent component, int logicWidth, double relX, double relY)