X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d.ontology%2Fgraph%2Fplant3d_builtins.pgraph;h=6eb90594ecda4a1d6c29f7932d4e824f0e650a5a;hb=1c986f49dd51037e0a189df77a76abce890ae8ae;hp=6ab68fcc5c5aa9fcd347604deffaad9f4df1260e;hpb=3b5c59eca31e9db10c1a1dc6d244d6fd4f3578a2;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 6ab68fcc..6eb90594 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
@@ -99,7 +99,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
@@ -129,10 +130,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