X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d.ontology%2Fgraph%2Fplant3d_builtins.pgraph;h=ff4f149bb086ad30943f428fe86a308fcd0592c0;hb=77bd57393f474a10166872fe90a7b92f2446e9b5;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..ff4f149b 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d_builtins.pgraph
@@ -2,74 +2,70 @@ L0 = <http://www.simantics.org/Layer0-1.1>
 P3D = <http://www.simantics.org/Plant3D-0.1>
 
 
-P3D.Builtin : L0.Library
+P3D.Builtin : P3D.ComponentLibrary
 
-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.FlatNozzleGeometryProvider : 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
+    L0.HasLabel "Concentric reducer"
     @L0.assert P3D.hasGeometry P3D.Builtin.ReducerGeometryProvider
     @L0.tag P3D.SizeChangeComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.tag P3D.DualConnectedComponent
-//  HasRotationAngle "0.0" : Double
-//  HasControlPoint 
-//    _ : SizeChangeControlPoint
+
 P3D.Builtin.EccentricReducer <T P3D.InlineComponent : P3D.InlineComponent 
+    L0.HasLabel "Eccentric reducer"
     @L0.assert P3D.hasGeometry P3D.Builtin.ReducerGeometryProvider
     @L0.tag P3D.OffsetComponent
     @L0.tag P3D.SizeChangeComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.RotateComponent
-//  HasRotationAngle "0.0" : Double
-//  HasControlPoint 
-//    _ : SizeChangeControlPoint : OffsettingPoint
+
 P3D.Builtin.Elbow <T P3D.TurnComponent : P3D.TurnComponent  
+    L0.HasLabel "Elbow"
     @L0.tag P3D.VariableAngleTurnComponent
     @L0.tag P3D.DualConnectedComponent
     @L0.assert P3D.hasGeometry P3D.Builtin.ElbowGeometryProvider
-//  HasLength "0.0" : Double
-//  HasTurnRadius "0.0" : Double
-//  HasTurnAngle "0.0" : Double
-//  HasControlPoint 
-//    _ : VariableAngleTurnControlPoint
+
 P3D.Builtin.Straight <T P3D.InlineComponent : P3D.InlineComponent
+    L0.HasLabel "Straight pipe"
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.VariableLengthInlineComponent
     @L0.assert P3D.hasGeometry P3D.Builtin.StraightGeometryProvider
-//  HasLength "0.0" : Double
-//  HasControlPoint 
-//    _ : VariableLengthControlPoint
+
 P3D.Builtin.BranchSplitComponent <T P3D.InlineComponent : P3D.InlineComponent
+    L0.HasLabel "Branch split component"
     @L0.tag P3D.CodeComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.tag P3D.NonVisibleComponent
-//  HasLength "0.0" : Double          
-//  HasControlPoint
-//    _ : BranchControlPoint
-//P3D.Builtin.Vessel : P3D.Equipment
-//    @L0.tag L0.Abstract
-//P3D.Builtin.VerticalVessel <T P3D.Builtin.Vessel
-    //[HasHeight card "1"]
-//P3D.Builtin.HorizontalVessel <T P3D.Builtin.Vessel
-    //[HasLength card "1"]
     
     
 P3D.Builtin.Nozzle <T P3D.Nozzle : P3D.Nozzle
+      L0.HasLabel "Nozzle"
       @L0.assert P3D.hasGeometry P3D.Builtin.NozzleGeometryProvider
+      @L0.assert P3D.hasParameter
+         _ :P3D.Parameter
+           L0.HasName "length" : L0.String
+           P3D.hasParameterValue 0.1 : L0.Double
+P3D.Builtin.FlatNozzle <T P3D.Nozzle : P3D.Nozzle
+      L0.HasLabel "Flat nozzle"
+      @L0.assert P3D.hasGeometry P3D.Builtin.FlatNozzleGeometryProvider
+      
 P3D.Builtin.HorizontalTank <T P3D.Equipment : P3D.Equipment
+     L0.HasLabel "Horizontal tank"
      @L0.assert P3D.hasGeometry P3D.Builtin.HorizontalTankGeometryProvider
      @L0.assert P3D.hasParameter
          _ :P3D.Parameter
@@ -80,6 +76,7 @@ P3D.Builtin.HorizontalTank <T P3D.Equipment : P3D.Equipment
            L0.HasName "length" : L0.String
            P3D.hasParameterValue 1.0 : L0.Double
 P3D.Builtin.VerticalTank <T P3D.Equipment : P3D.Equipment
+     L0.HasLabel "Vertical tank"
      @L0.assert P3D.hasGeometry P3D.Builtin.VerticalTankGeometryProvider
      @L0.assert P3D.hasParameter
          _ :P3D.Parameter
@@ -90,6 +87,7 @@ P3D.Builtin.VerticalTank <T P3D.Equipment : P3D.Equipment
            L0.HasName "height" : L0.String
            P3D.hasParameterValue 1.0 : L0.Double
 P3D.Builtin.Pump <T P3D.Equipment : P3D.Equipment
+     L0.HasLabel "Pump"
      @L0.assert P3D.hasGeometry P3D.Builtin.PumpGeometryProvider
      @L0.assert P3D.hasParameter
          _ :P3D.Parameter
@@ -99,8 +97,10 @@ 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.HasLabel "Ball valve"
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.assert P3D.hasGeometry P3D.Builtin.BallValveGeometryProvider
@@ -110,6 +110,7 @@ P3D.Builtin.BallValve <T P3D.InlineComponent : P3D.InlineComponent
            P3D.hasParameterValue 0.1 : L0.Double
            
 P3D.Builtin.CheckValve <T P3D.InlineComponent : P3D.InlineComponent
+    L0.HasLabel "Check valve"
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.tag P3D.ReverseComponent
@@ -120,6 +121,7 @@ P3D.Builtin.CheckValve <T P3D.InlineComponent : P3D.InlineComponent
            P3D.hasParameterValue 0.1 : L0.Double
            
 P3D.Builtin.GateValve <T P3D.InlineComponent : P3D.InlineComponent
+    L0.HasLabel "Gate valve"
     @L0.tag P3D.DualConnectedComponent
     @L0.tag P3D.FixedLengthInlineComponent
     @L0.tag P3D.RotateComponent
@@ -129,10 +131,36 @@ 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.HasLabel "Cap"
     @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.HasLabel "90 degree elbow"
+    @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
+           P3D.hasParameterValue 1.5707963267948966192313216916398 : L0.Double
+    @L0.assert P3D.HasTurnAngle
+         1.5707963267948966192313216916398 : L0.Double
+         
+P3D.Builtin.Elbow45 <T P3D.TurnComponent : P3D.TurnComponent  
+    L0.HasLabel "45 degree elbow"
+    @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
+           P3D.hasParameterValue 0.78539816339744830961566084581988 : L0.Double
+    @L0.assert P3D.HasTurnAngle
+         0.78539816339744830961566084581988 : L0.Double
\ No newline at end of file