X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ontology%2Fgraph%2FDistrictNetwork.pgraph;h=00dc3d086d357456eed59f18aebcc46fc8ed519e;hb=b3108a7380f0492ddb40c839c223715d59bbfe9a;hp=bb3130eb5307c5d42309c1c4a0b93bfb6395100c;hpb=e764d663bb48dbc4ce86ca5d90c80167d30338a8;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 bb3130eb..00dc3d08 100644
--- a/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
+++ b/org.simantics.district.network.ontology/graph/DistrictNetwork.pgraph
@@ -139,8 +139,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
 
 // ----------------------------------------------------------------------------
 
@@ -212,13 +212,21 @@ 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.Disabled
+        @defProperty "Disabled" 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,16 +235,46 @@ 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.String
+    >-- DN.Diagram.Visualisations.HidePoints
+        @defProperty "Hide Points" L0.String
+    >-- DN.Diagram.Visualisations.HideConsumers
+        @defProperty "Hide Consumers" L0.String
+    >-- DN.Diagram.Visualisations.HideProducers
+        @defProperty "Hide Producers" L0.String
+    >-- DN.Diagram.Visualisations.HideValves
+        @defProperty "Hide Valves" L0.String
+    >-- DN.Diagram.Visualisations.HidePumpingStations
+        @defProperty "Hide Pumping Stations" L0.String
+    >-- DN.Diagram.Visualisations.StaticPropertiesNetworkBranches
+        @defProperty "Static Properties Network Branches" L0.String
+    >-- DN.Diagram.Visualisations.StaticPropertiesPoints
+        @defProperty "Static Properties Points" L0.String
+    >-- DN.Diagram.Visualisations.StaticPropertiesConsumers
+        @defProperty "Static Properties Consumers" L0.String
+    >-- DN.Diagram.Visualisations.DynamicSymbolsShutoffValves
+        @defProperty "Dynamic Symbols Shutoff Valves" L0.String
+    >-- DN.Diagram.Visualisations.DynamicSymbolsProducers
+        @defProperty "Dynamic Symbols Producers" L0.String
+    >-- DN.Diagram.Visualisations.DynamicSymbolsValves
+        @defProperty "Dynamic Symbols Valves" L0.String
+    >-- DN.Diagram.Visualisations.DynamicSymbolsPumpingStations
+        @defProperty "Dynamic Symbols Pumping Stations" L0.String
 
 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
@@ -266,6 +304,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