Updates for dynamic visualisations

[simantics/district.git] / org.simantics.district.network / src / org / simantics / district / network / profile / ActiveDynamicVisualisationsRequest.java

diff --git a/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java b/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java
index 565227d9f56c3a5254339de268cd0c64010913f2..7bff718e732b4200d8b694ab5b41118c0872a99d 100644 (file)
--- a/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java
+++ b/org.simantics.district.network/src/org/simantics/district/network/profile/ActiveDynamicVisualisationsRequest.java
@@ -42,7 +42,8 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                 String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
                 
                 Long interval = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_Interval, Bindings.LONG);
-                Boolean disabled = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_Disabled, Bindings.BOOLEAN);
+                Boolean disabledUpdates = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_DisabledUpdates, Bindings.BOOLEAN);
+                Boolean resetVisualisation = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_ResetVisualisation, Bindings.BOOLEAN);
                 
                 Collection<DynamicColoringObject> dynamicColoringObjects = DynamicVisualisationsContributions.dynamicColoringObjects(graph);
                 Map<String, DynamicColoringObject> defaultColoringObjects = dynamicColoringObjects.stream().collect(Collectors.toMap(dcc -> dcc.getColoringObject().getName(), dcc -> dcc));
@@ -72,10 +73,14 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                 Boolean dynamicSymbolsShutoffValves = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_DynamicSymbolsShutoffValves, Bindings.BOOLEAN);
                 Boolean dynamicSymbolsValves = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_DynamicSymbolsValves, Bindings.BOOLEAN);
                 Boolean dynamicSymbolsPumpingStations = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_DynamicSymbolsPumpingStations, Bindings.BOOLEAN);
+
+                Boolean keyVariablesVertexHover = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_KeyVariableVertexHover, Bindings.BOOLEAN);
+                Boolean keyVariablesEdgesHover = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_KeyVariableEdgeHover, Bindings.BOOLEAN);
                 
                 DynamicVisualisation visualisation = new DynamicVisualisation(name, visualisationResource,
                         interval != null ? interval : 2000,
-                        disabled != null ? disabled : false,
+                        disabledUpdates != null ? disabledUpdates : false,
+                        resetVisualisation != null ? resetVisualisation : false,
                         colorContributions,
                         defaultColoringObjects,
                         colorBarOptions,
@@ -96,7 +101,9 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                         dynamicSymbolsProducers != null ? dynamicSymbolsProducers : false,
                         dynamicSymbolsShutoffValves != null ? dynamicSymbolsShutoffValves : false,
                         dynamicSymbolsValves != null ? dynamicSymbolsValves : false,
-                        dynamicSymbolsPumpingStations != null ? dynamicSymbolsPumpingStations : false
+                        dynamicSymbolsPumpingStations != null ? dynamicSymbolsPumpingStations : false,
+                        keyVariablesVertexHover != null ? keyVariablesVertexHover : false,
+                        keyVariablesEdgesHover != null ? keyVariablesEdgesHover : false
                     );
                 return visualisation; 
             }