Added DN.Element as base type for DH diagram elements

[simantics/district.git] / org.simantics.district.network.ontology / graph / DistrictNetwork.pgraph

diff --git a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
index 75716c692b302cf108addf830ac258b7c8a747fd..435bd55d9813e30a19bb8ab66e0ae8c26342d26a 100644 (file)
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -15,11 +15,13 @@ DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
 
 DN.Layer <T DIA.Layer
 
-DN.Edge <T DIA.Element : L0.Type
+DN.Element <T DIA.Element : L0.Type
+
+DN.Edge <T DN.Element
     @L0.assert DN.Edge.HasDiameter 0.1
     @L0.assert DN.Edge.HasOuterDiameter 0.11
 
-DN.Vertex <T DIA.Element : L0.Type
+DN.Vertex <T DN.Element
     @L0.assert DN.Vertex.HasElevation 0.0
 
 DN.EdgeDefaultMapping <R L0.HasProperty : DN.EdgeMappingParameterType
@@ -60,6 +62,11 @@ DN.Vertex.HasElevation <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Elevation"
     L0.HasRange L0.Double
     L0.readOnly false
+    
+DN.Vertex.HasAddress <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Address"
+    L0.HasRange L0.String
+    L0.readOnly false
 
 DN.Vertex.HasSupplyTemperature <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Supply Temperature"
@@ -200,8 +207,11 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+// For associating typical 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 <T DIA.Diagram
 
@@ -315,6 +325,7 @@ DN.Mapping.VertexMapping <T DN.Mapping.Base
     >-- DN.Mapping.VertexMapping.MaximumHeadMAttribute --> L0.String <R L0.HasProperty
     // Consumers
     >-- DN.Mapping.VertexMapping.HeatLoadDsAttribute --> L0.String <R L0.HasProperty
+    >-- DN.Mapping.VertexMapping.AddressAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.MassFlowAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.VolFlowAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.VertexMapping.VelocityAttribute --> L0.String <R L0.HasProperty
@@ -354,11 +365,14 @@ DN.DistrictProfile : DIA.Profile
           DN.DistrictProfile.entry1
             L0.HasLabel "Id"
             @DIA.groupStyleProfileEntry DN.ComponentIdStyle DN.Groups.ElementGroup
+          DN.DistrictProfile.entry2
+            L0.HasLabel "Edge Node Styling"
+            @DIA.groupStyleProfileEntry DN.EdgeNodeStyle DN.Groups.ElementGroup
 
 DN.Groups : L0.Library
 
 DN.Groups.ElementGroup : DIA.TypeGroup
-  DIA.TypeGroup.HasType DIA.Element
+  DIA.TypeGroup.HasType DN.Element
 
 DN.ComponentNameStyle : DIA.ResourceSCLTextGridStyle
     @MOD.scl DIA.ResourceSCLTextGridStyle.texts 
@@ -375,3 +389,22 @@ DN.ComponentIdStyle : DIA.ResourceSCLTextGridStyle
         """
         "String -> Variable -> <ReadGraph> (String, String, String)"
     @G2D.fontProperty DIA.TextElement.font "Arial" 30 G2D.FontStyle.normal_font_style
+
+//DN.EdgeNodeGroup : DIA.Group
+
+//DN.Profiles : L0.Library
+
+DN.EdgeNodeStyle : DIA.Style
+
+// Templates
+
+//groupStyleEntry : L0.Template
+//    @template %subject %style %group
+//        %subject : DIA.GroupStyleProfileEntry
+//            DIA.ProfileEntry.HasStyle %style
+//            DIA.ProfileEntry.HasGroup %group
+
+
+//DN.Profiles.EdgeNodeStyle
+//    L0.HasLabel "Edge Node Style"
+//    @groupStyleEntry DN.EdgeNodeStyle DN.EdgeNodeGroup