X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=06c6b0485a34201c5d1ff4dbb43d018960eb61f4;hb=f182477cd4a4b38ed51fd17dc810b8114d0fe6ca;hp=e4aaeba992e10b6d7ccf52813c890062dfec8988;hpb=d37935de71fa4dfd44f9e0014f4452089479a83d;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 e4aaeba9..06c6b048 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -149,6 +149,8 @@ DN.Edge <T DN.Element
         @defProperty "K Supply" L0.Double
     >-- DN.Edge.HasTGround
         @defProperty "T Ground" L0.Double
+    >-- DN.Edge.HasType
+        @defProperty "Pipe Type" L0.String
     @L0.assert DN.Edge.HasDiameter 100.0
     @L0.assert DN.Edge.HasOuterDiameter 125.0
 
@@ -201,6 +203,10 @@ DN.HasId --> L0.String <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Id"
     L0.readOnly false
 
+DN.HasRegion --> L0.String <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Region"
+    L0.readOnly false
+
 DN.InLayer
     @L0.defTag 
     @L0.tag L0.Abstract
@@ -275,6 +281,12 @@ DN.Diagram.Visualisations <T L0.Entity
         @defProperty "Key Variables for Vertices on Hover" L0.Boolean
     >-- DN.Diagram.Visualisations.KeyVariableEdgeHover
         @defProperty "Key Variables for Edges on Hover" L0.Boolean
+    >-- DN.Diagram.Visualisations.ShowElevationServerBoundingBox
+        @defProperty "Show Elevation server bounding box" L0.Boolean
+    >-- DN.Diagram.Visualisations.NotInSimulation
+        @defProperty "Not in Simulation" L0.Boolean
+    >-- DN.Diagram.Visualisations.ShowConnectedComponents
+        @defProperty "Show Connected Components" L0.Boolean
 
 DN.Diagram.Visualisations.ColorContribution <T L0.Entity
 DN.Diagram.Visualisations.SizeContribution <T L0.Entity
@@ -372,6 +384,7 @@ DN.Functions.convertToValue : L0.ExternalValue
 
 DN.Mapping.Base <T L0.Value
   >-- DN.Mapping.Id --> L0.String <R L0.HasProperty
+  >-- DN.Mapping.Region --> L0.String <R L0.HasProperty
   >-- DN.Mapping.ComponentType --> STR.ComponentType <R L0.DependsOn
   >-- DN.Mapping.Terminals --> DN.Mapping.TerminalPair <R L0.HasProperty
   @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
@@ -446,6 +459,7 @@ DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.KSupplyAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.EdgeMapping.PipeTypeAttribute --> L0.String <R L0.HasProperty
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType