DynamicVisualisations enhancements & deprecate old profiles & settings

[simantics/district.git] / org.simantics.district.network.ontology / graph / DistrictNetworkDiagramSettings.pgraph

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
index f01546e38ad02dbcfc25fddcfc38930f1d421ecb..c3d7cdfe1d451d4546a33a2492e24bb5bd2f7fc2 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
@@ -1,4 +1,5 @@
 L0 = <http://www.simantics.org/Layer0-1.1>
+L0X = <http://www.simantics.org/Layer0X-1.1>
 DIA = <http://www.simantics.org/Diagram-2.2>
 STR = <http://www.simantics.org/Structural-1.2>
 MOD = <http://www.simantics.org/Modeling-1.2>
@@ -8,56 +9,66 @@ SEL = <http://www.simantics.org/SelectionView-1.2>
 SEL_UI = <http://www.simantics.org/SelectionViewUI-1.1>
 G2D = <http://www.simantics.org/G2D-1.1>
 DN = <http://www.simantics.org/DistrictNetwork-1.0>
+DATATYPES = <http://www.simantics.org/Datatypes-1.1>
 
 // ----------------------------------------------------------------------------
 
-DN.EdgeThicknessPropertyParameterType <T SEL.GenericParameterType
+DN.ArrowLengthPropertyParameterType <T SEL.GenericParameterType
     @L0.assert SEL.HasDisplayValue
         _ : SEL.DisplayValue
-            SEL.HasEnumerationValues DN.Functions.edgeThicknessPropertyEnumerationValues : L0.Function
-            SEL.HasCustomModifier DN.Functions.edgeThicknessPropertyModifier : L0.Function
+            SEL.HasEnumerationValues DN.Functions.arrowLengthPropertyEnumerationValues : L0.Function
+            SEL.HasCustomModifier DN.Functions.arrowLengthPropertyModifier : L0.Function
 
-DN.Vertex.ScaleProperty <T L0.Value
-    >-- DN.Vertex.ScaleProperty.value --> L0.Relation <R L0.HasProperty : SEL.GenericParameterType
+DN.Edge.ArrowLengthProperty <T L0.Value
+    @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
+    >-- DN.Edge.ArrowLengthProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
         L0.readOnly true
-    >-- DN.Vertex.ScaleProperty.scale ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
+    >-- DN.Edge.ArrowLengthProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
         L0.readOnly true
+    >-- DN.Edge.ArrowLengthProperty.bias --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
+        L0.readOnly true
+    @L0.assert DN.Edge.ArrowLengthProperty.gain 1.0
+    @L0.assert DN.Edge.ArrowLengthProperty.bias 0.0
 
+// these should be deprecated
 DN.Edge.ThicknessProperty <T L0.Value
-    >-- DN.Edge.ThicknessProperty.scale --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Edge.ThicknessProperty.value --> L0.Relation <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
 
 DN.Diagram
-    //>-- DN.Diagram.nodeScale ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-    //    L0.HasLabel "Node Scale"
-    //>-- DN.Diagram.nodeScalingProperty --> DN.Vertex.ScaleProperty <R L0.HasProperty : SEL.GenericParameterType
-    //   L0.HasLabel "Node Scaling Property"
-    >-- DN.Diagram.edgeThicknessScale ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Edge Thickness Scale"
-    >-- DN.Diagram.edgeThicknessProperty --> DN.Edge.ThicknessProperty <R L0.HasProperty : DN.EdgeThicknessPropertyParameterType
-        L0.HasLabel "Edge Thickness Property"
-    //@L0.assert DN.Diagram.nodeScale 1.0
-    //@L0.assert DN.Diagram.nodeScaleProperty DN.Vertex.ScaleProperty.SupplyPressure
-    @L0.assert DN.Diagram.edgeThicknessScale 1.0
-    @L0.assert DN.Diagram.edgeThicknessProperty DN.Edge.ThicknessProperty.Diameter
+    >-- DN.Diagram.arrowLengthGain ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
+        L0.HasLabel "Arrow Length Gain"
+    >-- DN.Diagram.arrowLengthBias ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
+        L0.HasLabel "Arrow Length Bias"
+    >-- DN.Diagram.arrowLengthProperty --> DN.Edge.ArrowLengthProperty <R L0.HasProperty : DN.ArrowLengthPropertyParameterType
+        L0.HasLabel "Arrow Length Property"
+    >-- DN.Diagram.backgroundColor --> DATATYPES.RGB.Integer <R L0.HasProperty : SEL.ColorParameterType
+        L0.HasLabel "Diagram Background Color"
+    >-- DN.Diagram.drawMapEnabled ==> "Boolean" <R L0.HasProperty : SEL.GenericParameterType
+        L0.HasLabel "Draw Map"
+    >-- DN.Diagram.hasVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty
+        L0.HasLabel "Visualisation"
+    >-- DN.Diagram.hasActiveVisualisation --> DN.Diagram.Visualisations <R L0.HasProperty
+    >-- DN.Diagram.profileUpdateInterval ==> "Long" <R L0.HasProperty : SEL.GenericParameterType
+        L0.HasLabel "Profile update interval"
+
+    @L0.assert DN.Diagram.arrowLengthGain 1.0
+    @L0.assert DN.Diagram.arrowLengthBias 0.0
+    @L0.assert DN.Diagram.arrowLengthProperty DN.Edge.ArrowLengthProperty.FlowRate
+    @L0.assert DN.Diagram.drawMapEnabled true
+    @L0.assert DN.Diagram.profileUpdateInterval
+        2000 : L0.Long
+    @L0.assert DN.Diagram.DefaultPipeTechTypeId 0
 
 // ----------------------------------------------------------------------------
 // Built-in enumerated ScaleProperty & ThicknessProperty instances
 
-//DN.Vertex.ScaleProperty.SupplyPressure : DN.Vertex.ColorProperty
-//    L0.HasLabel "Nominal Supply Pressure"
-//    DN.Vertex.ScaleProperty.value DN.Vertex.HasSupplyPressure
-//    DN.Vertex.ScaleProperty.scale 1.0
+DN.Functions.constantOne : L0.Function
+    L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
 
-DN.Edge.ThicknessProperty.Diameter : DN.Edge.ThicknessProperty
-    L0.HasLabel "Diameter"
-    DN.Edge.ThicknessProperty.value DN.Edge.HasDiameter
-    DN.Edge.ThicknessProperty.scale 0.001
+DN.Functions.hasNominalMassFlowValue : L0.Function
+    L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
 
-DN.Edge.ThicknessProperty.NominalMassFlow : DN.Edge.ThicknessProperty
+DN.Edge.ArrowLengthProperty.FlowRate : DN.Edge.ArrowLengthProperty
     L0.HasLabel "Nominal Mass Flow"
-    DN.Edge.ThicknessProperty.value DN.Edge.HasNominalMassFlow
-    DN.Edge.ThicknessProperty.scale 1.0
-
+    DN.Edge.ArrowLengthProperty.value
+        DN.Functions.hasNominalMassFlowValue
+    DN.Edge.ArrowLengthProperty.gain 1.0