Make defaults to work & remove apply button in dynamic visualisations

[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 24cf9bed9a6bb2acaa97349e09eec29aaff99c4e..fa329b86e2a9b6004f3949cdc929bcc7d5ad6e8f 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,6 +3,8 @@ package org.simantics.district.network.visualisations.model;
 import java.util.Map;
 
 import org.simantics.db.Resource;
+import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicColoringObject;
+import org.simantics.district.network.visualisations.DynamicVisualisationsContributions.DynamicSizingObject;
 
 public class DynamicVisualisation {
 
@@ -10,16 +12,20 @@ public class DynamicVisualisation {
     private 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;
     
-    public DynamicVisualisation(String name, Resource visualisationResource, Map<String, DynamicColorContribution> colorContributions, ColorBarOptions colorBarOptions, Map<String, DynamicSizeContribution> sizeContributions, SizeBarOptions sizeBarOptions) {
+    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) {
         this.name = name;
         this.visualisationResource = visualisationResource;
         this.colorContributions = colorContributions;
+        this.defaultColorContributions = defaultColoringObjects;
         this.colorBarOptions = colorBarOptions;
         this.sizeContributions = sizeContributions;
+        this.defaultSizeContributions = defaultSizingObjects;
         this.sizeBarOptions = sizeBarOptions;
     }
 
@@ -34,6 +40,10 @@ public class DynamicVisualisation {
     public Map<String, DynamicColorContribution> getColorContributions() {
         return colorContributions;
     }
+    
+    public Map<String, DynamicColoringObject> getDefaultColorContributions() {
+        return defaultColorContributions;
+    }
 
     public ColorBarOptions getColorBarOptions() {
         return colorBarOptions;
@@ -42,6 +52,10 @@ public class DynamicVisualisation {
     public Map<String, DynamicSizeContribution> getSizeContributions() {
         return sizeContributions;
     }
+    
+    public Map<String, DynamicSizingObject> getDefaultSizeContributions() {
+        return defaultSizeContributions;
+    }
 
     public SizeBarOptions getSizeBarOptions() {
         return sizeBarOptions;