X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetworkDiagramSettings.pgraph;h=c3d7cdfe1d451d4546a33a2492e24bb5bd2f7fc2;hb=607611b465ee7737db9489d21d261ff793692b89;hp=8abc05deed5a9c0229a8ad6b744a877ca9d116b0;hpb=8958c9b265fc6a842c76714b60f0d99740434243;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
index 8abc05de..c3d7cdfe 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetworkDiagramSettings.pgraph
@@ -13,94 +13,50 @@ 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.VertexScalePropertyParameterType <T SEL.GenericParameterType
-    @L0.assert SEL.HasDisplayValue
-        _ : SEL.DisplayValue
-            SEL.HasEnumerationValues DN.Functions.nodeScalePropertyEnumerationValues : L0.Function
-            SEL.HasCustomModifier DN.Functions.nodeScalePropertyModifier : L0.Function
-
-DN.Edge.ThicknessProperty <T L0.Value
+DN.Edge.ArrowLengthProperty <T L0.Value
     @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
-    >-- DN.Edge.ThicknessProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
+    >-- DN.Edge.ArrowLengthProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
         L0.readOnly true
-    >-- DN.Edge.ThicknessProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
+    >-- DN.Edge.ArrowLengthProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
         L0.readOnly true
-    >-- DN.Edge.ThicknessProperty.bias --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
+    >-- DN.Edge.ArrowLengthProperty.bias --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
         L0.readOnly true
-    @L0.assert DN.Edge.ThicknessProperty.gain 1.0
-    @L0.assert DN.Edge.ThicknessProperty.bias 0.0
+    @L0.assert DN.Edge.ArrowLengthProperty.gain 1.0
+    @L0.assert DN.Edge.ArrowLengthProperty.bias 0.0
 
-DN.Vertex.ScaleProperty <T L0.Value
-    @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
-    >-- DN.Vertex.ScaleProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Vertex.ScaleProperty.gain ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Vertex.ScaleProperty.bias ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    @L0.assert DN.Vertex.ScaleProperty.gain 1.0
-    @L0.assert DN.Vertex.ScaleProperty.bias 0.0
+// these should be deprecated
+DN.Edge.ThicknessProperty <T L0.Value
 
 DN.Diagram
-    >-- DN.Diagram.elementColoringGradientHue ==> "Float" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Element Color Hue"
-        L0.HasDescription "HSV/HSB color space hue value used for element coloring in degrees (0-360)"
-        L0X.HasUnit "deg"
-        L0X.RequiresDataType $(Float(unit="deg",range=[0..360]))
-        SEL.HasDisplayValue _ : SEL.DisplayValue
-            L0.Literal.HasInputValidator DN.Functions.hueValidator : L0.Function
-    >-- DN.Diagram.elementColoringGradientSaturation ==> "Float" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Element Color Saturation"
-        L0.HasDescription "HSV/HSB color space saturation value used for element coloring in % (0-100)"
-        L0X.HasUnit "%"
-        L0X.RequiresDataType $(Float(unit="%",range=[0..100]))
-        SEL.HasDisplayValue _ : SEL.DisplayValue
-            L0.Literal.HasInputValidator DN.Functions.saturationValidator : L0.Function
-    >-- DN.Diagram.elementColoringFunction --> L0.String ==> "Resource -> <ReadGraph> Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Element Color Brightness Function"
-        L0.HasDescription "Defines HSV/HSB color space brightness function whose value is cut off to fit [0,1]. Together with hue and saturation this defines the element color."
-        SEL.HasDisplayValue _ : SEL.DisplayValue
-            L0.Literal.HasInputValidator DN.Functions.brightnessValidator : L0.Function
-    >-- DN.Diagram.edgeThicknessGain ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Edge Thickness Gain"
-    >-- DN.Diagram.edgeThicknessBias ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Edge Thickness Bias"
-    >-- DN.Diagram.edgeThicknessProperty --> DN.Edge.ThicknessProperty <R L0.HasProperty : DN.EdgeThicknessPropertyParameterType
-        L0.HasLabel "Edge Thickness Property"
-    >-- DN.Diagram.nodeScaleGain ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Node Scale Gain"
-    >-- DN.Diagram.nodeScaleBias ==> "Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.HasLabel "Node Scale Bias"
-    >-- DN.Diagram.nodeScaleProperty --> DN.Vertex.ScaleProperty <R L0.HasProperty : DN.VertexScalePropertyParameterType
-        L0.HasLabel "Node Scale Property"
+    >-- 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.elementColoringGradientHue
-        0.0 : L0.Float
-            L0.HasDataType $(Float(unit="deg",range=[0..360]))
-    @L0.assert DN.Diagram.elementColoringGradientSaturation
-        100.0 : L0.Float
-            L0.HasDataType $(Float(unit="%",range=[0..100]))
-    @MOD.sclAssertion DN.Diagram.elementColoringFunction "\r -> 1.0" "Resource -> <ReadGraph> Double"
-    @L0.assert DN.Diagram.edgeThicknessGain 1.0
-    @L0.assert DN.Diagram.edgeThicknessBias 0.0
-    @L0.assert DN.Diagram.edgeThicknessProperty DN.Edge.ThicknessProperty.Diameter
-    @L0.assert DN.Diagram.nodeScaleGain 1.0
-    @L0.assert DN.Diagram.nodeScaleBias 0.0
-    @L0.assert DN.Diagram.nodeScaleProperty DN.Vertex.ScaleProperty.NominalSupplyPressure
+
+    @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
@@ -108,35 +64,11 @@ DN.Diagram
 DN.Functions.constantOne : L0.Function
     L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
 
-DN.Edge.ThicknessProperty.OnlyGainAndBias: DN.Edge.ThicknessProperty
-    L0.HasLabel "Only Gain and Bias"
-    DN.Edge.ThicknessProperty.value
-        DN.Functions.constantOne
-
-DN.Edge.ThicknessProperty.Diameter : DN.Edge.ThicknessProperty
-    L0.HasLabel "Diameter"
-    DN.Edge.ThicknessProperty.value
-        DN.Functions.hasDiameterValue : L0.Function
-            L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
-    DN.Edge.ThicknessProperty.gain 0.001
-
-
-DN.Vertex.ScaleProperty.OnlyGainAndBias: DN.Vertex.ScaleProperty
-    L0.HasLabel "Only Gain and Bias"
-    DN.Vertex.ScaleProperty.value
-        DN.Functions.constantOne
-
-DN.Vertex.ScaleProperty.NominalSupplyPressure : DN.Vertex.ScaleProperty
-    L0.HasLabel "Nominal Supply Pressure"
-    DN.Vertex.ScaleProperty.value
-        DN.Functions.hasNominalSupplyPressure : L0.Function
-            L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
-    DN.Vertex.ScaleProperty.gain 0.001
+DN.Functions.hasNominalMassFlowValue : L0.Function
+    L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
 
-DN.Vertex.ScaleProperty.Elevation : DN.Vertex.ScaleProperty
-    L0.HasLabel "Elevation"
-    DN.Vertex.ScaleProperty.value
-        DN.Functions.hasElevation : L0.Function
-            L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
-    DN.Vertex.ScaleProperty.gain 0.1
-    DN.Vertex.ScaleProperty.bias 0.001
+DN.Edge.ArrowLengthProperty.FlowRate : DN.Edge.ArrowLengthProperty
+    L0.HasLabel "Nominal Mass Flow"
+    DN.Edge.ArrowLengthProperty.value
+        DN.Functions.hasNominalMassFlowValue
+    DN.Edge.ArrowLengthProperty.gain 1.0