X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FActiveDynamicVisualisationsRequest.java;fp=org.simantics.district.network%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fprofile%2FActiveDynamicVisualisationsRequest.java;h=08a1b01330642f3abbe99d37b426fb0c482c083c;hb=ff5441dd6a85ef6fb92c6b3b0cf709bbce878e5e;hp=7bff718e732b4200d8b694ab5b41118c0872a99d;hpb=b22c375105aee224377f3dbd51c8baccdabdc60c;p=simantics%2Fdistrict.git

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 7bff718e..08a1b013 100644
--- 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
@@ -15,6 +15,8 @@ import org.simantics.district.network.visualisations.DynamicVisualisationsContri
 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;
 import org.simantics.district.network.visualisations.model.ColorBarOptions;
 import org.simantics.district.network.visualisations.model.DynamicArrowContribution;
 import org.simantics.district.network.visualisations.model.DynamicColorContribution;
@@ -60,6 +62,16 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                 SizeBarOptions sizeBarOptions = DynamicVisualisations.sizeBarOptions(graph, visualisationResource);
                 Map<String, DynamicArrowContribution> arrowContributions = DynamicVisualisations.arrowContributions(graph, visualisationResource);
                 
+                Collection<StaticInformationContributionObject> staticInformationContributions = DynamicVisualisationsContributions.staticInformationContributionObjects(graph);
+                Map<String, StaticInformationContributionObject> staticInformationContributionObjects = staticInformationContributions.stream().collect(Collectors.toMap(dcc -> dcc.getStaticInformationContributionObject().getName(), dcc -> dcc));
+
+                Collection<DynamicSymbolContributionObject> dynamicSymbolContributions = DynamicVisualisationsContributions.dynamicSymbolContributionObjects(graph);
+                Map<String, DynamicSymbolContributionObject> dynamicSymbolContributionObjects = dynamicSymbolContributions.stream().map(dsc -> {
+                    // here we resolve the symbol map with the help of readgraph
+                    dsc.resolveSymbols(graph);
+                    return dsc;
+                }).collect(Collectors.toMap(dcc -> dcc.getDynamicSymbolContributionObject().getName(), dcc -> dcc));
+
                 Boolean hideEdges = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_HideEdges, Bindings.BOOLEAN);
                 Boolean hidePoints = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_HidePoints, Bindings.BOOLEAN);
                 Boolean hideConsumers = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_HideConsumers, Bindings.BOOLEAN);
@@ -77,6 +89,9 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                 Boolean keyVariablesVertexHover = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_KeyVariableVertexHover, Bindings.BOOLEAN);
                 Boolean keyVariablesEdgesHover = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_KeyVariableEdgeHover, Bindings.BOOLEAN);
                 
+                Boolean showElevationServerBoundingBox = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_ShowElevationServerBoundingBox, Bindings.BOOLEAN);
+                Boolean notInSimulation = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_NotInSimulation, Bindings.BOOLEAN);
+                
                 DynamicVisualisation visualisation = new DynamicVisualisation(name, visualisationResource,
                         interval != null ? interval : 2000,
                         disabledUpdates != null ? disabledUpdates : false,
@@ -89,6 +104,8 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                         sizeBarOptions,
                         defaultArrowObjects,
                         arrowContributions,
+                        staticInformationContributionObjects,
+                        dynamicSymbolContributionObjects,
                         hideEdges != null ? hideEdges : false,
                         hidePoints != null ? hidePoints : false,
                         hideConsumers != null ? hideConsumers : false,
@@ -103,7 +120,9 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                         dynamicSymbolsValves != null ? dynamicSymbolsValves : false,
                         dynamicSymbolsPumpingStations != null ? dynamicSymbolsPumpingStations : false,
                         keyVariablesVertexHover != null ? keyVariablesVertexHover : false,
-                        keyVariablesEdgesHover != null ? keyVariablesEdgesHover : false
+                        keyVariablesEdgesHover != null ? keyVariablesEdgesHover : false,
+                        showElevationServerBoundingBox != null ? showElevationServerBoundingBox : false,
+                        notInSimulation != null ? notInSimulation : false
                     );
                 return visualisation; 
             }