X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=33408b2f863a25a7fdede3d2614f1daaad9ec402;hb=ae5159794b57b980f6f2d5e509e6a47843be8ca0;hp=aa801f0874b825f4a1834cd3fe43b850b1867cad;hpb=a1fb6a041444504a126b01ad1137e14a4994fa30;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index aa801f08..33408b2f 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -39,6 +39,8 @@ DN.Element <T DIA.Element : L0.Type
 DN.Vertex <T DN.Element
     >-- DN.Vertex.HasElevation
         @defProperty "Elevation" L0.Double
+    >-- DN.Vertex.HasAltElevation
+        @defProperty "Alternative Elevation" L0.Double
     >-- DN.Vertex.HasAddress
         @defProperty "Address" L0.String
     >-- DN.Vertex.HasSupplyTemperature
@@ -54,7 +56,9 @@ DN.Vertex <T DN.Element
     >-- DN.Vertex.HasDeltaTemperature
         @defProperty "Delta temperature" L0.Double 
     >-- DN.Vertex.HasHeatPower
-        @defProperty "Heat Power" L0.Double 
+        @defProperty "Heat Power" L0.Double
+    >-- DN.Vertex.HasPeakPower
+        @defProperty "Peak Power" L0.Double 
     >-- DN.Vertex.HasNominalHeadM
         @defProperty "NominalHeadM" L0.Double 
     >-- DN.Vertex.HasNominalHeadB
@@ -135,8 +139,8 @@ DN.Edge <T DN.Element
         @defProperty "K Supply" L0.Double
     >-- DN.Edge.HasTGround
         @defProperty "T Ground" L0.Double
-    @L0.assert DN.Edge.HasDiameter 0.1
-    @L0.assert DN.Edge.HasOuterDiameter 0.11
+    @L0.assert DN.Edge.HasDiameter 100
+    @L0.assert DN.Edge.HasOuterDiameter 125
 
 // ----------------------------------------------------------------------------
 
@@ -152,6 +156,10 @@ DN.RightClickDefaultMapping <R L0.HasProperty : DN.VertexMappingParameterType
 DN.LeftClickDefaultMapping <R L0.HasProperty : DN.VertexMappingParameterType
     L0.HasLabel "Left click Vertex mapping"
 
+DN.Diagram.DefaultPipeTechTypeId <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Default Pipe Tech Type ID"
+
+
 // ----------------------------------------------------------------------------
 
 DN.Functions : L0.Library
@@ -204,6 +212,69 @@ DN.Diagram.splitToMultipleEnabled <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange L0.Boolean
     L0.HasLabel "Split To Multiple Diagrams"
 
+// Dynamic Visualisations
+
+DN.VisualisationsFolder <T L0.Entity
+
+DN.Diagram.Visualisations <T L0.Entity
+    >-- DN.Diagram.Visualisations.ShowColorBars
+        @defProperty "Show Color Bars" L0.Boolean
+    >-- DN.Diagram.Visualisations.ShowColorBarTicks
+        @defProperty "Show Color Bar Ticks" L0.Boolean
+    >-- DN.Diagram.Visualisations.UseColorBarGradients
+        @defProperty "Use Color Bar Gradients" L0.Boolean
+    >-- DN.Diagram.Visualisations.ColorBarLocation
+        @defProperty "Color Bar Location" L0.String
+    >-- DN.Diagram.Visualisations.ColorBarSize
+        @defProperty "Color Bar Size" L0.String
+    >-- DN.Diagram.Visualisations.ShowSizeBars
+        @defProperty "Show Size Bars" L0.Boolean
+    >-- DN.Diagram.Visualisations.ShowSizeBarTicks
+        @defProperty "Show Size Bar Ticks" L0.Boolean
+    >-- DN.Diagram.Visualisations.UseSizeBarGradients
+        @defProperty "Use Size Bar Gradients" L0.Boolean
+    >-- DN.Diagram.Visualisations.SizeBarLocation
+        @defProperty "Size Bar Location" L0.String
+    >-- DN.Diagram.Visualisations.SizeBarSize
+        @defProperty "Size Bar Size" L0.String
+
+DN.Diagram.Visualisations.ColorContribution <T L0.Entity
+DN.Diagram.Visualisations.SizeContribution <T L0.Entity
+
+DN.Diagram.Visualisations.colorContributions <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributions <R L0.HasProperty
+
+DN.Diagram.Visualisations.colorContributionContributorName <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionLabel <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionModuleName <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionModuleAttribute <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionUnit <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionVariableGain <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionVariableBias <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultColorMap <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultMin <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultMax <R L0.HasProperty
+// for graph persistence only
+DN.Diagram.Visualisations.colorContributionUsed <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionUseDefault <R L0.HasProperty
+
+DN.Diagram.Visualisations.sizeContributionContributorName <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionLabel <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionModuleName <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionModuleAttribute <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionUnit <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionVariableGain <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionVariableBias <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultSizeMap <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultMin <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultMax <R L0.HasProperty
+// for graph persistence only
+DN.Diagram.Visualisations.sizeContributionUsed <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionUseDefault <R L0.HasProperty
+
+
+// End of dynamic visualisations
+
 DN.AddLayerToDNDiagramTemplate <T L0.Template
 
 DN.EPSG_4326 : DN.SpatialRefSystem
@@ -266,6 +337,7 @@ DN.Mapping.TerminalPair <T L0.Property
 DN.Mapping.VertexMapping <T DN.Mapping.Base
     // Common
     >-- DN.Mapping.VertexMapping.ElevationAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.ElevationAltAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.SupplyTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.ReturnTemperatureAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.SupplyPressureAttribute --> L0.String <R L0.HasProperty
@@ -278,6 +350,7 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.dpAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.dtAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.HeatPowerAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.PeakPowerAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalHeadMAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalHeadBAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.NominalFlowAttribute --> L0.String <R L0.HasProperty
@@ -325,7 +398,6 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
 
-
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType