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=5e989546723e2966866dcb5ea78d0683cc5d8efd;hb=a995d5d46f03f25bd77fb3f6d8349839886b2ec2;hp=c519b9a5f1a3d53cadb779ded4ce78e07929b249;hpb=835710a4f22ec2d91c287295fb176a0af62d1186;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 c519b9a5..5e989546 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
@@ -13,24 +13,36 @@ 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.MapInfoNode;
+import org.simantics.maps.sg.MapLocationInfoNode;
 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
@@ -42,6 +54,8 @@ 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
      */
@@ -63,11 +77,15 @@ public class MapPainter extends AbstractCanvasParticipant {
         }
     };
 
-    protected MapNode node = null;
-    protected MapScaleNode scaleNode = null;
+    private MapNode mapNode;
+    private MapLocationInfoNode locationInfoNode;
+    private MapScaleNode scaleNode;
+    private MapInfoNode attributionNode;
 
     private AffineTransform transform;
 
+    private ScheduledFuture<?> schedule;
+
     public MapPainter(AffineTransform transform) {
         this.transform = transform;
     }
@@ -118,28 +136,62 @@ 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 (locationInfoNode != null && locationInfoNode.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);
-        node.setTransform(transform);
-        node.setEnabled(true);
-        node.setZIndex(Integer.MIN_VALUE + 999); // Just under the grid
-        
+        // Just under the grid
+        mapNode = parent.addNode("map", MapNode.class);
+        mapNode.setTransform(transform);
+        mapNode.setEnabled(true);
+        mapNode.setZIndex(Integer.MIN_VALUE + 999);
+
+        // On top of pretty much everything
+        attributionNode = parent.addNode("mapAttribution", MapAttributionNode.class);
+        attributionNode.setTransform(transform);
+        attributionNode.setZIndex(Integer.MAX_VALUE - 999);
+        attributionNode.setEnabled(true);
+
         scaleNode = parent.addNode("mapScale", MapScaleNode.class);
         scaleNode.setTransform(transform);
+        scaleNode.setZIndex(Integer.MAX_VALUE - 998);
         scaleNode.setEnabled(true);
-        scaleNode.setZIndex(Integer.MAX_VALUE - 999); // Just under the grid
+
+        locationInfoNode = parent.addNode("mapLocationInfo", MapLocationInfoNode.class);
+        locationInfoNode.setTransform(transform);
+        locationInfoNode.setZIndex(Integer.MAX_VALUE - 997);
+        locationInfoNode.setEnabled(true);
+        locationInfoNode.setMouseUtil(getContext().getAtMostOneItemOfClass(MouseUtil.class));
     }
 
     @SGCleanup
     public void cleanupSG() {
-        node.remove();
+        mapNode.remove();
+        attributionNode.remove();
+        scaleNode.remove();
+        locationInfoNode.remove();
     }
 
     protected void updateNode() {
-        node.setEnabled(isPaintingEnabled());
-        node.setEnabled(isMapEnabled());
-        node.setBackgroundColor(getBackgroundColor());
+        mapNode.setEnabled(isPaintingEnabled());
+        mapNode.setEnabled(isMapEnabled());
+        mapNode.setBackgroundColor(getBackgroundColor());
     }
 
     boolean isPaintingEnabled() {