X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.maps%2Fsrc%2Forg%2Fsimantics%2Fmaps%2Feclipse%2FMapPainter.java;h=ef88e1c55ea9fdf266506ffbcd82c41b6a75a954;hb=refs%2Fchanges%2F28%2F3028%2F2;hp=cdf0be15a5236d8a4826da71eb6b4b8f4e1f1cdd;hpb=404106a6a8c09ce3f320e8831894f4fe399662fc;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.maps/src/org/simantics/maps/eclipse/MapPainter.java b/org.simantics.district.maps/src/org/simantics/maps/eclipse/MapPainter.java
index cdf0be15..ef88e1c5 100644
--- a/org.simantics.district.maps/src/org/simantics/maps/eclipse/MapPainter.java
+++ b/org.simantics.district.maps/src/org/simantics/maps/eclipse/MapPainter.java
@@ -11,24 +11,37 @@
  *******************************************************************************/
 package org.simantics.maps.eclipse;
 
+import java.awt.Color;
 import java.awt.geom.AffineTransform;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
 import org.simantics.g2d.canvas.Hints;
 import org.simantics.g2d.canvas.ICanvasContext;
 import org.simantics.g2d.canvas.impl.AbstractCanvasParticipant;
 import org.simantics.g2d.canvas.impl.SGNodeReflection.SGCleanup;
 import org.simantics.g2d.canvas.impl.SGNodeReflection.SGInit;
+import org.simantics.g2d.participant.MouseUtil;
+import org.simantics.maps.sg.MapAttributionNode;
+import org.simantics.maps.sg.MapLocationZoomInfoNode;
 import org.simantics.maps.sg.MapNode;
 import org.simantics.maps.sg.MapScaleNode;
+import org.simantics.maps.sg.commands.MapCommands;
 import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.events.Event;
 import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;
+import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;
 import org.simantics.scenegraph.g2d.events.command.CommandEvent;
 import org.simantics.scenegraph.g2d.events.command.Commands;
 import org.simantics.utils.datastructures.hints.HintListenerAdapter;
-import org.simantics.utils.datastructures.hints.IHintListener;
-import org.simantics.utils.datastructures.hints.IHintObservable;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
+import org.simantics.utils.datastructures.hints.IHintListener;
+import org.simantics.utils.datastructures.hints.IHintObservable;
+import org.simantics.utils.threads.AWTThread;
+import org.simantics.utils.threads.ThreadUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * MapPainter is an ICanvasContext participant that uses the scene graph
@@ -40,11 +53,15 @@ import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
  */
 public class MapPainter extends AbstractCanvasParticipant {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(MapPainter.class);
+
     /**
      * Grid enabled status. Default value is True
      */
     public static final Key KEY_MAP_ENABLED  = new KeyOf(Boolean.class);
 
+    public static final Key KEY_MAP_BACKGROUND_COLOR  = new KeyOf(Object.class);
+
     public static final double ZOOM_IN_LIMIT = 10000000.0;
 
     public static final double ZOOM_OUT_LIMIT = 10.0;
@@ -64,6 +81,10 @@ public class MapPainter extends AbstractCanvasParticipant {
 
     private AffineTransform transform;
 
+    private MapLocationZoomInfoNode locationZoomInfoNode;
+
+    private ScheduledFuture<?> schedule;
+
     public MapPainter(AffineTransform transform) {
         this.transform = transform;
     }
@@ -72,11 +93,13 @@ public class MapPainter extends AbstractCanvasParticipant {
     public void addedToContext(ICanvasContext ctx) {
         super.addedToContext(ctx);
         getHintStack().addKeyHintListener(getThread(), KEY_MAP_ENABLED, mapListener);
+        getHintStack().addKeyHintListener(getThread(), KEY_MAP_BACKGROUND_COLOR, mapListener);
     }
 
     @Override
     public void removedFromContext(ICanvasContext ctx) {
         getHintStack().removeKeyHintListener(getThread(), KEY_MAP_ENABLED, mapListener);
+        getHintStack().removeKeyHintListener(getThread(), KEY_MAP_BACKGROUND_COLOR, mapListener);
         super.removedFromContext(ctx);
     }
 
@@ -87,6 +110,12 @@ public class MapPainter extends AbstractCanvasParticipant {
             updateNode();
             setDirty();
             return true;
+        } else if (e.command.equals( MapCommands.MAP_BACKGROUND_COLOR_CHANGE )) {
+            ICanvasContext context = (ICanvasContext) e.getContext();
+            Color s = context.getHintStack().getHint(MapCommands.KEY_MAP_BACKGROUND_COLOR);
+            setBackgroundColor(s);
+            setDirty();
+            return true;
         } else if (e.command.equals( Commands.MAP_DISABLE )) {
             setEnabled(false);
             updateNode();
@@ -106,6 +135,24 @@ public class MapPainter extends AbstractCanvasParticipant {
         return false;
     }
 
+    @EventHandler(priority = 31)
+    public boolean handleEvent(Event e) {
+        if (e instanceof MouseMovedEvent) {
+            // here we should somehow re-render ?
+            if (locationZoomInfoNode.isEnabled()) {
+                if (schedule == null || schedule.isDone()) {
+                    LOGGER.debug("current setDirty time" + System.currentTimeMillis());
+                    schedule = ThreadUtils.getNonBlockingWorkExecutor().schedule(() -> {
+                        AWTThread.getThreadAccess().asyncExec(this::setDirty);
+                    }, 100, TimeUnit.MILLISECONDS);
+                } else {
+                    //LOGGER.debug("ingoring setDirty time" + System.currentTimeMillis());
+                }
+            }
+        }
+        return false;
+    }
+
     @SGInit
     public void initSG(G2DParentNode parent) {
         node = parent.addNode("map", MapNode.class);
@@ -117,6 +164,18 @@ public class MapPainter extends AbstractCanvasParticipant {
         scaleNode.setTransform(transform);
         scaleNode.setEnabled(true);
         scaleNode.setZIndex(Integer.MAX_VALUE - 999); // Just under the grid
+        
+        locationZoomInfoNode = parent.addNode("locationZoomInfo", MapLocationZoomInfoNode.class);
+        locationZoomInfoNode.setTransform(transform);
+        locationZoomInfoNode.setEnabled(true);
+        MouseUtil mouseUtil = getContext().getAtMostOneItemOfClass(MouseUtil.class);
+        locationZoomInfoNode.setMouseUtil(mouseUtil);
+        locationZoomInfoNode.setZIndex(Integer.MAX_VALUE - 999); // Just under the grid
+        
+        MapAttributionNode addNode = parent.addNode("mapAttribution", MapAttributionNode.class);
+        addNode.setTransform(transform);
+        addNode.setEnabled(true);
+        addNode.setZIndex(Integer.MAX_VALUE - 999);
     }
 
     @SGCleanup
@@ -126,6 +185,8 @@ public class MapPainter extends AbstractCanvasParticipant {
 
     protected void updateNode() {
         node.setEnabled(isPaintingEnabled());
+        node.setEnabled(isMapEnabled());
+        node.setBackgroundColor(getBackgroundColor());
     }
 
     boolean isPaintingEnabled() {
@@ -146,4 +207,12 @@ public class MapPainter extends AbstractCanvasParticipant {
     private void enablePainting() {
         setHint(Hints.KEY_DISABLE_PAINTING, false);
     }
+    
+    private void setBackgroundColor(Color backgroundColor) {
+        setHint(KEY_MAP_BACKGROUND_COLOR, backgroundColor);
+    }
+    
+    private Color getBackgroundColor() {
+        return getHint(KEY_MAP_BACKGROUND_COLOR);
+    }
 }