ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-27 09:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

0020695: EDF 1076 GEOM: Add a new shape in GEOM: T-shape

Browse Source 
Update documentation
This commit is contained in:
gdd 2010-04-19 17:52:05 +00:00
parent 23731e53ea
commit 72a229c531
5 changed files with 98 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
idl/GEOM_Gen.idl
View File

@ -3162,26 +3162,24 @@ module GEOM
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
ListOfGO MakePipeTShape (in double theR1, in double theW1, in double theL1, ListOfGO MakePipeTShape (in double theR1, in double theW1, in double theL1,
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in boolean theHexMesh); in boolean theHexMesh);
/*! /*!
* Create a T-shape object with specified caracteristics for the main and * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). * the incident pipes (radius, width, half-length).
* The extremities of the main pipe are located on junctions points P1 and P2. * The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3. * The extremity of the incident pipe is located on junction point P3.
*
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \param theP1 1st junction point of main pipe * \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe * \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe * \param theP3 Junction point of incident pipe
@ -3191,13 +3189,11 @@ module GEOM
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in boolean theHexMesh, in boolean theHexMesh,
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
/*! /*!
* Create a T-shape object with specified caracteristics for the main and * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). A chamfer is created * the incident pipes (radius, width, half-length). A chamfer is created
* on the junction of the pipes. * on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
*
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -3206,20 +3202,18 @@ module GEOM
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theH Height of the chamfer. * \param theH Height of the chamfer.
* \param theW Width of the chamfer. * \param theW Width of the chamfer.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
ListOfGO MakePipeTShapeChamfer (in double theR1, in double theW1, in double theL1, ListOfGO MakePipeTShapeChamfer (in double theR1, in double theW1, in double theL1,
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in double theH, in double theW, in boolean theHexMesh); in double theH, in double theW, in boolean theHexMesh);
/*! /*!
* Create a T-shape object with specified caracteristics for the main and * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). A chamfer is created * the incident pipes (radius, width, half-length). A chamfer is created
* on the junction of the pipes. * on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2. * The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3. * The extremity of the incident pipe is located on junction point P3.
*
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -3228,7 +3222,7 @@ module GEOM
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theH Height of the chamfer. * \param theH Height of the chamfer.
* \param theW Width of the chamfer. * \param theW Width of the chamfer.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \param theP1 1st junction point of main pipe * \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe * \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe * \param theP3 Junction point of incident pipe
@ -3238,13 +3232,11 @@ module GEOM
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in double theH, in double theW, in boolean theHexMesh, in double theH, in double theW, in boolean theHexMesh,
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
/*! /*!
* Create a T-shape object with specified caracteristics for the main and * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). A fillet is created * the incident pipes (radius, width, half-length). A fillet is created
* on the junction of the pipes. * on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
*
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -3252,20 +3244,18 @@ module GEOM
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theRF Radius of curvature of fillet. * \param theRF Radius of curvature of fillet.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
ListOfGO MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1, ListOfGO MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1,
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in double theRF, in boolean theHexMesh); in double theRF, in boolean theHexMesh);
/*! /*!
* Create a T-shape object with specified caracteristics for the main and * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). A fillet is created * the incident pipes (radius, width, half-length). A fillet is created
* on the junction of the pipes. * on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2. * The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3. * The extremity of the incident pipe is located on junction point P3.
*
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -3273,7 +3263,7 @@ module GEOM
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theRF Radius of curvature of fillet. * \param theRF Radius of curvature of fillet.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=true)
* \param theP1 1st junction point of main pipe * \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe * \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe * \param theP3 Junction point of incident pipe
@ -3283,7 +3273,6 @@ module GEOM
in double theR2, in double theW2, in double theL2, in double theR2, in double theW2, in double theL2,
in double theRF, in boolean theHexMesh, in double theRF, in boolean theHexMesh,
in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3);
/*@@ insert new functions before this line @@*/ /*@@ insert new functions before this line @@*/
}; };

2
src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx
View File

@ -161,7 +161,7 @@ AdvancedGUI_PipeTShapeDlg::AdvancedGUI_PipeTShapeDlg(GeometryGUI* theGeometryGUI
myMainLayout->addWidget(JunctionPointsSel, rowNewPosVal, colNewPosVal, rowspanNewPosVal, colspanNewPosVal); myMainLayout->addWidget(JunctionPointsSel, rowNewPosVal, colNewPosVal, rowspanNewPosVal, colspanNewPosVal);
/***************************************************************/ /***************************************************************/
setHelpFileName("create_pipe_tshape_page.html"); setHelpFileName("create__pipetshape__page.html");
Init(); Init();
} }

44
src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
View File

@ -1236,8 +1236,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(/*std::vector<GEO
//============================================================================= //=============================================================================
/*! /*!
* MakePipeTShape * MakePipeTShape
* Create a T-shape object with specified caracteristics for the main and the * Create a T-shape object with specified caracteristics for the main and
* incident pipes (radius, width, half-length). * the incident pipes (radius, width, half-length).
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -1369,9 +1369,11 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IAdvancedOperations::MakePipeTShap
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeWithPosition
* incident pipes (radius, width, half-length). * Create a T-shape object with specified caracteristics for the main and
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * the incident pipes (radius, width, half-length).
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -1514,8 +1516,10 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IAdvancedOperations::MakePipeTShap
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeChamfer
* incident pipes (radius, width, half-length). * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length). A chamfer is created
* on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -1724,9 +1728,12 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IAdvancedOperations::MakePipeTShap
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeChamferWithPosition
* incident pipes (radius, width, half-length). * Create a T-shape object with specified caracteristics for the main and
* The T-shape is placed at junction points P1, P2 and P3. * the incident pipes (radius, width, half-length). A chamfer is created
* on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -1931,9 +1938,10 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IAdvancedOperations::MakePipeTShap
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeFillet
* incident pipes (radius, width, half-length).A fillet is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A fillet is created
* on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -2123,10 +2131,12 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IAdvancedOperations::MakePipeTShap
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeFilletWithPosition
* incident pipes (radius, width, half-length). A fillet is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A fillet is created
* The T-shape is placed at junction points P1, P2 and P3. * on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe

74
src/GEOM_I/GEOM_IAdvancedOperations_i.cc
View File

@ -57,8 +57,9 @@ GEOM_IAdvancedOperations_i::~GEOM_IAdvancedOperations_i()
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShape
* incident pipes (radius, width, half-length). * Create a T-shape object with specified caracteristics for the main and
* the incident pipes (radius, width, half-length).
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -66,7 +67,7 @@ GEOM_IAdvancedOperations_i::~GEOM_IAdvancedOperations_i()
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================
@ -93,16 +94,21 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShape (CORBA::Double theR1,
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeWithPosition
* incident pipes (radius, width, half-length). * Create a T-shape object with specified caracteristics for the main and
* The T-shape is placed at junction points P1, P2 and P3. * the incident pipes (radius, width, half-length).
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================
@ -136,9 +142,10 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeWithPosition (CORBA::D
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeChamfer
* incident pipes (radius, width, half-length). A chamfer is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A chamfer is created
* on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -146,9 +153,9 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeWithPosition (CORBA::D
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theH Height of the chamfer. * \param theH Height of chamfer.
* \param theW Width of the chamfer. * \param theW Width of chamfer.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================
@ -176,10 +183,12 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeChamfer(CORBA::Double
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeChamferWithPosition
* incident pipes (radius, width, half-length). A chamfer is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A chamfer is created
* The T-shape is placed at junction points P1, P2 and P3. * on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
@ -188,7 +197,10 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeChamfer(CORBA::Double
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theH Height of the chamfer. * \param theH Height of the chamfer.
* \param theW Width of the chamfer. * \param theW Width of the chamfer.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================
@ -223,9 +235,10 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeChamferWithPosition (C
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeFillet
* incident pipes (radius, width, half-length). A fillet is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A fillet is created
* on the junction of the pipes.
* Center of the shape is (0,0,0). The main plane of the T-shape is XOY. * Center of the shape is (0,0,0). The main plane of the T-shape is XOY.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
@ -234,7 +247,7 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeChamferWithPosition (C
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theRF Radius of curvature of fillet. * \param theRF Radius of curvature of fillet.
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================
@ -262,18 +275,23 @@ GEOM::ListOfGO* GEOM_IAdvancedOperations_i::MakePipeTShapeFillet (CORBA::Double
//============================================================================= //=============================================================================
/*! /*!
* Create a T-shape object with specified caracteristics for the main and the * MakePipeTShapeFilletWithPosition
* incident pipes (radius, width, half-length). A fillet is created on * Create a T-shape object with specified caracteristics for the main and
* the junction of the pipes. * the incident pipes (radius, width, half-length). A fillet is created
* The T-shape is placed at junction points P1, P2 and P3. * on the junction of the pipes.
* The extremities of the main pipe are located on junctions points P1 and P2.
* The extremity of the incident pipe is located on junction point P3.
* \param theR1 Internal radius of main pipe * \param theR1 Internal radius of main pipe
* \param theW1 Width of main pipe * \param theW1 Width of main pipe
* \param theL1 Half-length of main pipe * \param theL1 Half-length of main pipe
* \param theR2 Internal radius of incident pipe (R2 < R1) * \param theR2 Internal radius of incident pipe (R2 < R1)
* \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1)
* \param theL2 Half-length of incident pipe * \param theL2 Half-length of incident pipe
* \param theRF Radius of curvature of fillet. * \param theRF Radius of curvature of fillet
* \param theHexMesh false = no partition, true = with partition * \param theHexMesh Boolean indicating if shape is prepared for hex mesh
* \param theP1 1st junction point of main pipe
* \param theP2 2nd junction point of main pipe
* \param theP3 Junction point of incident pipe
* \return List of GEOM_Objects, containing the created shape and propagation groups. * \return List of GEOM_Objects, containing the created shape and propagation groups.
*/ */
//============================================================================= //=============================================================================

30
src/GEOM_SWIG/geompyDC.py
View File

@ -4136,21 +4136,23 @@ class geompyDC(GEOM._objref_GEOM_Gen):
## Create a T-shape object with specified caracteristics for the main ## Create a T-shape object with specified caracteristics for the main
# and the incident pipes (radius, width, half-length). # and the incident pipes (radius, width, half-length).
# Center of the shape is (0,0,0). The main plane of the T-shape is # The extremities of the main pipe are located on junctions points P1 and P2.
# XOY. # The extremity of the incident pipe is located on junction point P3.
# If P1, P2 and P3 are not given, the center of the shape is (0,0,0) and
# the main plane of the T-shape is XOY.
# @param theR1 Internal radius of main pipe # @param theR1 Internal radius of main pipe
# @param theW1 Width of main pipe # @param theW1 Width of main pipe
# @param theL1 Half-length of main pipe # @param theL1 Half-length of main pipe
# @param theR2 Internal radius of incident pipe (R2 < R1) # @param theR2 Internal radius of incident pipe (R2 < R1)
# @param theW2 Width of incident pipe (R2+W2 < R1+W1) # @param theW2 Width of incident pipe (R2+W2 < R1+W1)
# @param theL2 Half-length of incident pipe # @param theL2 Half-length of incident pipe
# @param theHexMesh false = no partition, true = with partition (default=true) # @param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=True)
# @param theP1 1st junction point of main pipe # @param theP1 1st junction point of main pipe
# @param theP2 2nd junction point of main pipe # @param theP2 2nd junction point of main pipe
# @param theP3 Junction point of incident pipe # @param theP3 Junction point of incident pipe
# @return List of GEOM_Objects, containing the created shape and propagation groups. # @return List of GEOM_Objects, containing the created shape and propagation groups.
# #
# @ref tui_creation_tshape "Example" # @ref tui_creation_pipetshape "Example"
def MakePipeTShape(self, theR1, theW1, theL1, theR2, theW2, theL2, theHexMesh=True, theP1=None, theP2=None, theP3=None): def MakePipeTShape(self, theR1, theW1, theL1, theR2, theW2, theL2, theHexMesh=True, theP1=None, theP2=None, theP3=None):
theR1, theW1, theL1, theR2, theW2, theL2, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2) theR1, theW1, theL1, theR2, theW2, theL2, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2)
if (theP1 and theP2 and theP3): if (theP1 and theP2 and theP3):
@ -4164,8 +4166,10 @@ class geompyDC(GEOM._objref_GEOM_Gen):
## Create a T-shape object with specified caracteristics for the main ## Create a T-shape object with specified caracteristics for the main
# and the incident pipes (radius, width, half-length). A chamfer is # and the incident pipes (radius, width, half-length). A chamfer is
# created on the junction of the pipes. # created on the junction of the pipes.
# Center of the shape is (0,0,0). The main plane of the T-shape is # The extremities of the main pipe are located on junctions points P1 and P2.
# XOY. # The extremity of the incident pipe is located on junction point P3.
# If P1, P2 and P3 are not given, the center of the shape is (0,0,0) and
# the main plane of the T-shape is XOY.
# @param theR1 Internal radius of main pipe # @param theR1 Internal radius of main pipe
# @param theW1 Width of main pipe # @param theW1 Width of main pipe
# @param theL1 Half-length of main pipe # @param theL1 Half-length of main pipe
@ -4174,13 +4178,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
# @param theL2 Half-length of incident pipe # @param theL2 Half-length of incident pipe
# @param theH Height of the chamfer. # @param theH Height of the chamfer.
# @param theW Width of the chamfer. # @param theW Width of the chamfer.
# @param theHexMesh false = no partition, true = with partition (default=true) # @param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=True)
# @param theP1 1st junction point of main pipe # @param theP1 1st junction point of main pipe
# @param theP2 2nd junction point of main pipe # @param theP2 2nd junction point of main pipe
# @param theP3 Junction point of incident pipe # @param theP3 Junction point of incident pipe
# @return List of GEOM_Objects, containing the created shape and propagation groups. # @return List of GEOM_Objects, containing the created shape and propagation groups.
# #
# @ref tui_creation_tshape "Example" # @ref tui_creation_pipetshape "Example"
def MakePipeTShapeChamfer(self, theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, theHexMesh=True, theP1=None, theP2=None, theP3=None): def MakePipeTShapeChamfer(self, theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, theHexMesh=True, theP1=None, theP2=None, theP3=None):
theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2, theH, theW) theR1, theW1, theL1, theR2, theW2, theL2, theH, theW, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2, theH, theW)
if (theP1 and theP2 and theP3): if (theP1 and theP2 and theP3):
@ -4194,8 +4198,10 @@ class geompyDC(GEOM._objref_GEOM_Gen):
## Create a T-shape object with specified caracteristics for the main ## Create a T-shape object with specified caracteristics for the main
# and the incident pipes (radius, width, half-length). A fillet is # and the incident pipes (radius, width, half-length). A fillet is
# created on the junction of the pipes. # created on the junction of the pipes.
# Center of the shape is (0,0,0). The main plane of the T-shape is # The extremities of the main pipe are located on junctions points P1 and P2.
# XOY. # The extremity of the incident pipe is located on junction point P3.
# If P1, P2 and P3 are not given, the center of the shape is (0,0,0) and
# the main plane of the T-shape is XOY.
# @param theR1 Internal radius of main pipe # @param theR1 Internal radius of main pipe
# @param theW1 Width of main pipe # @param theW1 Width of main pipe
# @param theL1 Half-length of main pipe # @param theL1 Half-length of main pipe
@ -4203,13 +4209,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
# @param theW2 Width of incident pipe (R2+W2 < R1+W1) # @param theW2 Width of incident pipe (R2+W2 < R1+W1)
# @param theL2 Half-length of incident pipe # @param theL2 Half-length of incident pipe
# @param theRF Radius of curvature of fillet. # @param theRF Radius of curvature of fillet.
# @param theHexMesh false = no partition, true = with partition (default=true) # @param theHexMesh Boolean indicating if shape is prepared for hex mesh (default=True)
# @param theP1 1st junction point of main pipe # @param theP1 1st junction point of main pipe
# @param theP2 2nd junction point of main pipe # @param theP2 2nd junction point of main pipe
# @param theP3 Junction point of incident pipe # @param theP3 Junction point of incident pipe
# @return List of GEOM_Objects, containing the created shape and propagation groups. # @return List of GEOM_Objects, containing the created shape and propagation groups.
# #
# @ref tui_creation_tshape "Example" # @ref tui_creation_pipetshape "Example"
def MakePipeTShapeFillet(self, theR1, theW1, theL1, theR2, theW2, theL2, theRF, theHexMesh=True, theP1=None, theP2=None, theP3=None): def MakePipeTShapeFillet(self, theR1, theW1, theL1, theR2, theW2, theL2, theRF, theHexMesh=True, theP1=None, theP2=None, theP3=None):
theR1, theW1, theL1, theR2, theW2, theL2, theRF, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2, theRF) theR1, theW1, theL1, theR2, theW2, theL2, theRF, Parameters = ParseParameters(theR1, theW1, theL1, theR2, theW2, theL2, theRF)
if (theP1 and theP2 and theP3): if (theP1 and theP2 and theP3):