ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 02:00:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

EDF 2281 : Moved divided primitives in the New Entity --> Blocks menu and updated the documentation correspondingly

Browse Source
This commit is contained in:
rnc 2012-07-23 09:40:35 +00:00
parent d1f94f9da7
commit 3d73ab4d8c
6 changed files with 24 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/salome/gui/GEOM/doxyfile.in
View File

@ -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

102
doc/salome/gui/GEOM/input/building_by_blocks.doc
View File

@ -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 <em>New
Some functionalities that allow building blocks easily are available from the main menu via <em>New
Entity / Blocks</em>.
<ul>
<li>\ref quad_face_anchor "Quadrangle face"</li>
<li>\ref hexa_solid_anchor "Hexahedral solid"</li>
<li>\subpage create_quadrangle_face_page "Quadrangle face"</li>
<li>\subpage create_hexa_solid_page "Hexahedral solid" </li>
<li>\subpage create_divideddisk_page "Divided disk" </li>
<li>\subpage create_dividedcylinder_page "Divided cylinder" </li>
</ul>
<br>
\anchor quad_face_anchor
<h2>Quadrangle face</h2>
\n <b>Description:</b> 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 <b>TUI Command:</b>
<ul>
<li><em>geompy.MakeQuad4Vertices(V1, V2, V3, V4),</em> where V1, V2,
V3, V4 are four vertices from which a face is constructed. Edges are
created automatically.</li>
<li><em>geompy.MakeQuad2Edges(E1, E2),</em> where E1, E2 are edges from
which the face is constructed, two other edges are created
automatically.</li>
<li><em>geompy.MakeQuad(E1, E2, E3, E4),</em> where E1, E2, E3, E4 are
four edges from which the face is constructed.</li>
</ul>
<b>Arguments:</b>
<ul>
<li>Name + 4 Points, or</li>
<li>Name + 2 Edges, or</li>
<li>Name + 4 Edges.</li>
</ul>
\n <b>Dialog Box:</b>
\image html block1.png
\image html block2.png
\image html block3.png
\n <b>Example:</b>
\image html image185.png "Quadrangle face built by blocks"
<br><br>
\anchor hexa_solid_anchor
<h2>Hexahedral solid</h2>
\n <b>Description:</b> 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 <b>TUI Command:</b>
<ul>
<li><em>geompy.MakeHexa2Faces(F1, F2),</em> where F1 and F2 are faces
from which the hexahedron is constructed, other four faces are created
automatically.</li>
<li><em>geompy.MakeHexa(F1, F2, F3, F4, F5, F6),</em> where F1 &mdash; F6 are six faces from which the hexahedron is constructed.</li>
</ul>
\n <b>Arguments:</b>
<ul>
<li>Name + 2 Faces, or</li>
<li>Name + 6 Faces.</li>
</ul>
\n <b>Dialog Box:</b>
\image html block4.png
\image html block5.png
\n <b>Example:</b>
\image html image180.png
<center>Hexahedral Solid built on the base of six Faces</center>
\image html image181.png
<center>Hexahedral Solid built on the base of two Faces</center>
The created blocks can be processed with \ref blocks_operations_page "Operations on Blocks".
Our <b>TUI Scripts</b> provide you with useful examples of
\ref tui_building_by_blocks_page "Building by Blocks".
*/

2
doc/salome/gui/GEOM/input/creating_adv_obj.doc
View File

@ -10,5 +10,5 @@
<li>\subpage create_dividedcylinder_page</li>
<!--@@ insert new functions before this line @@ do not remove this line @@-->
</ul>
<!--WRNING : In order to let this page appear in the documentation please remove this file from the EXCLUDE_PATTERNS field of the doxyfile.in file in ../ -->
*/

1
doc/salome/gui/GEOM/input/creating_geom_objects.doc
View File

@ -9,7 +9,6 @@ range of geometrical objects, from points to complex extrusions:
<li>create \subpage create_basic_geom_obj_page "Basic objects" - points,
lines, circles...</li>
<li>create \subpage create_primitives_page "Primitives" - cubes, spheres, cones...</li>
<li>create \subpage create_adv_obj_page "Advanced geometrical objects" - Pipe TShape...</li>
<li>create \subpage create_complex_obj_page "Complex objects" by
extrusion, rotation, interpolation of other objects.</li>
<li>create and edit \subpage work_with_groups_page "Groups of objects" of

1
doc/salome/gui/GEOM/input/creating_primitives.doc
View File

@ -13,6 +13,7 @@ geometrical objects, such as:
<li>\subpage create_cone_page</li>
<li>\subpage create_squareface_page</li>
<li>\subpage create_disk_page</li>
<li>\subpage create_pipetshape_page</li>
</ul>
*/

24
src/GEOMGUI/GeometryGUI.cxx
View File

@ -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 --------------------------