X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=e4aaeba992e10b6d7ccf52813c890062dfec8988;hb=refs%2Fchanges%2F56%2F3656%2F2;hp=2a64b3dc15ba566b838cb17487c0869c5b8be820;hpb=797e65f69a2bd674f8fc4dcc16bcd11e2cf49ca3;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 2a64b3dc..e4aaeba9 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,8 @@ 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
+    @L0.assert DN.Edge.HasDiameter 100.0
+    @L0.assert DN.Edge.HasOuterDiameter 125.0
 
 // ----------------------------------------------------------------------------
 
@@ -156,6 +166,10 @@ DN.RightClickDefaultMapping <R L0.HasProperty : DN.VertexMappingParameterType
 DN.LeftClickDefaultMapping <R L0.HasProperty : DN.VertexMappingParameterType
     L0.HasLabel "Left click Vertex mapping"
 
+DN.Diagram.DefaultPipeTechTypeId <R L0.HasProperty : SEL.GenericParameterType
+    L0.HasLabel "Default Pipe Tech Type ID"
+
+
 // ----------------------------------------------------------------------------
 
 DN.Functions : L0.Library
@@ -194,19 +208,121 @@ 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
+        @defProperty "Color Bar Size" L0.String
+    >-- DN.Diagram.Visualisations.ShowSizeBars
+        @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.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
+DN.Diagram.Visualisations.colorContributionModuleName <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionModuleAttribute <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionUnit <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionVariableGain <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionVariableBias <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultColorMap <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultMin <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionDefaultMax <R L0.HasProperty
+// for graph persistence only
+DN.Diagram.Visualisations.colorContributionUsed <R L0.HasProperty
+DN.Diagram.Visualisations.colorContributionUseDefault <R L0.HasProperty
+
+DN.Diagram.Visualisations.sizeContributionContributorName <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionLabel <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionModuleName <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionModuleAttribute <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionUnit <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionVariableGain <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionVariableBias <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultSizeMap <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultMin <R L0.HasProperty
+DN.Diagram.Visualisations.sizeContributionDefaultMax <R L0.HasProperty
+// for graph persistence only
+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