X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=06c6b0485a34201c5d1ff4dbb43d018960eb61f4;hb=190aac50ce7ebdc0114140bd9d5928d228bd498c;hp=128904c801bbdd9d3bc08840620fdd02bad2fa04;hpb=dab24824da1b284b8a4734a069cfba72fb1f05de;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 128904c8..06c6b048 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,8 +149,10 @@ 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
+    >-- 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,27 +214,29 @@ 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
 
 DN.Diagram.Visualisations <T L0.Entity
+    >-- DN.Diagram.Visualisations.Interval
+        @defProperty "Interval" L0.Long
+    >-- DN.Diagram.Visualisations.DisabledUpdates
+        @defProperty "Disabled Updates" L0.Boolean
+    >-- DN.Diagram.Visualisations.ResetVisualisation
+        @defProperty "Reset Visualisations" L0.Boolean
     >-- 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
@@ -227,13 +245,56 @@ DN.Diagram.Visualisations <T L0.Entity
         @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.HideEdges
+        @defProperty "Hide Edges" L0.Boolean
+    >-- DN.Diagram.Visualisations.HidePoints
+        @defProperty "Hide Points" L0.Boolean
+    >-- DN.Diagram.Visualisations.HideConsumers
+        @defProperty "Hide Consumers" L0.Boolean
+    >-- DN.Diagram.Visualisations.HideProducers
+        @defProperty "Hide Producers" L0.Boolean
+    >-- DN.Diagram.Visualisations.HideValves
+        @defProperty "Hide Valves" L0.Boolean
+    >-- DN.Diagram.Visualisations.HidePumpingStations
+        @defProperty "Hide Pumping Stations" L0.Boolean
+    >-- DN.Diagram.Visualisations.StaticPropertiesNetworkBranches
+        @defProperty "Static Properties Network Branches" L0.Boolean
+    >-- DN.Diagram.Visualisations.StaticPropertiesPoints
+        @defProperty "Static Properties Points" L0.Boolean
+    >-- DN.Diagram.Visualisations.StaticPropertiesConsumers
+        @defProperty "Static Properties Consumers" L0.Boolean
+    >-- DN.Diagram.Visualisations.DynamicSymbolsShutoffValves
+        @defProperty "Dynamic Symbols Shutoff Valves" L0.Boolean
+    >-- DN.Diagram.Visualisations.DynamicSymbolsProducers
+        @defProperty "Dynamic Symbols Producers" L0.Boolean
+    >-- DN.Diagram.Visualisations.DynamicSymbolsValves
+        @defProperty "Dynamic Symbols Valves" L0.Boolean
+    >-- DN.Diagram.Visualisations.DynamicSymbolsPumpingStations
+        @defProperty "Dynamic Symbols Pumping Stations" L0.Boolean
+    >-- DN.Diagram.Visualisations.KeyVariableVertexHover
+        @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
+DN.Diagram.Visualisations.ArrowContribution <T L0.Entity
 
 DN.Diagram.Visualisations.colorContributions <R L0.HasProperty
 DN.Diagram.Visualisations.sizeContributions <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributions <R L0.HasProperty
 
 DN.Diagram.Visualisations.colorContributionContributorName <R L0.HasProperty
 DN.Diagram.Visualisations.colorContributionLabel <R L0.HasProperty
@@ -263,6 +324,17 @@ DN.Diagram.Visualisations.sizeContributionDefaultMax <R L0.HasProperty
 DN.Diagram.Visualisations.sizeContributionUsed <R L0.HasProperty
 DN.Diagram.Visualisations.sizeContributionUseDefault <R L0.HasProperty
 
+DN.Diagram.Visualisations.arrowContributionContributorName <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionLabel <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionModuleName <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionModuleAttribute <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionVariableGain <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionVariableBias <R L0.HasProperty
+// for graph persistence only
+DN.Diagram.Visualisations.arrowContributionUsed <R L0.HasProperty
+DN.Diagram.Visualisations.arrowContributionUseDefault <R L0.HasProperty
+
+// End of dynamic visualisations
 
 DN.AddLayerToDNDiagramTemplate <T L0.Template
 
@@ -312,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
@@ -386,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