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=f0305fad2ce9ca663a10feab158abf90d2bb5b87;hb=e764d663bb48dbc4ce86ca5d90c80167d30338a8;hp=cc5b24e1652e69427b1c6a34a919f6e869cbc044;hpb=dab24824da1b284b8a4734a069cfba72fb1f05de;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 cc5b24e1..f0305fad 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
@@ -2,6 +2,7 @@ package org.simantics.district.network.ui;
 
 import java.awt.Color;
 import java.awt.geom.AffineTransform;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -15,6 +16,7 @@ import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.procedure.Listener;
 import org.simantics.diagram.ui.DiagramModelHints;
 import org.simantics.district.network.DistrictNetworkUtil;
+import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.district.network.ui.participants.DNPointerInteractor;
 import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant;
 import org.simantics.district.network.ui.participants.ElevationServerParticipant;
@@ -261,7 +263,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
     private static class MapBackgroundColorListener implements Listener<RGB.Integer> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(MapBackgroundColorListener.class);
 
         private Consumer<RGB.Integer> callback;
         private Supplier<Boolean> isDisposed;
@@ -295,7 +297,12 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public ColorBarOptions perform(ReadGraph graph) throws DatabaseException {
-            return DistrictNetworkUtil.colorBarOptions(graph, parameter);
+            DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+            Resource activeVisualisation = graph.getPossibleObject(parameter, DN.Diagram_hasActiveVisualisation);
+            if (activeVisualisation != null) {
+                return DistrictNetworkUtil.colorBarOptions(graph, activeVisualisation);
+            }
+            return ColorBarOptions.useDefault();
         }
     }
 
@@ -307,13 +314,18 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public Map<String, DynamicColorContribution> perform(ReadGraph graph) throws DatabaseException {
-            return DistrictNetworkUtil.colorContributions(graph, parameter);
+            DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+            Resource activeVisualisation = graph.getPossibleObject(parameter, DN.Diagram_hasActiveVisualisation);
+            if (activeVisualisation != null) {
+                return DistrictNetworkUtil.colorContributions(graph, activeVisualisation);
+            }
+            return Collections.emptyMap();
         }
     }
     
     private static class ColoringObjectsListener implements Listener<Map<String,DynamicColorContribution>> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(ColoringObjectsListener.class);
 
         private Consumer<Map<String,DynamicColorContribution>> callback;
         private Supplier<Boolean> isDisposed;
@@ -341,7 +353,7 @@ public class DistrictDiagramViewer extends DiagramViewer {
     
     private static class ColorBarOptionsListener implements Listener<ColorBarOptions> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(ColorBarOptionsListener.class);
 
         private Consumer<ColorBarOptions> callback;
         private Supplier<Boolean> isDisposed;
@@ -375,13 +387,18 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public SizeBarOptions perform(ReadGraph graph) throws DatabaseException {
-            return DistrictNetworkUtil.sizeBarOptions(graph, parameter);
+            DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+            Resource activeVisualisation = graph.getPossibleObject(parameter, DN.Diagram_hasActiveVisualisation);
+            if (activeVisualisation != null) {
+                return DistrictNetworkUtil.sizeBarOptions(graph, activeVisualisation);
+            }
+            return SizeBarOptions.useDefault();
         }
     }
 
     private static class SizeBarOptionsListener implements Listener<SizeBarOptions> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(SizeBarOptionsListener.class);
 
         private Consumer<SizeBarOptions> callback;
         private Supplier<Boolean> isDisposed;
@@ -415,13 +432,18 @@ public class DistrictDiagramViewer extends DiagramViewer {
 
         @Override
         public Map<String, DynamicSizeContribution> perform(ReadGraph graph) throws DatabaseException {
-            return DistrictNetworkUtil.sizeContributions(graph, parameter);
+            DistrictNetworkResource DN = DistrictNetworkResource.getInstance(graph);
+            Resource activeVisualisation = graph.getPossibleObject(parameter, DN.Diagram_hasActiveVisualisation);
+            if (activeVisualisation != null) {
+                return DistrictNetworkUtil.sizeContributions(graph, activeVisualisation);
+            }
+            return Collections.emptyMap();
         }
     }
     
     private static class SizingObjectsListener implements Listener<Map<String,DynamicSizeContribution>> {
 
-        private static final Logger LOGGER = LoggerFactory.getLogger(DrawMapEnabledListener.class);
+        private static final Logger LOGGER = LoggerFactory.getLogger(SizingObjectsListener.class);
 
         private Consumer<Map<String,DynamicSizeContribution>> callback;
         private Supplier<Boolean> isDisposed;