Fixed redraw bug: Changes in submodels didn't cause a redraw

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

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 4c1fec7..67209ca 100644 (file)
--- 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
@@ -4,6 +4,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Consumer;
 
 import net.haspamelodica.swt.helper.gcs.GCConfig;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
@@ -106,11 +107,18 @@ public abstract class SubmodelComponent extends GUIComponent
                this.submodelInterface = new SubmodelInterface(submodelModifiable, SUBMODEL_INTERFACE_NAME);
 
                this.submodelScale = 1;
-               this.maxVisibleRegionFillRatioForAlpha0 = 0.4;
-               this.minVisibleRegionFillRatioForAlpha1 = 0.8;
+               this.maxVisibleRegionFillRatioForAlpha0 = 0.8;
+               this.minVisibleRegionFillRatioForAlpha1 = 0.9;
                this.renderer = new LogicUIRenderer(submodelModifiable);
 
-               submodelModifiable.addRedrawListener(this::requestRedraw);
+               Consumer<Runnable> redrawHandlerChangedListener = submodelModifiable::setRedrawHandler;
+               model.addRedrawHandlerChangedListener(redrawHandlerChangedListener);
+               model.addComponentRemovedListener(c ->
+               {
+                       if (c == this)
+                               model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
+               });
+               submodelModifiable.setRedrawHandler(model.getRedrawHandler());
        }
 
        // pins
@@ -266,7 +274,7 @@ public abstract class SubmodelComponent extends GUIComponent
                for (Entry<String, MovablePin> e : supermodelPins.entrySet())
                        getSubmodelMovablePin(e.getKey()).setRelPos(e.getValue().getRelX() * submodelScale, e.getValue().getRelY() * submodelScale);
 
-               requestRedraw();// needed if there is no submodel interface pin
+               model.requestRedraw();// needed if there is no submodel interface pin
        }
 
        /**
@@ -287,7 +295,7 @@ public abstract class SubmodelComponent extends GUIComponent
        protected void setSymbolRenderer(Renderer symbolRenderer)
        {
                this.symbolRenderer = symbolRenderer;
-               requestRedraw();
+               model.requestRedraw();
        }
 
        /**
@@ -295,7 +303,7 @@ public abstract class SubmodelComponent extends GUIComponent
         * 
         * @author Daniel Kirschten
         */
-       protected Renderer getSymbolRenderer()
+       public Renderer getSymbolRenderer()
        {
                return symbolRenderer;
        }
@@ -308,7 +316,7 @@ public abstract class SubmodelComponent extends GUIComponent
        protected void setOutlineRenderer(Renderer outlineRenderer)
        {
                this.outlineRenderer = outlineRenderer;
-               requestRedraw();
+               model.requestRedraw();
        }
 
        /**
@@ -316,7 +324,7 @@ public abstract class SubmodelComponent extends GUIComponent
         * 
         * @author Daniel Kirschten
         */
-       protected Renderer getOutlineRenderer()
+       public Renderer getOutlineRenderer()
        {
                return outlineRenderer;
        }