From: skv Date: Mon, 27 Oct 2014 11:43:25 +0000 (+0300) Subject: Create documentation X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fskv%2F22753;p=modules%2Fgeom.git Create documentation --- diff --git a/doc/salome/gui/GEOM/images/extend_edge_example.png b/doc/salome/gui/GEOM/images/extend_edge_example.png new file mode 100644 index 000000000..f8a88e9ec Binary files /dev/null and b/doc/salome/gui/GEOM/images/extend_edge_example.png differ diff --git a/doc/salome/gui/GEOM/images/extend_face_example.png b/doc/salome/gui/GEOM/images/extend_face_example.png new file mode 100644 index 000000000..26281f1c4 Binary files /dev/null and b/doc/salome/gui/GEOM/images/extend_face_example.png differ diff --git a/doc/salome/gui/GEOM/images/extension1.png b/doc/salome/gui/GEOM/images/extension1.png new file mode 100644 index 000000000..419d44e66 Binary files /dev/null and b/doc/salome/gui/GEOM/images/extension1.png differ diff --git a/doc/salome/gui/GEOM/images/extension2.png b/doc/salome/gui/GEOM/images/extension2.png new file mode 100644 index 000000000..e4ac66a25 Binary files /dev/null and b/doc/salome/gui/GEOM/images/extension2.png differ diff --git a/doc/salome/gui/GEOM/input/extension_operation.doc b/doc/salome/gui/GEOM/input/extension_operation.doc new file mode 100644 index 000000000..417577adb --- /dev/null +++ b/doc/salome/gui/GEOM/input/extension_operation.doc @@ -0,0 +1,58 @@ +/*! + +\page extension_operation_page Extension of an Edge or a Face + +\n To produce an \b Extension in the Main Menu select +Operations - > Transformation - > Extension + +\n This operation resizes an \b Edge by means of first + and last parameters modification or a \b Face by means of modification + of minimal and maximal U- and V-Parameters. \n +\ref restore_presentation_parameters_page "Advanced options". + +The type of extension is defined using the radio buttons. + +Firstly it is possible to resize an \b Edge. +\n TUI Command: geompy.ExtendEdge(theEdge, theMin, theMax), +where \em theEdge the input edge to be resized, \em theMin the minimal +parameter value, \em theMax the maximal parameter value. +\n Arguments: Name + Object (Edge) + 2 values (Min and Max Parameters). + +\image html extension1.png "Extension of an Edge" + +\n Example: + +\image html extend_edge_example.png "Original edge (white) and extended edge" + +\note The input Edge parameters range is [0, 1]. If \b theMin parameter is + negative, the input Edge is extended, otherwise it is shrinked by + \b theMin parameter. If \b theMax is greater than 1, the Edge is + extended, otherwise it is shrinked by \btheMax parameter. + +Secondly it is possible to resize a \b Face. +\n TUI Command: geompy.ExtendFace(theFace, theUMin, theUMax, +theVMin, theVMax), where \em theFace the input face to be resized, +\em theUMin the minimal U-Parameter value, \em theUMax the maximal U-Parameter +value, \em theVMin the minimal V-Parameter value, \em theVMax the maximal +V-Parameter value. +\n Arguments: Name + Object (Face) + 4 values (Min and Max U- and +V-Parameters). + +\image html extension2.png "Extension of a Face" + +\n Example: + +\image html extend_face_example.png "The original face (gray) and a result + face shrinked along U-Direction and extended along V-Direction" + +\note The input Face U- and V-Parameters range is [0, 1]. If \b theUMin + parameter is negative, the input Face is extended, otherwise it is + shrinked along U-Direction by \b theUMin parameter. If theUMax is + greater than 1, the Face is extended, otherwise it is shrinked along + U-Direction by \b theUMax parameter. So as for \b theVMin, \b theVMax + and V-Direction of the input Face. + +Our TUI Scripts provide you with useful examples of the use of +\ref tui_extend "Extension Operations". + +*/ diff --git a/doc/salome/gui/GEOM/input/transformation_operations.doc b/doc/salome/gui/GEOM/input/transformation_operations.doc index 075973737..ac745b669 100644 --- a/doc/salome/gui/GEOM/input/transformation_operations.doc +++ b/doc/salome/gui/GEOM/input/transformation_operations.doc @@ -16,6 +16,7 @@ which allow to:
  • \subpage scale_operation_page "Scale" an object by one or several scale factors.
  • Create an \subpage offset_operation_page "Offset" of an object.
  • Create a \subpage projection_operation_page "Projection" of an object on a face.
    • +
  • Create an \subpage extension_operation_page "Extension" of an edge or a face.
  • Create a simultaneous \subpage multi_translation_operation_page "Translation in several directions".
  • Create a simultaneous \subpage multi_rotation_operation_page
    • "Rotation in several directions". diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt index e3afdf6cb..25f6b1d14 100755 --- a/resources/CMakeLists.txt +++ b/resources/CMakeLists.txt @@ -89,10 +89,12 @@ SET( _res_files displayonly.png displayall.png draft.png + edgeextension.png erase.png eraseall.png extruded_boss.png extruded_cut.png + faceextension.png face_hw.png face_vechw.png feature_detect.png diff --git a/resources/edgeextension.png b/resources/edgeextension.png new file mode 100644 index 000000000..c468969c3 Binary files /dev/null and b/resources/edgeextension.png differ diff --git a/resources/faceextension.png b/resources/faceextension.png new file mode 100644 index 000000000..b8429df29 Binary files /dev/null and b/resources/faceextension.png differ diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts index 9851ad6e8..1e802a6be 100644 --- a/src/GEOMGUI/GEOM_images.ts +++ b/src/GEOMGUI/GEOM_images.ts @@ -429,11 +429,11 @@ ICON_DLG_EXTEND_EDGE - filling.png + edgeextension.png ICON_DLG_EXTEND_FACE - projection.png + faceextension.png ICON_DLG_PARTITION @@ -1105,7 +1105,7 @@ ICO_EXTENSION - filling.png + edgeextension.png ICO_ORIGIN_AND_VECTORS diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index a63590d52..9766171a1 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -255,6 +255,8 @@ def TestAll (geompy, math): Offset = geompy.MakeOffset(Box, 10.) #(GEOM_Object, Double)->GEOM_Object Orientation = geompy.ChangeOrientation(Box) ProjOnWire = geompy.MakeProjectionOnWire(p0, Wire) + ExtEdge = geompy.ExtendEdge(Edge1, -0.3, 1.3) + ExtFace = geompy.ExtendFace(Face5, -0.3, 1.3, -0.1, 1.1) #IDList for Fillet/Chamfer prism_edges = geompy.ExtractShapes(Prism, geompy.ShapeType["EDGE"], True) @@ -469,6 +471,8 @@ def TestAll (geompy, math): id_Offset = geompy.addToStudy(Offset, "Offset") id_Orientation = geompy.addToStudy(Orientation, "Orientation") id_ProjOnWire = geompy.addToStudy(ProjOnWire[1], "ProjOnWire") + id_ExtEdge = geompy.addToStudy(ExtEdge, "ExtendedEdge") + id_ExtFace = geompy.addToStudy(ExtFace, "ExtendedFace") id_Fillet = geompy.addToStudy(Fillet, "Fillet") id_Fillet2 = geompy.addToStudy(Fillet2, "Fillet2") diff --git a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx index ac4b814a7..91428ef36 100644 --- a/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ExtensionDlg.cxx @@ -123,7 +123,7 @@ TransformationGUI_ExtensionDlg::TransformationGUI_ExtensionDlg layout->addWidget(aGrp); /***************************************************************/ - setHelpFileName("create_extension_page.html"); + setHelpFileName("extension_operation_page.html"); /* Initialisations */ Init();