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;h=3bd0594817accce56ef5a5e88b075eb5f89ccc14;hb=4ad7f53b7ed5bcd782ca39020e5e662d8d4c67a1;hp=84bfb7393bbd96b681b2c1978f3c9da0dc4f0f14;hpb=6b98761b9c2e9835629d2c0aabefe92657d6d36b;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 84bfb739..3bd05948 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;
@@ -41,6 +43,10 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
             if (visualisationResource != null) {
                 String name = graph.getRelatedValue(visualisationResource, Layer0.getInstance(graph).HasName);
                 
+                Long interval = graph.getPossibleRelatedValue(visualisationResource, DN.Diagram_Visualisations_Interval, Bindings.LONG);
+                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));
                 
@@ -56,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);
@@ -69,8 +85,18 @@ 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);
+                
+                Boolean showElevationServerBoundingBox = DynamicVisualisations.showElevationServerBoundingBox(graph, visualisationResource);
+                Boolean notInSimulation = DynamicVisualisations.isNotInSimulation(graph, visualisationResource);
+                Boolean showConnectedComponents = DynamicVisualisations.showConnectedComponents(graph, visualisationResource);
                 
                 DynamicVisualisation visualisation = new DynamicVisualisation(name, visualisationResource,
+                        interval != null ? interval : 2000,
+                        disabledUpdates != null ? disabledUpdates : false,
+                        resetVisualisation != null ? resetVisualisation : false,
                         colorContributions,
                         defaultColoringObjects,
                         colorBarOptions,
@@ -79,6 +105,8 @@ public class ActiveDynamicVisualisationsRequest extends ResourceRead<DynamicVisu
                         sizeBarOptions,
                         defaultArrowObjects,
                         arrowContributions,
+                        staticInformationContributionObjects,
+                        dynamicSymbolContributionObjects,
                         hideEdges != null ? hideEdges : false,
                         hidePoints != null ? hidePoints : false,
                         hideConsumers != null ? hideConsumers : false,
@@ -91,7 +119,12 @@ 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,
+                        showElevationServerBoundingBox != null ? showElevationServerBoundingBox : false,
+                        notInSimulation != null ? notInSimulation : false,
+                        showConnectedComponents != null ? showConnectedComponents : false
                     );
                 return visualisation; 
             }