X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FDistrictDiagramViewer.java;h=198389551768a250b22c6be34a293f6f99ba2acb;hb=ff5441dd6a85ef6fb92c6b3b0cf709bbce878e5e;hp=903c2ffa3223b74c251d25154adab949e0a6470b;hpb=b22c375105aee224377f3dbd51c8baccdabdc60c;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
index 903c2ffa..19838955 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/DistrictDiagramViewer.java
@@ -24,7 +24,6 @@ import org.simantics.district.network.ui.nodes.DistrictRenderingPreparationNode;
 import org.simantics.district.network.ui.nodes.DistrictSelectionNode;
 import org.simantics.district.network.ui.participants.DNPointerInteractor;
 import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant;
-import org.simantics.district.network.ui.participants.ElevationServerParticipant;
 import org.simantics.district.network.ui.participants.MapRulerPainter;
 import org.simantics.district.network.visualisations.DynamicVisualisations;
 import org.simantics.district.network.visualisations.model.ColorBarOptions;
@@ -76,7 +75,6 @@ public class DistrictDiagramViewer extends DiagramViewer {
         
         DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant = new DynamicVisualisationContributionsParticipant(tr);
         ctx.add(new NetworkDrawingParticipant(dynamicVisualisationContributionsParticipant, tr));
-        ctx.add(new ElevationServerParticipant(tr));
         ctx.add(dynamicVisualisationContributionsParticipant);
         
         // Optimize AffineTransform memory allocations during district diagram rendering
@@ -142,6 +140,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
         setupColorBarOptions();
         setupSizingObjects();
         setupSizeBarOptions();
+        setupShowElevationServerBoundingBox();
         
         // add listeners
         DistrictDiagramViewerListener[] listeners = Activator.getInstance().getDistrictDiagramViewerListeners();
@@ -203,13 +202,18 @@ public class DistrictDiagramViewer extends DiagramViewer {
                 () -> DistrictDiagramViewer.this.isDisposed()));
     }
 
-    
     private void setupSizeBarOptions() {
         sessionContext.getSession().asyncRequest(new SizeBarOptionsRequest(getInputResource()), new SizeBarOptionsListener(
                 result -> queueSizeBarOptionsChangeEvent(result),
                 () -> DistrictDiagramViewer.this.isDisposed()));
     }
-    
+
+    private void setupShowElevationServerBoundingBox() {
+        sessionContext.getSession().asyncRequest(new ShowElevationServerRequest(getInputResource()), new ShowElevationServerListener(
+                result -> queueShowElevationServerChangeEvent(result),
+                () -> DistrictDiagramViewer.this.isDisposed()));
+    }
+
     public static final Key KEY_MAP_COLOR_BAR_OPTIONS = new KeyOf(ColorBarOptions.class, "colorBarOptions");
     public static final Command MAP_COLOR_BAR_OPTIONS_CHANGE = new Command("colorBarOptionsChange");
     public static final Key KEY_MAP_SIZE_BAR_OPTIONS = new KeyOf(SizeBarOptions.class, "sizeBarOptions");
@@ -221,11 +225,13 @@ public class DistrictDiagramViewer extends DiagramViewer {
     public static final Key KEY_MAP_SIZING_OBJECTS = new KeyOf(Map.class, "sizingObjects");
     public static final Command MAP_SIZING_OBJECTS_CHANGE = new Command("sizingObjectsChange");
 
-    
+    public static final Key KEY_SHOW_ELEVATION_SERVER = new KeyOf(Boolean.class, "showElevationServer");
+    public static final Command SHOW_ELEVATION_SERVER_CHANGE = new Command("showElevationServerChange");
+
     private void queueColoringObjectsChangeEvent(Map<String, DynamicColorContribution> result) {
         queueEventInternal(KEY_MAP_COLORING_OBJECTS, MAP_COLORING_OBJECTS_CHANGE, result);
     }
-    
+
     private void queueColorBarOptionsChangeEvent(ColorBarOptions result) {
         queueEventInternal(KEY_MAP_COLOR_BAR_OPTIONS, MAP_COLOR_BAR_OPTIONS_CHANGE, result);
     }
@@ -233,11 +239,15 @@ public class DistrictDiagramViewer extends DiagramViewer {
     private void queueSizingObjectsChangeEvent(Map<String, DynamicSizeContribution> result) {
         queueEventInternal(KEY_MAP_SIZING_OBJECTS, MAP_SIZING_OBJECTS_CHANGE, result);
     }
-    
+
     private void queueSizeBarOptionsChangeEvent(SizeBarOptions result) {
         queueEventInternal(KEY_MAP_SIZE_BAR_OPTIONS, MAP_SIZE_BAR_OPTIONS_CHANGE, result);
     }
 
+    private void queueShowElevationServerChangeEvent(Boolean result) {
+        queueEventInternal(KEY_SHOW_ELEVATION_SERVER, SHOW_ELEVATION_SERVER_CHANGE, result);
+    }
+
     private void queueEventInternal(Key key, Command command, Object result) {
         if (result != null && !canvasContext.isDisposed()) {
             canvasContext.getThreadAccess().asyncExec(() -> {
@@ -411,7 +421,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public void exception(Throwable t) {
-            LOGGER.error("Could not listen ColorBarOptions", t);
+            LOGGER.error("Could not listen ColoringObjects", t);
         }
 
         @Override
@@ -545,7 +555,60 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public void exception(Throwable t) {
-            LOGGER.error("Could not listen ColorBarOptions", t);
+            LOGGER.error("Could not listen SizingObjectsOptions", t);
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return isDisposed.get();
+        }
+    }
+
+    private static class ShowElevationServerRequest extends UnaryRead<Resource, Boolean> {
+
+        public ShowElevationServerRequest(Resource diagram) {
+            super(diagram);
+        }
+
+        @Override
+        public Boolean perform(ReadGraph graph) throws DatabaseException {
+            DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+            Resource model = graph.syncRequest(new PossibleIndexRoot(parameter));
+            if (model != null) {
+                Resource vf = DynamicVisualisations.getVisualisationFolder(graph, model);
+                if (vf != null) {
+                    Resource activeVisualisation = graph.getPossibleObject(vf, DN.Diagram_hasActiveVisualisation);
+                    if (activeVisualisation != null) {
+                        return DynamicVisualisations.showElevationServerBoundingBox(graph, activeVisualisation);
+                    }
+                } else {
+                    LOGGER.debug("No visualisation folder available for model {}", model);
+                }
+            }
+            return false;
+        }
+    }
+    
+    private static class ShowElevationServerListener implements Listener<Boolean> {
+
+        private static final Logger LOGGER = LoggerFactory.getLogger(ShowElevationServerListener.class);
+
+        private Consumer<Boolean> callback;
+        private Supplier<Boolean> isDisposed;
+
+        public ShowElevationServerListener(Consumer<Boolean> callback, Supplier<Boolean> isDisposed) {
+            this.callback = callback;
+            this.isDisposed = isDisposed;
+        }
+
+        @Override
+        public void execute(Boolean result) {
+            callback.accept(result);
+        }
+
+        @Override
+        public void exception(Throwable t) {
+            LOGGER.error("Could not listen Show Elevation Server", t);
         }
 
         @Override