X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=94680d73d18f539eab545184ee1ec649d750466f;hb=960022dd8e6f59679989d4afb3f4561858bcd7cc;hp=8516608a482575aeb415f5af83574e174a0709de;hpb=2de54d0f65ace8c56d27a5a1191e4420b96e22c2;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 8516608a..94680d73 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -32,6 +32,16 @@ defProperty : L0.Template
 // ----------------------------------------------------------------------------
 
 DN.Diagram <T DIA.Diagram
+    >-- DN.Diagram.trackChangesEnabled <R L0.HasProperty : SEL.GenericParameterType
+        --> L0.Boolean
+        L0.HasLabel "Track changes"
+    >-- DN.Diagram.splitToMultipleEnabled <R L0.HasProperty : SEL.GenericParameterType
+        --> L0.Boolean
+        L0.HasLabel "Split To Multiple Diagrams"
+    
+    @L0.assert DN.Diagram.trackChangesEnabled true
+    @L0.assert DN.Diagram.splitToMultipleEnabled true
+
 DN.Layer <T DIA.Layer
 DN.Connection <T DIA.Connection
 DN.Element <T DIA.Element : L0.Type
@@ -139,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
 
@@ -191,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
@@ -198,20 +214,12 @@ DN.InLayer
 DN.HasInLayerTag <R L0.HasProperty
     L0.HasRange L0.Tag
 
-// For associating typical diagram source and instance structures with each other
+// For associating diagram source and instance structures with each other
 DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
     L0.InverseOf DN.Diagram.MappedFromDiagram <R L0.IsWeaklyRelatedTo
 DN.MappedComponent <R L0.IsWeaklyRelatedTo
     L0.InverseOf DN.MappedFromElement <R L0.IsWeaklyRelatedTo
 
-DN.Diagram.trackChangesEnabled <R L0.HasProperty : SEL.GenericParameterType
-    L0.HasRange L0.Boolean
-    L0.HasLabel "Track changes"
-
-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
@@ -273,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
@@ -370,10 +384,13 @@ 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
 
+DN.Mapping.HasPropertyRelation <R L0.HasProperty
+
 DN.Mapping.Terminal <T L0.Entity
     L0.HasRange L0.String
 
@@ -384,66 +401,119 @@ 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.HasPropertyRelation DN.Vertex.HasElevation
     >-- DN.Mapping.VertexMapping.ElevationAltAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasAltElevation
     >-- DN.Mapping.VertexMapping.SupplyTemperatureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasSupplyTemperature
     >-- DN.Mapping.VertexMapping.ReturnTemperatureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasReturnTemperature
     >-- DN.Mapping.VertexMapping.SupplyPressureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasSupplyPressure
     >-- DN.Mapping.VertexMapping.ReturnPressureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasReturnPressure
     >-- DN.Mapping.VertexMapping.DeltaPressureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaPressure
     >-- DN.Mapping.VertexMapping.DeltaTemperatureAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaTemperature
     >-- DN.Mapping.VertexMapping.XAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.YAttribute --> L0.String <R L0.HasProperty
     // Production
     >-- DN.Mapping.VertexMapping.dpAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaPressure
     >-- DN.Mapping.VertexMapping.dtAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasDeltaTemperature
     >-- DN.Mapping.VertexMapping.HeatPowerAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasHeatPower
     >-- DN.Mapping.VertexMapping.PeakPowerAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPeakPower
     >-- DN.Mapping.VertexMapping.NominalHeadMAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalHeadM
     >-- DN.Mapping.VertexMapping.NominalHeadBAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalHeadB
     >-- DN.Mapping.VertexMapping.NominalFlowAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalFlow
     >-- DN.Mapping.VertexMapping.MaximumHeadMAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasMaximumHeadM
     // Consumers
     >-- DN.Mapping.VertexMapping.HeatLoadDsAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasHeatLoadDs
     >-- DN.Mapping.VertexMapping.AddressAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasAddress
     >-- DN.Mapping.VertexMapping.MassFlowAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasMassFlow
     >-- DN.Mapping.VertexMapping.VolFlowAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasVolFlow
     >-- DN.Mapping.VertexMapping.VelocityAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasVelocity
     >-- DN.Mapping.VertexMapping.FlowAreaAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasFlowArea
     >-- DN.Mapping.VertexMapping.ValvePositionAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValvePosition
     >-- DN.Mapping.VertexMapping.NominalPressureLossAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalPressureLoss
     >-- DN.Mapping.VertexMapping.NominalMassFlowAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasNominalFlow
 
     // pumping station
     >-- DN.Mapping.VertexMapping.HeadPumpMaximumAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasHeadPumpMaximum
     >-- DN.Mapping.VertexMapping.HeadPumpNominalAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasHeadPumpNominal
     >-- DN.Mapping.VertexMapping.FrequencyConverterControlledAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasFrequencyConverterControlled
     >-- DN.Mapping.VertexMapping.InternalValveMeasurementAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasInternalValveMeasurement
     >-- DN.Mapping.VertexMapping.PumpInReturnLineAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpInReturnLine
     >-- DN.Mapping.VertexMapping.PumpMassFlowNominalAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpMassFlowNominal
     >-- DN.Mapping.VertexMapping.PumpMeMaxAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpMeMax
     >-- DN.Mapping.VertexMapping.PumpMeMinAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpMeMin
     >-- DN.Mapping.VertexMapping.PumpSpeedMaxAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpSpeedMax
     >-- DN.Mapping.VertexMapping.PumpSpeedMinAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasPumpSpeedMin
     >-- DN.Mapping.VertexMapping.ValveReturnLineAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValveReturnLine
     >-- DN.Mapping.VertexMapping.ValveMeMaxAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValveMeMax
     >-- DN.Mapping.VertexMapping.ValveMeMinAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValveMeMin
     >-- DN.Mapping.VertexMapping.ValveMinPositionAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValveMinPosition
     >-- DN.Mapping.VertexMapping.ValveOutletModeAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValveOutletMode
     >-- DN.Mapping.VertexMapping.ValvePressLossNominalAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasValvePressLossNominal
 
     // valve
     >-- DN.Mapping.VertexMapping.OpeningTimeAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Vertex.HasOpeningTime
     
 DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.EdgeMapping.LengthAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasLength 
     >-- DN.Mapping.EdgeMapping.DiameterAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasDiameter
     >-- DN.Mapping.EdgeMapping.OuterDiameterAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasOuterDiameter
     >-- DN.Mapping.EdgeMapping.NominalMassFlowAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasNominalMassFlow
     >-- DN.Mapping.EdgeMapping.FlowAreaAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasFlowArea
     >-- DN.Mapping.EdgeMapping.KReturnAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasKReturn
     >-- DN.Mapping.EdgeMapping.KSupplyAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasKSupply
     >-- DN.Mapping.EdgeMapping.TGroundAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasTGround
     >-- DN.Mapping.EdgeMapping.ElevationAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasElevation
+    >-- DN.Mapping.EdgeMapping.PipeTypeAttribute --> L0.String <R L0.HasProperty
+        DN.Mapping.HasPropertyRelation DN.Edge.HasType
 
 // Allowed connection types
 DN.SupplyConnectionType <T STR.ConnectionType