SubmodelComponent now prints click coordinates

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / components / SubmodelComponent.java

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 eca0df6..8068e06 100644 (file)
--- 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
@@ -5,7 +5,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import net.haspamelodica.swt.helper.gcs.GCDefaultConfig;
+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;
@@ -45,7 +45,7 @@ public class SubmodelComponent extends GUIComponent
 
                this.label = label;
                this.submodelScale = 1;
-               this.maxVisibleRegionFillRatioForAlpha0 = 0.1;
+               this.maxVisibleRegionFillRatioForAlpha0 = 0.4;
                this.minVisibleRegionFillRatioForAlpha1 = 0.8;
                this.renderer = new LogicUIRenderer(submodelModifiable);
 
@@ -139,7 +139,7 @@ public class SubmodelComponent extends GUIComponent
                double posX = getBounds().x;
                double posY = getBounds().y;
 
-               GCDefaultConfig conf = new GCDefaultConfig(gc);
+               GCConfig conf = new GCConfig(gc);
                TranslatedGC tgc = new TranslatedGC(gc, posX, posY, submodelScale, true);
                conf.reset(tgc);
                double visibleRegionFillRatio = Math.max(getBounds().width / visibleRegion.width, getBounds().height / visibleRegion.height);
@@ -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, 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,14 @@ public class SubmodelComponent extends GUIComponent
                return mapMin + (val - valMin) * (mapMax - mapMin) / (valMax - valMin);
        }
 
+       @Override
+       public boolean clicked(double x, double y)
+       {
+               // TODO
+               System.out.println(((x - getBounds().x) / submodelScale) + "|" + ((y - getBounds().y) / submodelScale));
+               return true;
+       }
+
        private static class PinMovable extends Pin
        {
                public PinMovable(GUIComponent component, int logicWidth, double relX, double relY)