From 3d73ab4d8c399aef56e17705dc39bfa37feb53c5 Mon Sep 17 00:00:00 2001 From: rnc Date: Mon, 23 Jul 2012 09:40:35 +0000 Subject: [PATCH] EDF 2281 : Moved divided primitives in the New Entity --> Blocks menu and updated the documentation correspondingly --- doc/salome/gui/GEOM/doxyfile.in | 1 + .../gui/GEOM/input/building_by_blocks.doc | 98 ++----------------- .../gui/GEOM/input/creating_adv_obj.doc | 2 +- .../gui/GEOM/input/creating_geom_objects.doc | 1 - .../gui/GEOM/input/creating_primitives.doc | 1 + src/GEOMGUI/GeometryGUI.cxx | 24 ++--- 6 files changed, 22 insertions(+), 105 deletions(-) diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in index 45859ef60..06d9bfd86 100755 --- a/doc/salome/gui/GEOM/doxyfile.in +++ b/doc/salome/gui/GEOM/doxyfile.in @@ -40,6 +40,7 @@ WARNINGS = YES #--------------------------------------------------------------------------- INPUT = @srcdir@/input FILE_PATTERNS = *.doc +EXCLUDE_PATTERNS = creating_adv_obj.doc EXCLUDE = IMAGE_PATH = @srcdir@/images EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG diff --git a/doc/salome/gui/GEOM/input/building_by_blocks.doc b/doc/salome/gui/GEOM/input/building_by_blocks.doc index 5a39fbf1a..a3257f747 100644 --- a/doc/salome/gui/GEOM/input/building_by_blocks.doc +++ b/doc/salome/gui/GEOM/input/building_by_blocks.doc @@ -17,103 +17,17 @@ Hexahedral Block - is a block with constraints for hexahedral meshing. Block Compound - is a compound composed of blocks only. -These functionalities are available from the main menu via New +Some functionalities that allow building blocks easily are available from the main menu via New Entity / Blocks. -
-\anchor quad_face_anchor -

Quadrangle face

- -\n Description: Builds a face using the below mentioned -arguments. This operation allows to build a face bypassing the -intermediate stage of building edges and wires (in the case of -building by 4 points) or wires (in the case of building by 4 or 2 -edges). - -\n The \b Result of the operation will be a \b GEOM_Object (face). - -\n TUI Command: - - -Arguments: - - -\n Dialog Box: - -\image html block1.png - -\image html block2.png - -\image html block3.png - -\n Example: -\image html image185.png "Quadrangle face built by blocks" - - -

-\anchor hexa_solid_anchor -

Hexahedral solid

- -\n Description: Builds a hexahedral solid. either of the below -mentioned arguments. This operation allows to build a solid bypassing -the intermediate stage of building a shell and 4 faces (in the case of -building by 2 faces) or just a shell (in the case of building by 6 -faces). - -\n The \b Result of the operation will be a \b GEOM_Object (solid). - -\n TUI Command: - - -\n Arguments: - - -\n Dialog Box: - -\image html block4.png - - - -\image html block5.png - -\n Example: - -\image html image180.png -
Hexahedral Solid built on the base of six Faces
- -\image html image181.png -
Hexahedral Solid built on the base of two Faces
- +*/ -The created blocks can be processed with \ref blocks_operations_page "Operations on Blocks". -Our TUI Scripts provide you with useful examples of -\ref tui_building_by_blocks_page "Building by Blocks". -*/ diff --git a/doc/salome/gui/GEOM/input/creating_adv_obj.doc b/doc/salome/gui/GEOM/input/creating_adv_obj.doc index a3835bf86..648a18ae9 100644 --- a/doc/salome/gui/GEOM/input/creating_adv_obj.doc +++ b/doc/salome/gui/GEOM/input/creating_adv_obj.doc @@ -10,5 +10,5 @@
  • \subpage create_dividedcylinder_page
    • - + */ diff --git a/doc/salome/gui/GEOM/input/creating_geom_objects.doc b/doc/salome/gui/GEOM/input/creating_geom_objects.doc index 2db4f00dc..66178b2ea 100644 --- a/doc/salome/gui/GEOM/input/creating_geom_objects.doc +++ b/doc/salome/gui/GEOM/input/creating_geom_objects.doc @@ -9,7 +9,6 @@ range of geometrical objects, from points to complex extrusions:
  • create \subpage create_basic_geom_obj_page "Basic objects" - points, lines, circles...
  • create \subpage create_primitives_page "Primitives" - cubes, spheres, cones...
    • -
  • create \subpage create_adv_obj_page "Advanced geometrical objects" - Pipe TShape...
  • create \subpage create_complex_obj_page "Complex objects" by extrusion, rotation, interpolation of other objects.
  • create and edit \subpage work_with_groups_page "Groups of objects" of diff --git a/doc/salome/gui/GEOM/input/creating_primitives.doc b/doc/salome/gui/GEOM/input/creating_primitives.doc index 467fe3ac5..babf1e227 100644 --- a/doc/salome/gui/GEOM/input/creating_primitives.doc +++ b/doc/salome/gui/GEOM/input/creating_primitives.doc @@ -13,6 +13,7 @@ geometrical objects, such as:
  • \subpage create_cone_page
  • \subpage create_squareface_page
  • \subpage create_disk_page
    • +
  • \subpage create_pipetshape_page
    • */ diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 72221cce8..1ae3b2977 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -914,9 +914,9 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpEllipse, basicId, -1 ); createMenu( GEOMOp::OpArc, basicId, -1 ); createMenu( GEOMOp::OpCurve, basicId, -1 ); - createMenu( separator(), basicId, -1 ); createMenu( GEOMOp::Op2dSketcher, basicId, -1 ); createMenu( GEOMOp::Op3dSketcher, basicId, -1 ); + createMenu( separator(), basicId, -1 ); createMenu( GEOMOp::OpVector, basicId, -1 ); createMenu( GEOMOp::OpPlane, basicId, -1 ); createMenu( GEOMOp::OpLCS, basicId, -1 ); @@ -938,11 +938,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( GEOMOp::OpFilling, genId, -1 ); createMenu( GEOMOp::OpPipe, genId, -1 ); - int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); -// createMenu( GEOMOp::OpPipeTShape, advId, -1 ); -// createMenu( GEOMOp::OpPipeTShapeGroups, advId, -1 ); - createMenu( GEOMOp::OpDividedDisk, advId, -1 ); - createMenu( GEOMOp::OpDividedCylinder, advId, -1 ); +// int advId = createMenu( tr( "MEN_ADVANCED" ), newEntId, -1 ); + //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// createMenu( separator(), newEntId, -1 ); @@ -954,8 +951,10 @@ void GeometryGUI::initialize( CAM_Application* app ) createMenu( separator(), newEntId, -1 ); int blocksId = createMenu( tr( "MEN_BLOCKS" ), newEntId, -1 ); - createMenu( GEOMOp::OpQuadFace, blocksId, -1 ); - createMenu( GEOMOp::OpHexaSolid, blocksId, -1 ); + createMenu( GEOMOp::OpQuadFace, blocksId, -1 ); + createMenu( GEOMOp::OpHexaSolid, blocksId, -1 ); + createMenu( GEOMOp::OpDividedDisk, blocksId, -1 ); + createMenu( GEOMOp::OpDividedCylinder, blocksId, -1 ); createMenu( separator(), newEntId, -1 ); @@ -1122,6 +1121,10 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpDisk, primTbId ); createTool( GEOMOp::OpPipeTShape, primTbId ); //rnc + int blocksTbId = createTool( tr( "TOOL_BLOCKS" ) ); + createTool( GEOMOp::OpDividedDisk, blocksTbId ); + createTool( GEOMOp::OpDividedCylinder, blocksTbId ); + // int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); //rnc // createTool( GEOMOp::OpPipeTShape, advancedTbId ); @@ -1198,9 +1201,8 @@ void GeometryGUI::initialize( CAM_Application* app ) createTool( GEOMOp::OpFeatureDetect, picturesTbId ); #endif - int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); - createTool( GEOMOp::OpDividedDisk, advancedTbId ); - createTool( GEOMOp::OpDividedCylinder, advancedTbId ); +// int advancedTbId = createTool( tr( "TOOL_ADVANCED" ) ); + //@@ insert new functions before this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@ do not remove this line @@// // ---- create popup menus -------------------------- -- 2.39.2