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;fp=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fvisualisations%2Fmodel%2FDynamicVisualisation.java;h=d64461e18936e6884f1ba5b686f0807415baecfe;hb=3730466cd1e90c50c988292e107639952448d6a6;hp=ca5773232b482e3202d41be2b4ddeda20c54082d;hpb=e6b35994e05232dd536af4da224a342c1bd090af;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 ca577323..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 {
 
@@ -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;
@@ -43,6 +48,9 @@ public class DynamicVisualisation {
     private boolean keyVariablesEdgesHover;
     private boolean resetVisualisation;
     
+    private boolean showElevationServerBoundingBox;
+    private boolean isInSimulation;
+    
     public DynamicVisualisation(String name, Resource visualisationResource, long interval, boolean disabled,
             boolean resetVisualisation, Map<String, DynamicColorContribution> colorContributions,
             Map<String, DynamicColoringObject> defaultColoringObjects, ColorBarOptions colorBarOptions,
@@ -50,6 +58,8 @@ public class DynamicVisualisation {
             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,
@@ -64,7 +74,9 @@ public class DynamicVisualisation {
             boolean dynamicSymbolsValves,
             boolean dynamicSymbolsPumpingStations,
             boolean keyVariablesVertexHover,
-            boolean keyVariablesEdgesHover
+            boolean keyVariablesEdgesHover,
+            boolean showElevationServerBoundingBox,
+            boolean isInSimulation
             ) {
         this.name = name;
         this.visualisationResource = visualisationResource;
@@ -79,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;
@@ -97,6 +111,9 @@ public class DynamicVisualisation {
         
         this.keyVariablesVertexHover = keyVariablesVertexHover;
         this.keyVariablesEdgesHover = keyVariablesEdgesHover;
+        
+        this.showElevationServerBoundingBox = showElevationServerBoundingBox;
+        this.isInSimulation = isInSimulation;
     }
 
     public String getName() {
@@ -139,6 +156,10 @@ public class DynamicVisualisation {
         return arrowContributions;
     }
     
+    public Map<String, StaticInformationContributionObject> getStaticInformationContributions() {
+        return staticInformationContributions;
+    }
+    
     public boolean isHideEdges() {
         return hideEdges;
     }
@@ -210,4 +231,12 @@ public class DynamicVisualisation {
     public boolean isResetVisualisation() {
         return resetVisualisation;
     }
+    
+    public boolean isInSimulation() {
+        return isInSimulation;
+    }
+
+    public Map<String, DynamicSymbolContributionObject> getDynamicSymbolContributions() {
+        return dynamicSymbolContributions;
+    }
 }