From: vsr Date: Mon, 10 Nov 2014 08:25:00 +0000 (+0300) Subject: Merge remote branch 'origin/Doc_update_ver741' into V7_5_BR X-Git-Tag: V7_5_0rc1~7 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=017dbada923786fa8316299aca61ce806a05f3f9;p=modules%2Fgeom.git Merge remote branch 'origin/Doc_update_ver741' into V7_5_BR --- 017dbada923786fa8316299aca61ce806a05f3f9 diff --cc doc/salome/examples/CMakeLists.txt index 3d9da7036,3d9da7036..f21bae342 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@@ -74,6 -74,6 +74,7 @@@ SET(GOOD_TEST min_distance.py normal_face.py notebook_geom.py ++ polyline.py point_coordinates.py primitives_ex01.py primitives_ex02.py diff --cc doc/salome/gui/GEOM/images/tree_example.png index e41c1b1f8,e41c1b1f8..bb75713c8 Binary files differ diff --cc doc/salome/gui/GEOM/input/creating_polyline.doc index 7ec36434d,f7fa7c9a1..2ca7f4ba9 --- a/doc/salome/gui/GEOM/input/creating_polyline.doc +++ b/doc/salome/gui/GEOM/input/creating_polyline.doc @@@ -14,34 -14,23 +14,23 @@@ connected by either linear segments o - \b Type (Polyline or Spline), - \b Closed flag. - A Polyline created represents a shape that lies on the XOY plane. It can have the following types: + A created Polyline represents a shape that lies on the XOY plane. Its type can be one of the following: - \b Vertex for a single section with only 1 point. - - \b Wire for a single section with 2 or more points. A Wire can have multiple edges for more then 2 points if the section type is Polyline. - A single edge in the result wire is obtained for a Spline or Polyline with 2 points. + - \b Wire for a single section with 2 or more points. A Wire can have multiple edges for more then 2 points if the section type is Polyline. A single edge in the resulting wire is obtained for a Spline or Polyline with 2 points. - \b Compound of Wires and/or Vertices if there are several sections. - For the moment only one reference coordinate system for polyline creation is supported. The XOY plane of the Global coordinate system - is suggested. Implementation of another reference coordinate system is a subject of further development of this functionality. - Restore button orientates the viewer correspondingly to the chosen working plane and fits the scene to show all objects. + For the moment only one reference coordinate system for polyline creation is supported, which is the XOY plane of the Global coordinate system. + \b Restore button orientates the viewer correspondingly to the chosen working plane and fits the scene to show all objects. For the moment this button works with only one plane. - It is possible to import a shape in this dialog using Import polyline selection button. To do it an imported object should satisfy conditions - for polyline shapes mentioned above. If a valid shape is selected, when dialog is opened, it is initialized by this shape. - Though the shape can be on any plane, an imported polyline will be defined on XOY plane only due to the limitation. + It is possible to import a shape in this dialog using Import polyline selection button. An imported object should meet the conditions for polyline shapes mentioned above. If a valid shape is selected, when the dialog is opened, it is initialized by this shape. + Though the shape can be on any plane, the imported polyline will be defined on XOY plane only due to the limitation. - The group \b Sections in this dialog represents the Polyline construction framework. Its toolbar has the following operations: - - \b Undo - - \b Redo - - Insert new section - - Addition mode - - Modification mode - not implemented - - Detection mode - not implemented - - \b Remove - - Join selected sections + The group \b Sections in this dialog represents the Polyline construction framework. - Undo/Redo buttons allows to undo/redo changes of the polyline. -The buttons Undo and Redo allows to undo or redo the changes of the polyline. ++The buttons Undo and Redo allow to undo or redo the changes of the polyline. - Insert new section button opens a dialog that allows to add a new section: + Insert new section button opens the corresponding dialog: \image html polyline_dlg_add_section.png @@@ -65,33 -53,21 +53,21 @@@ and left-click in the viewer to add ne Modification mode and Detection mode are not implemented for the moment. - \b Remove button allows to remove a section. It is available if all modes are deactivated and one section is selected. + \b Remove button allows removing a section. It is available if all modes are deactivated and one section is selected. Join selected sections button is available in modification mode if two or more sections are selected. It is used to - merge several sections into the first one from selection list. Joined section has parameters of the first selected one. Points of - the other sections are appended at the end of the list of the first section points. + merge several sections into the first one from the selection list. The points of the merged sections are appended at the end of the list of points of the first section. - Some actions are available via popup menu by right mouse button click. + Some actions are available via the context menu activated by right mouse button click. + - Join all sections - joins all defined sections into the first one. + - \b Join - joins two or more selected sections. + - Clear all - removes all selected sections. + - Set closed - sets \b Closed flag for all selected section. + - Set open - unset \b Closed flag for all selected sections. + - Set polyline - sets the type of all selected sections to Polyline. -- Set spline - set the type of all selected sections to Splineall. ++- Set spline - set the type of all selected sections to Spline. - If all modes are deactivated: - - Join all sections - join all defined sections into the first one. - - \b Join - join sections. Available if two or more sections are selected. - - In Addition mode: - - Join all sections - join all defined sections into the first one. - - In Modification mode: - - Join all sections - join all defined sections into the first one. - - \b Join - join sections. Available if two or more sections are selected. - - Clear all - remove all sections. Available if at least one section is selected. - - Set closed - set all selected section's Closed flag. Available if at least one section is selected. - - Set open - reset all selected section's Closed flag. Available if at least one section is selected. - - Set polyline - set all selected section's type to Polyline. Available if at least one section is selected. - - Set spline - set all selected section's type to Spline. Available if at least one section is selected. - - In Detection mode: - - Join all sections - join all defined sections into the first one. - - \b Join - join sections. Available if two or more sections are selected. + Different actions are available depending on the mode and selection.

TUI Commands

@@@ -103,5 -78,5 +78,5 @@@ To create the 2D polyline in TUI Polyli See the \ref gsketcher.Polyline2D "Polyline2D" interface documentation for more information. Our TUI Scripts provide you with useful examples of the use of --\ref tui_polyline_page "2D Polyline". ++\ref tui_creation_polyline "2D Polyline". */ diff --cc doc/salome/gui/GEOM/input/dependency_tree.doc index e44dba400,62bd3bbe8..9afc744bc --- a/doc/salome/gui/GEOM/input/dependency_tree.doc +++ b/doc/salome/gui/GEOM/input/dependency_tree.doc @@@ -71,24 -59,20 +59,19 @@@ Browser, OCC Viewer or Dependency Tree \anchor dependency_tree_links_anchor

Links

Dependency Tree Viewer shows oriented links between nodes to - represent dependency direction. Viewer supports the following states - of links: + represent the dependency direction. The viewer supports the following states of links: - - ++ \image html tree_unidir_link.png - - ++ \image html tree_bidir_link.png - + \image html tree_selfdep_link.png -- ++ \image html tree_cycldep_link.png
diff --cc doc/salome/gui/GEOM/input/geompy.doc index c483ca71c,c483ca71c..a39809963 --- a/doc/salome/gui/GEOM/input/geompy.doc +++ b/doc/salome/gui/GEOM/input/geompy.doc @@@ -31,6 -31,6 +31,7 @@@ provided by Geometry module
  • \ref tui_working_with_groups_page
  • \ref tui_building_by_blocks_page
  • \ref tui_sketcher_page
    • ++
  • \ref tui_3dsketcher_page
  • \ref tui_advanced_geom_objs_page
  • \subpage tui_viewing_geom_objs_page
    • diff --cc doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc index 89be6f64b,7266034d7..d7edb5227 --- a/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc +++ b/doc/salome/gui/GEOM/input/tui_basic_geom_objs.doc @@@ -38,4 -38,7 +38,8 @@@

    Creation of a Local Coordinate System

    \tui_script{basic_geom_objs_ex09.py} -\page tui_polyline_page 2D Polyline ++\anchor tui_creation_polyline ++

    Creation of 2D Polyline

    + \tui_script{polyline.py} + */