X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.plant3d.ontology%2Fgraph%2Fplant3d.pgraph;h=d6029cc68af39fdf57d6f3b1649534bbdf00b119;hb=b402711239498596d7dfada0c66bc6627e37e7e6;hp=46a6a34bd0476b1c238c332ef84ae519012e84d4;hpb=3b5c59eca31e9db10c1a1dc6d244d6fd4f3578a2;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d.ontology/graph/plant3d.pgraph b/org.simantics.plant3d.ontology/graph/plant3d.pgraph
index 46a6a34b..d6029cc6 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d.pgraph
@@ -19,9 +19,10 @@ P3D.Node <T G3D.Node
 P3D.Plant <T G3D.RootNode <T P3D.Node
 
 
-P3D.childen <R G3D.children
+P3D.children <R G3D.children
 
 P3D.hasGeometry <R L0.IsWeaklyRelatedTo
+P3D.GeometryProvider <T L0.Entity
    
 P3D.LibraryComponent <T P3D.Node
 
@@ -55,15 +56,14 @@ P3D.TurnComponent <T P3D.PipelineComponent
     
 P3D.FixedLengthInlineComponent <R P3D.PipelineComponentTag
     L0.HasDescription "Inline component that has fixed length" : L0.String
-    //[HasRotationAngle card "1"]
+P3D.AdjustableLengthInlineComponent <R P3D.PipelineComponentTag
+    L0.HasDescription "Inline component whose length can be changed manually" : L0.String
 P3D.VariableLengthInlineComponent <R P3D.PipelineComponentTag
-    L0.HasDescription "Inline component whose length can be changed" : L0.String
+    L0.HasDescription "Inline component whose length can be changed automatically" : L0.String
 P3D.FixedAngleTurnComponent <R P3D.PipelineComponentTag
     L0.HasDescription "Turn Component that has specific turning angle that cannot be changed" : L0.String
-    //[HasRotationAngle card "1"]
 P3D.VariableAngleTurnComponent <R P3D.PipelineComponentTag
     L0.HasDescription "Turn Component whose turning angle can be modified Contains always one control point (there are no contradictory cases / how to calculate?)" : L0.String
-    //[HasTurnRadius card "1"]
 P3D.SizeChangeComponent <R P3D.PipelineComponentTag
     L0.HasDescription "Component that changes pipe run along main pipeline. (Spec change)" : L0.String
 P3D.OffsetComponent<R P3D.PipelineComponentTag
@@ -105,42 +105,45 @@ P3D.HasBranch9 <R P3D.Connects
     
 P3D.HasPipeDiameter <R G3D.hasNonTransformation
     L0.HasRange L0.Double
-//P3D.HasLength <R G3D.hasNonTransformation
-//    L0.HasRange L0.Double
-//P3D.HasTurnAngle <R G3D.hasNonTransformation
-//    L0.HasRange L0.Double
 P3D.HasRotationAngle <R G3D.hasTransformation
     L0.HasRange L0.Double
-//P3D.HasOffset <R L0.HasProperty
-//    L0.HasRange L0.Double
-//HasRelativePosition <R HasProperty
-//    HasRange [Position]
-//HasRelativeDirection <R HasProperty
-//    HasRange [Tuple3]
-//HasDirection <R HasProperty
-//    HasRange [Tuple3]  
+P3D.HasLength <R G3D.hasNonTransformation
+    L0.HasRange L0.Double
+P3D.HasTurnAngle <R G3D.hasNonTransformation
+    L0.HasRange L0.Double
+
+
 P3D.HasTurnRadius <R G3D.hasNonTransformation
-    L0.HasRange L0.Double   
+    L0.HasRange L0.Double
+    @L0.tag L0.Deprecated
+P3D.HasTurnRadiusArray <R G3D.hasNonTransformation
+    L0.HasRange L0.DoubleArray
+P3D.HasTurnRadiusIndex <R G3D.hasNonTransformation
+    L0.HasRange L0.Integer
 P3D.IsReversed <R L0.HasProperty
     L0.HasRange L0.Boolean
 P3D.HasTurnAxis <R G3D.hasTransformation
     L0.HasRange G3D.Tuple3D
     
-P3D.HasNozzleDefinition <R L0.HasProperty
-    L0.HasDomain P3D.Equipment
-    L0.HasRange P3D.Nozzle
-    L0.HasDescription "This relation is used to connect nozzles to equipment in the template. For instantiated equipment nozzles must be connected with HasNozzle relation." : L0.String  
 P3D.HasNozzle <R G3D.children
     L0.InverseOf P3D.NozzleOf
     L0.HasDomain P3D.Equipment
     L0.HasRange P3D.Nozzle
     L0.HasDescription "Used to connect nozzles to equipment." : L0.String
-P3D.HasNozzleRestriction <R L0.HasProperty
-    L0.HasDescription "Used in template equipment to restrict amount of nozzles. If template has as many nozzleDefinitions that maximum count in this restriction, user cannot add new nozzles to the equipment instance." : L0.String
+P3D.HasFixedNozzles <R L0.HasProperty
+    L0.HasDescription "Number of fixed nozzles" : L0.String
+    L0.HasDomain P3D.Equipment
+    L0.HasRange L0.Integer
+
 
 P3D.HasNozzleId <R L0.HasProperty
     L0.HasDomain P3D.Nozzle
     L0.HasRange L0.Integer
+    
+P3D.IsFixedNozzle <R L0.HasProperty
+    L0.HasDescription "Fixed nozzle" : L0.String
+    L0.HasDomain P3D.Nozzle
+    L0.HasRange L0.Boolean
 
 P3D.HasPipeRun <R L0.IsWeaklyRelatedTo
     L0.HasDomain P3D.Nozzle
@@ -159,4 +162,7 @@ P3D.hasParameter <R L0.IsRelatedTo
 P3D.hasParameterValue <R L0.IsRelatedTo : L0.FunctionalRelation
    L0.HasDomain P3D.Parameter
    L0.HasRange L0.Literal
+   
+P3D.ComponentLibrary <T L0.Library
+P3D.ComponentLibrary.contains <R L0.IsWeaklyRelatedTo
    
\ No newline at end of file