From 72a229c531962c9b07b12164f331c85d1a595c00 Mon Sep 17 00:00:00 2001 From: gdd Date: Mon, 19 Apr 2010 17:52:05 +0000 Subject: [PATCH] 0020695: EDF 1076 GEOM: Add a new shape in GEOM: T-shape Update documentation --- idl/GEOM_Gen.idl | 23 ++---- src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx | 2 +- src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx | 44 ++++++----- src/GEOM_I/GEOM_IAdvancedOperations_i.cc | 74 ++++++++++++------- src/GEOM_SWIG/geompyDC.py | 30 +++++--- 5 files changed, 98 insertions(+), 75 deletions(-) diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 02c2e4690..ed22e1e18 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -3162,26 +3162,24 @@ module GEOM * \param theR2 Internal radius of incident pipe (R2 < R1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \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. */ ListOfGO MakePipeTShape (in double theR1, in double theW1, in double theL1, in double theR2, in double theW2, in double theL2, in boolean theHexMesh); - /*! * Create a T-shape object with specified caracteristics for the main and * 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 theW1 Width of main pipe * \param theL1 Half-length of main pipe * \param theR2 Internal radius of incident pipe (R2 < R1) * \param theW2 Width of incident pipe (R2+W2 < R1+W1) * \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 theP2 2nd junction point of main pipe * \param theP3 Junction point of incident pipe @@ -3191,13 +3189,11 @@ module GEOM in double theR2, in double theW2, in double theL2, in boolean theHexMesh, in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); - /*! * 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. - * * \param theR1 Internal radius of main pipe * \param theW1 Width of main pipe * \param theL1 Half-length of main pipe @@ -3206,20 +3202,18 @@ module GEOM * \param theL2 Half-length of incident pipe * \param theH Height 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. */ ListOfGO MakePipeTShapeChamfer (in double theR1, in double theW1, in double theL1, in double theR2, in double theW2, in double theL2, in double theH, in double theW, in boolean theHexMesh); - /*! * 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. * 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 theW1 Width of main pipe * \param theL1 Half-length of main pipe @@ -3228,7 +3222,7 @@ module GEOM * \param theL2 Half-length of incident pipe * \param theH Height 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 theP2 2nd junction point of main 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 theH, in double theW, in boolean theHexMesh, in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); - /*! * Create a T-shape object with specified caracteristics for the main and * 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. - * * \param theR1 Internal radius of main pipe * \param theW1 Width 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 theL2 Half-length of incident pipe * \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. */ ListOfGO MakePipeTShapeFillet (in double theR1, in double theW1, in double theL1, in double theR2, in double theW2, in double theL2, in double theRF, in boolean theHexMesh); - /*! * Create a T-shape object with specified caracteristics for the main and * the incident pipes (radius, width, half-length). A fillet 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 theW1 Width 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 theL2 Half-length of incident pipe * \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 theP2 2nd junction point of main 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 theRF, in boolean theHexMesh, in GEOM_Object theP1, in GEOM_Object theP2, in GEOM_Object theP3); - /*@@ insert new functions before this line @@*/ }; diff --git a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx index 6819b66fc..f7a53d238 100644 --- a/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx +++ b/src/AdvancedGUI/AdvancedGUI_PipeTShapeDlg.cxx @@ -161,7 +161,7 @@ AdvancedGUI_PipeTShapeDlg::AdvancedGUI_PipeTShapeDlg(GeometryGUI* theGeometryGUI myMainLayout->addWidget(JunctionPointsSel, rowNewPosVal, colNewPosVal, rowspanNewPosVal, colspanNewPosVal); /***************************************************************/ - setHelpFileName("create_pipe_tshape_page.html"); + setHelpFileName("create__pipetshape__page.html"); Init(); } diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx index 3bcdcff93..46cb32ad0 100644 --- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx @@ -1236,8 +1236,8 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapeMirrorAndGlue(/*std::vector