X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fvisualisations%2Fmodel%2FDynamicVisualisation.java;h=d64461e18936e6884f1ba5b686f0807415baecfe;hb=ff5441dd6a85ef6fb92c6b3b0cf709bbce878e5e;hp=6202e2de5acb1bcccf499adb2c52a712fad182b8;hpb=b3108a7380f0492ddb40c839c223715d59bbfe9a;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/DynamicVisualisation.java b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/DynamicVisualisation.java
index 6202e2de..d64461e1 100644
--- a/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/DynamicVisualisation.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/visualisations/model/DynamicVisualisation.java
@@ -6,6 +6,8 @@ import org.simantics.db.Resource;
 import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicArrowObject;
 import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicColoringObject;
 import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicSizingObject;
+import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicSymbolContributionObject;
+import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.StaticInformationContributionObject;
 
 public class DynamicVisualisation {
 
@@ -13,7 +15,7 @@ public class DynamicVisualisation {
     private final Resource visualisationResource;
     
     private final long interval;
-    private final boolean disabled;
+    private final boolean disabledUpdates;
 
     private final Map<String, DynamicColorContribution> colorContributions;
     private final Map<String, DynamicColoringObject> defaultColorContributions;
@@ -24,6 +26,9 @@ public class DynamicVisualisation {
     private final Map<String, DynamicArrowObject> defaultArrowContributions;
     private final Map<String, DynamicArrowContribution> arrowContributions;
     
+    private final Map<String, StaticInformationContributionObject> staticInformationContributions;
+    private final Map<String, DynamicSymbolContributionObject> dynamicSymbolContributions;
+    
     private final boolean hideEdges;
     private final boolean hidePoints;
     private final boolean hideConsumers;
@@ -39,14 +44,22 @@ public class DynamicVisualisation {
     private final boolean dynamicSymbolsShutoffValves;
     private final boolean dynamicSymbolsValves;
     private final boolean dynamicSymbolsPumpingStations;
+    private boolean keyVariablesVertexHover;
+    private boolean keyVariablesEdgesHover;
+    private boolean resetVisualisation;
+    
+    private boolean showElevationServerBoundingBox;
+    private boolean isInSimulation;
     
     public DynamicVisualisation(String name, Resource visualisationResource, long interval, boolean disabled,
-            Map<String, DynamicColorContribution> colorContributions,
+            boolean resetVisualisation, Map<String, DynamicColorContribution> colorContributions,
             Map<String, DynamicColoringObject> defaultColoringObjects, ColorBarOptions colorBarOptions,
             Map<String, DynamicSizeContribution> sizeContributions,
             Map<String, DynamicSizingObject> defaultSizingObjects, SizeBarOptions sizeBarOptions,
             Map<String, DynamicArrowObject> defaultArrowContributions,
             Map<String, DynamicArrowContribution> arrowContributions,
+            Map<String, StaticInformationContributionObject> staticInformationContributions,
+            Map<String, DynamicSymbolContributionObject> dynamicSymbolContributions,
             boolean hideEdges,
             boolean hidePoints,
             boolean hideConsumers,
@@ -59,12 +72,17 @@ public class DynamicVisualisation {
             boolean dynamicSymbolsProducers,
             boolean dynamicSymbolsShutoffValves,
             boolean dynamicSymbolsValves,
-            boolean dynamicSymbolsPumpingStations
+            boolean dynamicSymbolsPumpingStations,
+            boolean keyVariablesVertexHover,
+            boolean keyVariablesEdgesHover,
+            boolean showElevationServerBoundingBox,
+            boolean isInSimulation
             ) {
         this.name = name;
         this.visualisationResource = visualisationResource;
         this.interval = interval;
-        this.disabled = disabled;
+        this.disabledUpdates = disabled;
+        this.resetVisualisation = resetVisualisation;
         this.colorContributions = colorContributions;
         this.defaultColorContributions = defaultColoringObjects;
         this.colorBarOptions = colorBarOptions;
@@ -73,6 +91,8 @@ public class DynamicVisualisation {
         this.sizeBarOptions = sizeBarOptions;
         this.defaultArrowContributions = defaultArrowContributions;
         this.arrowContributions = arrowContributions;
+        this.staticInformationContributions = staticInformationContributions;
+        this.dynamicSymbolContributions = dynamicSymbolContributions;
         
         this.hidePoints = hidePoints;
         this.hideConsumers = hideConsumers;
@@ -88,6 +108,12 @@ public class DynamicVisualisation {
         this.dynamicSymbolsPumpingStations = dynamicSymbolsPumpingStations;
         this.dynamicSymbolsShutoffValves = dynamicSymbolsShutoffValves;
         this.dynamicSymbolsValves = dynamicSymbolsValves;
+        
+        this.keyVariablesVertexHover = keyVariablesVertexHover;
+        this.keyVariablesEdgesHover = keyVariablesEdgesHover;
+        
+        this.showElevationServerBoundingBox = showElevationServerBoundingBox;
+        this.isInSimulation = isInSimulation;
     }
 
     public String getName() {
@@ -130,6 +156,10 @@ public class DynamicVisualisation {
         return arrowContributions;
     }
     
+    public Map<String, StaticInformationContributionObject> getStaticInformationContributions() {
+        return staticInformationContributions;
+    }
+    
     public boolean isHideEdges() {
         return hideEdges;
     }
@@ -186,7 +216,27 @@ public class DynamicVisualisation {
         return interval;
     }
     
-    public boolean disabled() {
-        return disabled;
+    public boolean disabledUpdates() {
+        return disabledUpdates;
+    }
+
+    public boolean isKeyVariablesVertexHover() {
+        return keyVariablesVertexHover;
+    }
+
+    public boolean isKeyVariablesEdgesHover() {
+        return keyVariablesEdgesHover;
+    }
+
+    public boolean isResetVisualisation() {
+        return resetVisualisation;
+    }
+    
+    public boolean isInSimulation() {
+        return isInSimulation;
+    }
+
+    public Map<String, DynamicSymbolContributionObject> getDynamicSymbolContributions() {
+        return dynamicSymbolContributions;
     }
 }