From 12e003c944dc788aeacdd6136f8e148af8c9357e Mon Sep 17 00:00:00 2001 From: ana Date: Fri, 13 Jan 2012 12:25:13 +0000 Subject: [PATCH] Fix for the bug bug IPAL22851: Sub-shapes spelling --- .../gui/GEOM/input/common_operation.doc | 2 +- .../gui/GEOM/input/creating_compound.doc | 2 +- .../gui/GEOM/input/creating_explode.doc | 16 ++++++------ doc/salome/gui/GEOM/input/creating_wire.doc | 2 +- doc/salome/gui/GEOM/input/cut_operation.doc | 2 +- doc/salome/gui/GEOM/input/fuse_operation.doc | 2 +- .../gui/GEOM/input/glue_edges_operation.doc | 8 +++--- .../gui/GEOM/input/glue_faces_operation.doc | 8 +++--- .../GEOM/input/modify_location_operation.doc | 8 +++--- .../gui/GEOM/input/offset_operation.doc | 2 +- doc/salome/gui/GEOM/input/partition.doc | 4 +-- .../input/remove_extra_edges_operation.doc | 2 +- .../input/restore_presentation_parameters.doc | 24 ++++++++--------- .../gui/GEOM/input/rotation_operation.doc | 4 +-- doc/salome/gui/GEOM/input/scale_operation.doc | 2 +- .../gui/GEOM/input/section_operation.doc | 2 +- doc/salome/gui/GEOM/input/shared_shapes.doc | 8 +++--- .../GEOM/input/suppress_holes_operation.doc | 2 +- .../gui/GEOM/input/transforming_geom_objs.doc | 2 +- .../gui/GEOM/input/translation_operation.doc | 6 ++--- .../gui/GEOM/input/tui_basic_operations.doc | 10 +++---- .../GEOM/input/using_measurement_tools.doc | 2 +- .../gui/GEOM/input/working_with_groups.doc | 26 +++++++++---------- 23 files changed, 73 insertions(+), 73 deletions(-) diff --git a/doc/salome/gui/GEOM/input/common_operation.doc b/doc/salome/gui/GEOM/input/common_operation.doc index 15a3607ff..f6903e24c 100644 --- a/doc/salome/gui/GEOM/input/common_operation.doc +++ b/doc/salome/gui/GEOM/input/common_operation.doc @@ -16,7 +16,7 @@ The \b Result will be any \b GEOM_Object. TUI Command: geompy.MakeCommon(s1, s2) Arguments: Name + 2 shapes. Advanced option: -\ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments". +\ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". \image html bool2.png diff --git a/doc/salome/gui/GEOM/input/creating_compound.doc b/doc/salome/gui/GEOM/input/creating_compound.doc index d139c2b11..ad1a899fe 100644 --- a/doc/salome/gui/GEOM/input/creating_compound.doc +++ b/doc/salome/gui/GEOM/input/creating_compound.doc @@ -11,7 +11,7 @@ Entity - > Build - > Compound. \n TUI Command: geompy.MakeCompound(ListOfShape) \n Arguments: Name + List of shapes. \n Advanced option: - \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments". + \ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". \image html neo-obj7.png diff --git a/doc/salome/gui/GEOM/input/creating_explode.doc b/doc/salome/gui/GEOM/input/creating_explode.doc index fd90a0383..b2f971864 100644 --- a/doc/salome/gui/GEOM/input/creating_explode.doc +++ b/doc/salome/gui/GEOM/input/creating_explode.doc @@ -2,12 +2,12 @@ \page create_explode_page Explode -\n To \b Explode an object into subshapes, in the Main Menu +\n To \b Explode an object into sub-shapes, in the Main Menu select New Entity > Explode. -\n To create a list of subshapes (vertices, edges, wires etc.) of the +\n To create a list of sub-shapes (vertices, edges, wires etc.) of the given shape using the \b Explode operation, you need to define the Main -Object, which will be exploded and the Type of Subshapes you wish to +Object, which will be exploded and the Type of Sub-shapes you wish to obtain from it. \n The \b Result of the operation will be a List of \b GEOM_Objects (vertexes, edges, wires, faces, shells or solids). @@ -16,19 +16,19 @@ obtain from it. variety of ways: diff --git a/doc/salome/gui/GEOM/input/translation_operation.doc b/doc/salome/gui/GEOM/input/translation_operation.doc index 98fe6808a..60ca83c62 100644 --- a/doc/salome/gui/GEOM/input/translation_operation.doc +++ b/doc/salome/gui/GEOM/input/translation_operation.doc @@ -18,7 +18,7 @@ DZ), where Shape is a shape to be translated, DX, DY, DZ are components of translation vector. \n Arguments: Name + one or several objects + 3 values (coordinates). \n Advanced option: - \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments". + \ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". \image html transformation1.png @@ -27,7 +27,7 @@ of the vector. \n TUI Command: geompy.MakeTranslationTwoPoints(Object, Point1, Point2) \n Arguments: Name + one or several objects + 2 vertices \n Advanced option: - \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments". + \ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". \image html transformation2.png @@ -39,7 +39,7 @@ and the dialog preview will display the vector along which the object will be tr \n TUI Command for translation by vector and custom distance: geompy.MakeTranslationVectorDistance(Object, Vector, Distance) \n Arguments: Name + one or several objects + 1 vector. \n Advanced option: - \ref restore_presentation_parameters_page "Set presentation parameters and subshapes from arguments". + \ref restore_presentation_parameters_page "Set presentation parameters and sub-shapes from arguments". \image html transformation3.png diff --git a/doc/salome/gui/GEOM/input/tui_basic_operations.doc b/doc/salome/gui/GEOM/input/tui_basic_operations.doc index 50c8a7c3d..aec3a7465 100644 --- a/doc/salome/gui/GEOM/input/tui_basic_operations.doc +++ b/doc/salome/gui/GEOM/input/tui_basic_operations.doc @@ -80,7 +80,7 @@ gg.setDisplayMode(id_archimede,1) \endcode \anchor tui_restore_prs_params -

Restore presentation parameters and subshapes

+

Restore presentation parameters and sub-shapes

\code import geompy @@ -113,8 +113,8 @@ geompy.addToStudy(partition1, "Partition_1") geompy.addToStudy(partition2, "Partition_2") geompy.addToStudy(partition3, "Partition_3") -# Restore presentation parameters and subshapes -# different methods can be used to find the subshapes in the result: +# Restore presentation parameters and sub-shapes +# different methods can be used to find the sub-shapes in the result: # GetInPlace, GetSame, GetInPlaceByHistory, GetShapesOnShape. # By default, GetInPlace method is used (GEOM.FSM_GetInPlace) geompy.RestoreSubShapes(partition1) @@ -125,10 +125,10 @@ geompy.RestoreSubShapes(partition2, [], GEOM.FSM_GetInPlace) # but restore only the passed. geompy.RestoreSubShapes(partition3, [tra], GEOM.FSM_GetInPlaceByHistory) -# To find subshapes in a transformed shape only one method could be +# To find sub-shapes in a transformed shape only one method could be # used: pass GEOM.FSM_Transformed for that. # True passed for the last argument, means that the transformed shape -# will inherit colour and subshapes from its first argument (see above +# will inherit colour and sub-shapes from its first argument (see above # MakeTranslation). geompy.RestoreSubShapes(tra, [], GEOM.FSM_Transformed, True) diff --git a/doc/salome/gui/GEOM/input/using_measurement_tools.doc b/doc/salome/gui/GEOM/input/using_measurement_tools.doc index 8eb29375b..9f30de2a4 100644 --- a/doc/salome/gui/GEOM/input/using_measurement_tools.doc +++ b/doc/salome/gui/GEOM/input/using_measurement_tools.doc @@ -265,7 +265,7 @@ is returned, and encountered errors are printed in the python console. \n Checks the topology of the selected shape to detect self-intersections. Returns True if there are no self-intersections. Reports pairs of - intersected sub shapes, if there are any. + intersected sub-shapes, if there are any. \note This tool is useful for detection of shapes, not suitable for arguments of Boolean operations and Partition algorithm. diff --git a/doc/salome/gui/GEOM/input/working_with_groups.doc b/doc/salome/gui/GEOM/input/working_with_groups.doc index 7c671fe64..07838d585 100644 --- a/doc/salome/gui/GEOM/input/working_with_groups.doc +++ b/doc/salome/gui/GEOM/input/working_with_groups.doc @@ -2,15 +2,15 @@ \page work_with_groups_page Working with groups -Creation and editing groups of subshapes of a geometrical object makes -handling subshapes much easier. This functionality is available in OCC +Creation and editing groups of sub-shapes of a geometrical object makes +handling sub-shapes much easier. This functionality is available in OCC viewer only.

Create a group

\image html image56.png -To create a group of subshapes of a geometrical object in the main +To create a group of sub-shapes of a geometrical object in the main menu select New entity > Group > Create \n The following menu will appear: @@ -32,7 +32,7 @@ Shape.
  • Geometrical parts of the Second Shape restricts the range of accessible elements to the sub-shapes of the Main Shape that geometrically coincide with the Second Shape.
    • -
  • Only Sub-Shapes of the Second Shape restricts the range of +
  • Only Sub-shapes of the Second Shape restricts the range of accessible elements to the sub-shapes of the Main Shape that are sub-shapes of the Second Shape. This is useful because sometimes purely geometrical coincidence is not enough and it @@ -41,9 +41,9 @@ to the main and the second shape.
  • You can selectively display the selected elements using the following buttons:
  • You can select the elements of your group in two ways: