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=8febda89a5d9b52e8b650818b3322eabcbf5783d;hb=c223a9de7b0ef783bcb4f7612da350583ca29abd;hp=27699bd9ca0b07c417a970ae7a42138d6e2aaf07;hpb=19ee1a7fdb06a1df65cd7df78fed935124496707;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 27699bd9..8febda89 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
@@ -165,13 +165,10 @@ public abstract class SubmodelComponent extends GUIComponent
 	@Override
 	public void render(GeneralGC gc, Rectangle visibleRegion)
 	{
-		double posX = getBounds().x;
-		double posY = getBounds().y;
-
 		GCConfig conf = new GCConfig(gc);
-		TranslatedGC tgc = new TranslatedGC(gc, posX, posY, submodelScale, true);
+		TranslatedGC tgc = new TranslatedGC(gc, getPosX(), getPosY(), submodelScale, true);
 		conf.reset(tgc);
-		double visibleRegionFillRatio = Math.max(getBounds().width / visibleRegion.width, getBounds().height / visibleRegion.height);
+		double visibleRegionFillRatio = Math.max(getWidth() / visibleRegion.width, getHeight() / visibleRegion.height);
 		double alphaFactor = map(visibleRegionFillRatio, maxVisibleRegionFillRatioForAlpha0, minVisibleRegionFillRatioForAlpha1, 0, 1);
 		alphaFactor = Math.max(0, Math.min(1, alphaFactor));
 		// we need to take the old alpha into account to support nested submodules better.
@@ -181,7 +178,7 @@ public abstract class SubmodelComponent extends GUIComponent
 		if (submodelAlpha != 0)
 		{
 			gc.setAlpha(submodelAlpha);
-			renderer.render(tgc, visibleRegion.translate(posX / submodelScale, posY / submodelScale, 1 / submodelScale));
+			renderer.render(tgc, visibleRegion.translate(getPosX() / submodelScale, getPosY() / submodelScale, 1 / submodelScale));
 		}
 		if (labelAlpha != 0)
 		{
@@ -205,13 +202,12 @@ public abstract class SubmodelComponent extends GUIComponent
 	@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;
+		double scaledX = (x - getPosX()) / submodelScale;
+		double scaledY = (y - getPosY()) / submodelScale;
+		for (GUIComponent component : submodel.getComponents())
+			if (component.getBounds().contains(scaledX, scaledY) && component.clicked(scaledX, scaledY))
+				return true;
+		return false;
 	}
 
 	/**
@@ -223,9 +219,8 @@ public abstract class SubmodelComponent extends GUIComponent
 		params.type = SubmodelComponent.class.getSimpleName();
 		params.composition = calculateCompositionParams();
 
-		Rectangle bounds = getBounds();
-		params.width = bounds.width;
-		params.height = bounds.height;
+		params.width = getWidth();
+		params.height = getHeight();
 
 		InterfacePinParams[] iPins = new InterfacePinParams[getPins().size()];
 		int i = 0;
@@ -257,9 +252,8 @@ public abstract class SubmodelComponent extends GUIComponent
 			GUIComponent component = componentIt.next();
 			InnerComponentParams inner = new InnerComponentParams();
 			comps[i] = inner;
-			inner.logicWidth = component.getPins().iterator().next().logicWidth; // TODO This could be done a little more elegantly
-			Rectangle bounds = component.getBounds();
-			inner.pos = new Point(bounds.x, bounds.y);
+			inner.params = component.getInstantiationParameters();
+			inner.pos = new Point(getPosX(), getPosY());
 			inner.type = component.getIdentifier();
 			i++;
 		}