X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetworkDiagramSettings.pgraph;h=2d253bd3678e5557a60ffeb8bbb383e5ed1380d2;hb=HEAD;hp=10744ea144927aa7120f9d87fd947ba9fa5231c2;hpb=3354c578fb8e65421d0fdb123310232ccdc597cf;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 10744ea1..2d253bd3 100644
--- 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,97 +9,53 @@ 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
-    @L0.assert SEL.HasDisplayValue
-        _ : SEL.DisplayValue
-            SEL.HasEnumerationValues DN.Functions.edgeThicknessPropertyEnumerationValues : L0.Function
-            SEL.HasCustomModifier DN.Functions.edgeThicknessPropertyModifier : 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
-    @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
-    >-- DN.Edge.ThicknessProperty.value ==> "Resource -> <ReadGraph> Maybe Double" <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Edge.ThicknessProperty.gain --> L0.Double <R L0.HasProperty : SEL.GenericParameterType
-        L0.readOnly true
-    >-- DN.Edge.ThicknessProperty.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
-
-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
+//DN.ArrowLengthPropertyParameterType <T SEL.GenericParameterType
+//    @L0.assert SEL.HasDisplayValue
+//        _ : SEL.DisplayValue
+//            SEL.HasEnumerationValues DN.Functions.arrowLengthPropertyEnumerationValues : L0.Function
+//            SEL.HasCustomModifier DN.Functions.arrowLengthPropertyModifier : L0.Function
+
+//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.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.Diagram
-    >-- 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"
-    @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
+    >-- 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
+// Removed by Jani as the intervalled profile update is not currently working
+//    >-- DN.Diagram.profileUpdateInterval ==> "Long" <R L0.HasProperty : SEL.GenericParameterType
+//        L0.HasLabel "Profile update interval"
+
+    @L0.assert DN.Diagram.drawMapEnabled true
+// Removed by Jani as the intervalled profile update is not currently working
+//    @L0.assert DN.Diagram.profileUpdateInterval
+//        2000 : L0.Long
+    @L0.assert DN.Diagram.DefaultPipeTechTypeId 0
 
 // ----------------------------------------------------------------------------
 // Built-in enumerated ScaleProperty & ThicknessProperty instances
 
-DN.Edge.ThicknessProperty.OnlyGainAndBias: DN.Edge.ThicknessProperty
-    L0.HasLabel "Only Gain and Bias"
-    DN.Edge.ThicknessProperty.value
-        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.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 : L0.Function
-            L0.HasValueType "Resource -> <ReadGraph> Maybe Double"
-
-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.constantOne : 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.Functions.hasNominalMassFlowValue : L0.Function
+    L0.HasValueType "Resource -> <ReadGraph> Maybe Double"