X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d.ontology%2Fgraph%2Fplant3d_builtins.pgraph;h=a26abde450c5e2e0309051da91d0c6470f5bafef;hb=refs%2Fheads%2Frelease%2F1.40.0;hp=a8f2a5bbe25f78aa9c4429426b7a061c7605720e;hpb=676ff0ba1dd085f94377675f77f2af2566ab56b8;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph b/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
index a8f2a5bb..a26abde4 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
@@ -4,18 +4,17 @@ P3D = <http://www.simantics.org/Plant3D-0.1>
 
 P3D.Builtin : L0.Library
 
-P3D.Builtin.GeometryProvider <T L0.Entity
-P3D.Builtin.NozzleGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.HorizontalTankGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.VerticalTankGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.StraightGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.ElbowGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.ReducerGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.PumpGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.BallValveGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.CheckValveGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.GateValveGeometryProvider : P3D.Builtin.GeometryProvider
-P3D.Builtin.CapGeometryProvider : P3D.Builtin.GeometryProvider
+P3D.Builtin.NozzleGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.HorizontalTankGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.VerticalTankGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.StraightGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.ElbowGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.ReducerGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.PumpGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.BallValveGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.CheckValveGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.GateValveGeometryProvider : P3D.GeometryProvider
+P3D.Builtin.CapGeometryProvider : P3D.GeometryProvider
 
  
 P3D.Builtin.ConcentricReducer <T P3D.InlineComponent : P3D.InlineComponent
@@ -99,7 +98,8 @@ P3D.Builtin.Pump <T P3D.Equipment : P3D.Equipment
          _ :P3D.Parameter
            L0.HasName "length" : L0.String
            P3D.hasParameterValue 0.5 : L0.Double
-           
+     @L0.assert P3D.HasFixedNozzles 2
+                
 P3D.Builtin.BallValve <T P3D.InlineComponent : P3D.InlineComponent
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.FixedLengthInlineComponent
@@ -112,6 +112,7 @@ P3D.Builtin.BallValve <T P3D.InlineComponent : P3D.InlineComponent
 P3D.Builtin.CheckValve <T P3D.InlineComponent : P3D.InlineComponent
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.FixedLengthInlineComponent
+    @L0.tag P3D.ReverseComponent
     @L0.assert P3D.hasGeometry P3D.Builtin.CheckValveGeometryProvider
     @L0.assert P3D.hasParameter
          _ :P3D.Parameter
@@ -128,10 +129,31 @@ P3D.Builtin.GateValve <T P3D.InlineComponent : P3D.InlineComponent
            L0.HasName "radius" : L0.String
            P3D.hasParameterValue 0.1 : L0.Double
            
-P3D.Builtin.Cap <T P3D.EndComponent : P3D.InlineComponent
+P3D.Builtin.Cap <T P3D.EndComponent : P3D.EndComponent
     @L0.assert P3D.hasGeometry P3D.Builtin.CapGeometryProvider
     @L0.assert P3D.hasParameter
          _ :P3D.Parameter
            L0.HasName "radius" : L0.String
            P3D.hasParameterValue 0.1 : L0.Double
      
+P3D.Builtin.Elbow90 <T P3D.TurnComponent : P3D.TurnComponent  
+    @L0.tag P3D.FixedAngleTurnComponent
+    @L0.tag P3D.DualConnectedComponent
+    @L0.assert P3D.hasGeometry P3D.Builtin.ElbowGeometryProvider
+    @L0.assert P3D.hasParameter
+         _ :P3D.Parameter
+           L0.HasName "turnAngle" : L0.String
+           P3D.hasParameterValue 90.0 : L0.Double
+    @L0.assert P3D.HasTurnAngle
+         1.5707963267948966192313216916398 : L0.Double
+         
+P3D.Builtin.Elbow45 <T P3D.TurnComponent : P3D.TurnComponent  
+    @L0.tag P3D.FixedAngleTurnComponent
+    @L0.tag P3D.DualConnectedComponent
+    @L0.assert P3D.hasGeometry P3D.Builtin.ElbowGeometryProvider
+    @L0.assert P3D.hasParameter
+         _ :P3D.Parameter
+           L0.HasName "turnAngle" : L0.String
+           P3D.hasParameterValue 45.0 : L0.Double
+    @L0.assert P3D.HasTurnAngle
+         0.78539816339744830961566084581988 : L0.Double
\ No newline at end of file