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=7dceec8cca92f86abc236c14ff65f1b556d86d22;hb=bb7fca85767fbcf2377586e81fd3dc77bcdcb662;hp=fe3ec07e81e77fea360b65600850837118bbc194;hpb=84b45562506ec2da460710a61f56203404d903a6;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 fe3ec07e..7dceec8c 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
@@ -147,15 +147,23 @@ 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, -posY, 1 / submodelScale));
+		}
+		if (labelAlpha != 0)
+		{
+			gc.setAlpha(labelAlpha);
+			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);
+		}
 		conf.reset(gc);
 		// draw the "bounding box" after all other operations to make interface pins look better
 		gc.drawRectangle(getBounds());
@@ -166,6 +174,18 @@ public class SubmodelComponent extends GUIComponent
 		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)