Merge changes I2ff9124d,If885cde4 into release/1.35.3

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / visualisations / model / DynamicVisualisation.java

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 ca5773232b482e3202d41be2b4ddeda20c54082d..683ab4194a8b15ca39a8beb2b3e7297819ea7128 100644 (file)
--- 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;
@@ -39,9 +44,13 @@ 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 final boolean keyVariablesVertexHover;
+    private final boolean keyVariablesEdgesHover;
+    private final boolean resetVisualisation;
+    
+    private final boolean showElevationServerBoundingBox;
+    private final boolean isInSimulation;
+    private final boolean showConnectedComponents;
     
     public DynamicVisualisation(String name, Resource visualisationResource, long interval, boolean disabled,
             boolean resetVisualisation, Map<String, DynamicColorContribution> colorContributions,
@@ -50,6 +59,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 +75,10 @@ public class DynamicVisualisation {
             boolean dynamicSymbolsValves,
             boolean dynamicSymbolsPumpingStations,
             boolean keyVariablesVertexHover,
-            boolean keyVariablesEdgesHover
+            boolean keyVariablesEdgesHover,
+            boolean showElevationServerBoundingBox,
+            boolean isInSimulation,
+            boolean showConnectedComponents
             ) {
         this.name = name;
         this.visualisationResource = visualisationResource;
@@ -79,6 +93,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 +113,10 @@ public class DynamicVisualisation {
         
         this.keyVariablesVertexHover = keyVariablesVertexHover;
         this.keyVariablesEdgesHover = keyVariablesEdgesHover;
+        
+        this.showElevationServerBoundingBox = showElevationServerBoundingBox;
+        this.isInSimulation = isInSimulation;
+        this.showConnectedComponents = showConnectedComponents;
     }
 
     public String getName() {
@@ -139,6 +159,10 @@ public class DynamicVisualisation {
         return arrowContributions;
     }
     
+    public Map<String, StaticInformationContributionObject> getStaticInformationContributions() {
+        return staticInformationContributions;
+    }
+    
     public boolean isHideEdges() {
         return hideEdges;
     }
@@ -210,4 +234,20 @@ public class DynamicVisualisation {
     public boolean isResetVisualisation() {
         return resetVisualisation;
     }
+    
+    public boolean isInSimulation() {
+        return isInSimulation;
+    }
+
+    public Map<String, DynamicSymbolContributionObject> getDynamicSymbolContributions() {
+        return dynamicSymbolContributions;
+    }
+    
+    public boolean isShowElevationServerBoundingBox() {
+        return showElevationServerBoundingBox;
+    }
+    
+    public boolean showConnectedComponents() {
+        return showConnectedComponents;
+    }
 }