EDF 2281: Documentation and icon for the divided disk primitive

diff --git a/doc/salome/gui/GEOM/images/divided_disk.png b/doc/salome/gui/GEOM/images/divided_disk.png
new file mode 100644 (file)
index 0000000..8f0bb3e
Binary files /dev/null and b/doc/salome/gui/GEOM/images/divided_disk.png differ

diff --git a/doc/salome/gui/GEOM/input/creating_divideddisk.doc b/doc/salome/gui/GEOM/input/creating_divideddisk.doc
index 6e5e910b6b508325b26439a65e5f7eb0f7c8ec0f..0854039ed0839af44985510bf18c3e2f86540071 100644 (file)
--- a/doc/salome/gui/GEOM/input/creating_divideddisk.doc
+++ b/doc/salome/gui/GEOM/input/creating_divideddisk.doc
@@ -2,6 +2,14 @@
 
 \page create_divideddisk_page DividedDisk
 
+The <b>Divided disk</b> object is a disk divided into \b blocks. It means that it's a shape ready to be meshed with ruled hexaedra.
+Moreover this shape can be used as a basis in an \ref create_extrusion_alongpath_page "Extrusion along a path operation" in order to obtain any tube shape prepared for hexaedral mesh 
+(see example below). 
+
+Example:
+
+\image html divided_disk.png
+
 To create a \b DividedDisk in the <b>Main Menu</b> select <b>New Entity - >
 Advanced - > DividedDisk </b>
 
@@ -9,17 +17,13 @@ Specify the parameters of the DividedDisk object creation in the opened dialog
 box and press "Apply" or "Apply & Close" button.
 Result of each operation will be a GEOM_Object.
 
-<b>TUI Command:</b> <em>geompy.MakeDividedDisk(R, Ratio)</em>
+<b>TUI Command:</b> <em>geompy.MakeDividedDisk(R, Orientation)</em>
 
 <b>Arguments:</b>
 - \b R - Radius of the disk
-- \b Ratio - Relative size of the central square diagonal against the disk diameter
-
-\image html divideddisk_dlg.png
-
-Example:
+- \b Orientation - Plane on wich the disk will be built
 
-\image html divideddisk.png
+\image html divided_disk_dlg.png
 
 Our <b>TUI Scripts</b> provide you with useful examples of creation of
 \ref tui_creation_divideddisk "Advanced objects".

diff --git a/resources/Makefile.am b/resources/Makefile.am
index dec2cb32f69d108a9f69a7c110b7f4871afa4600..360c2fb2a803c6f977922bd4b4d36ffd185b13b0 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -73,6 +73,7 @@ cylinder.png                  \
 cylinderdxyz.png               \
 cylinderpointvector.png                \
 delete.png                     \
+divided_disk.png                       \
 disk.png                       \
 disk3points.png                        \
 disk_pntvecr.png               \

diff --git a/src/GEOMGUI/GEOM_images.ts b/src/GEOMGUI/GEOM_images.ts
index 7168f7a962e3b9a8e5ee0ab56a24618427bb2495..b610a3b1acf3971a991ee322cccbf12ac193da8a 100644 (file)
--- a/src/GEOMGUI/GEOM_images.ts
+++ b/src/GEOMGUI/GEOM_images.ts
@@ -1278,11 +1278,11 @@
 -->
         <message>
             <source>ICON_DLG_DIVIDEDDISK_R_RATIO</source>
-            <translation>divideddisk_r_ratio.png</translation>
+            <translation>divided_disk.png</translation>
         </message>
         <message>
             <source>ICO_DIVIDEDDISK</source>
-            <translation>divideddisk.png</translation>
+            <translation>divided_disk.png</translation>
         </message>
         <message>
             <source>ICON_OBJBROWSER_ADVANCED_202</source>

diff --git a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
index 914bf66213649ccf6ba8513934406593abf5398d..74e92057eacbdf10fe8a6c882b72ac30ea8a600c 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx
@@ -2289,6 +2289,7 @@ Handle(GEOM_Object) GEOMImpl_IAdvancedOperations::MakeDividedDisk (double theR,
 
   return aShape;
 }
+
 //=============================================================================
 /*!
  *  Builds a cylinder prepared for hexa meshes