Dynamic Visualisations view improvements & profile refactoring

[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 fa329b86e2a9b6004f3949cdc929bcc7d5ad6e8f..3903b5540c359bf1c8c2bc08e284862c7a4e4e2d 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
@@ -3,22 +3,61 @@ package org.simantics.district.network.visualisations.model;
 import java.util.Map;
 
 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;
 
 public class DynamicVisualisation {
 
-    private String name;
-    private Resource visualisationResource;
+    private final String name;
+    private final Resource visualisationResource;
 
-    private Map<String, DynamicColorContribution> colorContributions;
-    private Map<String, DynamicColoringObject> defaultColorContributions;
-    private ColorBarOptions colorBarOptions;
-    private Map<String, DynamicSizeContribution> sizeContributions;
-    private Map<String, DynamicSizingObject> defaultSizeContributions;
-    private SizeBarOptions sizeBarOptions;
+    private final Map<String, DynamicColorContribution> colorContributions;
+    private final Map<String, DynamicColoringObject> defaultColorContributions;
+    private final ColorBarOptions colorBarOptions;
+    private final Map<String, DynamicSizeContribution> sizeContributions;
+    private final Map<String, DynamicSizingObject> defaultSizeContributions;
+    private final SizeBarOptions sizeBarOptions;
+    private final Map<String, DynamicArrowObject> defaultArrowContributions;
+    private final Map<String, DynamicArrowContribution> arrowContributions;
     
-    public DynamicVisualisation(String name, Resource visualisationResource, Map<String, DynamicColorContribution> colorContributions, Map<String, DynamicColoringObject> defaultColoringObjects, ColorBarOptions colorBarOptions, Map<String, DynamicSizeContribution> sizeContributions, Map<String, DynamicSizingObject> defaultSizingObjects, SizeBarOptions sizeBarOptions) {
+    private final boolean hideEdges;
+    private final boolean hidePoints;
+    private final boolean hideConsumers;
+    private final boolean hideProducers;
+    private final boolean hideValves;
+    private final boolean hidePumpingStations;
+    
+    private final boolean staticPropertiesNetworkBranches;
+    private final boolean staticPropertiesPoints;
+    private final boolean staticPropertiesConsumers;
+    
+    private final boolean dynamicSymbolsProducers;
+    private final boolean dynamicSymbolsShutoffValves;
+    private final boolean dynamicSymbolsValves;
+    private final boolean dynamicSymbolsPumpingStations;
+    
+    public DynamicVisualisation(String name, Resource visualisationResource,
+            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,
+            boolean hideEdges,
+            boolean hidePoints,
+            boolean hideConsumers,
+            boolean hideProducers,
+            boolean hideValves,
+            boolean hidePumpingStations,
+            boolean staticPropertiesNetworkBranch,
+            boolean staticProperiesPoints,
+            boolean staticPropertiesConsumers,
+            boolean dynamicSymbolsProducers,
+            boolean dynamicSymbolsShutoffValves,
+            boolean dynamicSymbolsValves,
+            boolean dynamicSymbolsPumpingStations
+            ) {
         this.name = name;
         this.visualisationResource = visualisationResource;
         this.colorContributions = colorContributions;
@@ -27,6 +66,23 @@ public class DynamicVisualisation {
         this.sizeContributions = sizeContributions;
         this.defaultSizeContributions = defaultSizingObjects;
         this.sizeBarOptions = sizeBarOptions;
+        this.defaultArrowContributions = defaultArrowContributions;
+        this.arrowContributions = arrowContributions;
+        
+        this.hidePoints = hidePoints;
+        this.hideConsumers = hideConsumers;
+        this.hideEdges = hideEdges;
+        this.hideProducers = hideProducers;
+        this.hideValves = hideValves;
+        this.hidePumpingStations = hidePumpingStations;
+        
+        this.staticPropertiesConsumers = staticPropertiesConsumers;
+        this.staticPropertiesNetworkBranches = staticPropertiesNetworkBranch;
+        this.staticPropertiesPoints = staticProperiesPoints;
+        this.dynamicSymbolsProducers = dynamicSymbolsProducers;
+        this.dynamicSymbolsPumpingStations = dynamicSymbolsPumpingStations;
+        this.dynamicSymbolsShutoffValves = dynamicSymbolsShutoffValves;
+        this.dynamicSymbolsValves = dynamicSymbolsValves;
     }
 
     public String getName() {
@@ -40,7 +96,7 @@ public class DynamicVisualisation {
     public Map<String, DynamicColorContribution> getColorContributions() {
         return colorContributions;
     }
-    
+
     public Map<String, DynamicColoringObject> getDefaultColorContributions() {
         return defaultColorContributions;
     }
@@ -52,7 +108,7 @@ public class DynamicVisualisation {
     public Map<String, DynamicSizeContribution> getSizeContributions() {
         return sizeContributions;
     }
-    
+
     public Map<String, DynamicSizingObject> getDefaultSizeContributions() {
         return defaultSizeContributions;
     }
@@ -60,4 +116,64 @@ public class DynamicVisualisation {
     public SizeBarOptions getSizeBarOptions() {
         return sizeBarOptions;
     }
+
+    public Map<String, DynamicArrowObject> getDefaultArrowContributions() {
+        return defaultArrowContributions;
+    }
+
+    public Map<String, DynamicArrowContribution> getArrowContributions() {
+        return arrowContributions;
+    }
+    
+    public boolean isHideEdges() {
+        return hideEdges;
+    }
+    
+    public boolean isHidePoints() {
+        return hidePoints;
+    }
+    
+    public boolean isHideConsumers() {
+        return hideConsumers;
+    }
+    
+    public boolean isHideProducers() {
+        return hideProducers;
+    }
+    
+    public boolean isHideValves() {
+        return hideValves;
+    }
+    
+    public boolean isHidePumpingStations() {
+        return hidePumpingStations;
+    }
+    
+    public boolean isStaticPropertiesNetworkBranches() {
+        return staticPropertiesNetworkBranches;
+    }
+    
+    public boolean isStaticPropertiesPoints() {
+        return staticPropertiesPoints;
+    }
+    
+    public boolean isStaticPropertiesConsumers() {
+        return staticPropertiesConsumers;
+    }
+    
+    public boolean isDynamicSymbolsProducers() {
+        return dynamicSymbolsProducers;
+    }
+    
+    public boolean isDynamicSymbolsPumpingStations() {
+        return dynamicSymbolsPumpingStations;
+    }
+    
+    public boolean isDynamicSymbolsShutoffValves() {
+        return dynamicSymbolsShutoffValves;
+    }
+    
+    public boolean isDynamicSymbolsValves() {
+        return dynamicSymbolsValves;
+    }
 }