X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=5e17f658ed8f2cc0a3d5b454e11840d8ae7f62aa;hb=refs%2Fchanges%2F01%2F401%2F1;hp=2c6ac584641ce3c3c2a2374b9b15fe3033481abe;hpb=8034693a5c86d690649a70a62709d29c3fa197aa;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 2c6ac584..5e17f658 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -5,8 +5,7 @@ MOD = <http://www.simantics.org/Modeling-1.2>
 VP = <http://www.simantics.org/Viewpoint-1.2>
 IMAGE = <http://www.simantics.org/Image2-1.2>
 SEL = <http://www.simantics.org/SelectionView-1.2>
-
-MBC = MOD.ModelingBrowseContext
+SEL_UI = <http://www.simantics.org/SelectionViewUI-1.1>
 
 DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
     @L0.new
@@ -16,12 +15,10 @@ DN = <http://www.simantics.org/DistrictNetwork-1.0> : L0.Ontology
 DN.Layer <T DIA.Layer
 
 DN.Edge <T DIA.Element : L0.Type
-    @L0.assert DN.HasMapping ""
     @L0.assert DN.Bidirectional false
     @L0.assert DN.Edge.HasDiameter 1
 
 DN.Vertex <T DIA.Element : L0.Type
-    @L0.assert DN.HasMapping ""
     @L0.assert DN.Bidirectional false
 
 DN.Bidirectional <R L0.HasProperty : SEL.GenericParameterType
@@ -29,20 +26,34 @@ DN.Bidirectional <R L0.HasProperty : SEL.GenericParameterType
     L0.HasRange L0.Boolean
     L0.readOnly false
 
-DN.EdgeDefaultMapping <R L0.HasProperty : SEL.GenericParameterType
+DN.EdgeDefaultMapping <R L0.HasProperty : DN.EdgeMappingParameterType
     L0.HasLabel "Default Edge mapping"
-    L0.HasRange L0.String
-    L0.readOnly false
 
-DN.VertexDefaultMapping <R L0.HasProperty : SEL.GenericParameterType
+DN.VertexDefaultMapping <R L0.HasProperty : DN.VertexMappingParameterType
     L0.HasLabel "Default Vertex mapping"
-    L0.HasRange L0.String
-    L0.readOnly false
 
-DN.HasMapping <R L0.HasProperty : SEL.GenericParameterType
+DN.Functions : L0.Library
+
+DN.VertexMappingParameterType <T SEL.GenericParameterType
+  @L0.assert SEL.HasDisplayValue
+    _ : SEL.DisplayValue
+      SEL.HasEnumerationValues DN.Functions.enumerationValues : L0.Function
+      SEL.HasCustomModifier DN.Functions.defaultVertexMappingModifier : L0.Function
+
+DN.EdgeMappingParameterType <T SEL.GenericParameterType
+  @L0.assert SEL.HasDisplayValue
+    _ : SEL.DisplayValue
+      SEL.HasEnumerationValues DN.Functions.enumerationValues
+      SEL.HasCustomModifier DN.Functions.defaultEdgeMappingModifier : L0.Function
+
+DN.MappingParameterType <T SEL.GenericParameterType
+  @L0.assert SEL.HasDisplayValue
+    _ : SEL.DisplayValue
+      SEL.HasEnumerationValues DN.Functions.enumerationValues
+      SEL.HasCustomModifier DN.Functions.mappingModifier : L0.Function
+
+DN.HasMapping <R L0.HasProperty : DN.MappingParameterType
     L0.HasLabel "Mapping"
-    L0.HasRange DN.Mapping.EdgeMapping
-    L0.readOnly false
 
 DN.Edge.HasDiameter <R L0.HasProperty : SEL.GenericParameterType
     L0.HasLabel "Diameter"
@@ -58,13 +69,15 @@ DN.HasInLayerTag <R L0.HasProperty
 
 DN.Connection <T DIA.Connection
 
+DN.Diagram.MappedDiagram <R L0.IsWeaklyRelatedTo
+DN.MappedComponent <R L0.IsWeaklyRelatedTo
+
 DN.Diagram <T DIA.Diagram
-    @L0.assert DN.VertexDefaultMapping ""
-    @L0.assert DN.EdgeDefaultMapping ""
 
 DN.AddLayerToDNDiagramTemplate <T L0.Template
 
-DN.EPSG_4326 <T DN.SpatialRefSystem
+DN.EPSG_4326 : DN.SpatialRefSystem
+    L0.HasLabel "EPSG:4326"
     DN.HasSRID 4326
     DN.HasSRTEXT _ : L0.String
         @L0.loadString "epsg/EPSG_4326"
@@ -80,7 +93,10 @@ DN.HasSRID <R L0.HasProperty
 DN.HasSRTEXT <R L0.HasProperty
     L0.HasRange L0.String
 
+DN.Functions.compositeInstantiator : L0.ExternalValue
+
 DN.Composite <T STR.Composite
+    STR.Composite.instantiationFunction DN.Functions.compositeInstantiator
     @L0.assert MOD.HasModelingTemplate
         _ : MOD.DiagramTemplate
             MOD.HasDiagramType DN.Diagram
@@ -97,6 +113,8 @@ DN.HasEndVertex <R L0.DependsOn
     L0.HasRange DN.Vertex
     L0.InverseOf DN.HasEndVertex_Inverse <R L0.IsRelatedTo
 
+MBC = MOD.ModelingBrowseContext
+
 DNAC.newDiagramContribution : L0.Template
     @template %actionContext %label %image %action
         %actionContext
@@ -109,7 +127,15 @@ DNAC.newDiagramContribution : L0.Template
 
 DNAC = DN.ActionContext : VP.BrowseContext
     VP.BrowseContext.IsIncludedIn MOD.ModelingActionContext
-    @DNAC.newDiagramContribution "DN Diagram" IMAGES.ConfigurationFolder ACTIONS.NewDNDiagram
+    @DNAC.newDiagramContribution "Network Diagram" IMAGES.MapImage ACTIONS.NewDNDiagram
+
+DNBC = DN.BrowseContext : VP.BrowseContext
+    VP.BrowseContext.IsIncludedIn MOD.ModelingBrowseContext
+    VP.BrowseContext.Includes SEL_UI.StandardPropertiesBase.BrowseContext
+    
+    @VP.customModifierRule    DN.Edge    VP.ResourceLabelModifierRule
+    @VP.constantImageRule     DN.Composite   IMAGES.MapImage
+
 
 ACTIONS = DN.Actions : L0.Library
 
@@ -119,25 +145,29 @@ ACTIONS.NewDNDiagram : MOD.NewComposite
 
 IMAGES = DN.Images : L0.Library
 
-IMAGES.ConfigurationFolder : IMAGE.PngImage
-    @L0.loadBytes "images/Configuration.png"
+IMAGES.MapImage : IMAGE.PngImage
+    @L0.loadBytes "images/map.png"
 
-    
 // Component MAPPING
 DN.Mapping <T L0.Library
 
+DN.Functions.convertToValue : L0.ExternalValue
+
+DN.Mapping.Base <T L0.Value
+  @L0.assert L0.ConvertsToValueWith DN.Functions.convertToValue
+
 DN.Mapping.Terminal <T L0.Entity
 
 DN.Mapping.TerminalPair <T L0.Entity
     >-- DN.Mapping.InputTerminal --> DN.Mapping.Terminal <R L0.HasProperty
     >-- DN.Mapping.OutputTerminal --> DN.Mapping.Terminal <R L0.HasProperty
 
-DN.Mapping.VertexMapping <T L0.Entity
-    >-- DN.Mapping.ComponentType --> STR.ComponentType <R L0.HasProperty
+DN.Mapping.VertexMapping <T DN.Mapping.Base
+    >-- DN.Mapping.ComponentType --> STR.ComponentType <R L0.DependsOn
     >-- DN.Mapping.VertexMapping.ElevationAttribute --> L0.String <R L0.HasProperty
     >-- DN.Mapping.Terminals --> DN.Mapping.TerminalPair <R L0.HasProperty
 
-DN.Mapping.EdgeMapping <T L0.Entity
+DN.Mapping.EdgeMapping <T DN.Mapping.Base
     >-- DN.Mapping.ComponentType
     >-- DN.Mapping.EdgeMapping.Bidirectional --> L0.Boolean <R L0.HasProperty
     >-- DN.Mapping.EdgeMapping.LengthAttribute --> L0.String <R L0.HasProperty