Issue 0020001: EDF 813 GEOM : PArtition , argument to get subshapes

Additional changes: fix bugs, update documentation

diff --git a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc
index adab40078cd6c0d1a199fb55c324c74a0e692bee..cee84090ad2391ff427447508c2acc1474ef5348 100644 (file)
--- a/doc/salome/gui/GEOM/input/transforming_geom_objs.doc
+++ b/doc/salome/gui/GEOM/input/transforming_geom_objs.doc
@@ -22,7 +22,7 @@ special case of \b Explode operation. </li>
 <li>Operations with \subpage blocks_operations_page "Blocks".</li>
 
 
-<li>\subpage restore_presentation_parameters_page "Restore presentation pareameters". 
+<li>\subpage restore_presentation_parameters_page "Restore presentation parameters". 
 This cross-operation functionality allows the resulting shape to
 inherit colors and subshapes from its parent shapes.</li>
 </ul>

diff --git a/doc/salome/gui/GEOM/input/tui_basic_operations.doc b/doc/salome/gui/GEOM/input/tui_basic_operations.doc
index 1250c128d16850a6583e042649ac7c5d14780a4f..50c8a7c3d47afe3b33e7838087bd6ce47219c398 100644 (file)
--- a/doc/salome/gui/GEOM/input/tui_basic_operations.doc
+++ b/doc/salome/gui/GEOM/input/tui_basic_operations.doc
@@ -85,6 +85,7 @@ gg.setDisplayMode(id_archimede,1)
 \code
 import geompy
 import GEOM
+import SALOMEDS
 
 # create a box and a cylinder
 box = geompy.MakeBoxDXDYDZ(200, 200, 200)

diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index 439e6f438a9a098547ed75f42f16be18dfd417cb..62e06e21768028a3d03b5e0e718a42fa248ebddb 100644 (file)
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -2989,7 +2989,7 @@ module GEOM
      *                            operations, where only the first argument has to be considered.
      *                            If theObject has only one argument shape, this flag is automatically
      *                            considered as True, not regarding really passed value.
-     *  \return True in case of success, False otherwise.
+     *  \return list of published sub-shapes
      */
     ListOfGO RestoreSubShapesO (in SALOMEDS::Study   theStudy,
                                in GEOM_Object       theObject,

diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py
index 0a2983b40d3968877994f3e210f0d1b9c721f05e..a278b54a90731c9a7cd4078e4ddb1aa04e36c924 100644 (file)
--- a/src/GEOM_SWIG/GEOM_TestAll.py
+++ b/src/GEOM_SWIG/GEOM_TestAll.py
@@ -30,7 +30,8 @@
 # ! documentation generation to identify certain places of this file
 #
 def TestAll (geompy, math):
-
+  import GEOM
+  
   #Create base Variables
   nbtimes1  = 5      #Short
   nbtimes2  = 5
@@ -451,4 +452,10 @@ def TestAll (geompy, math):
     if ind_e != ind:
       print "Error in GetSubShape or GetSubShapeID"
 
+  # RestoreSubShapes
+  geompy.RestoreSubShapes(Copy)
+  geompy.RestoreSubShapes(RotatPnt, [], GEOM.FSM_Transformed)
+  geompy.RestoreSubShapes(Partition, [Box])
+  geompy.RestoreSubShapes(Partition1)
+
   print "DONE"

diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index e6e7b8dd275defe86479f145f8f9397cab8fa105..8cf504f7b94eae09c50ad5369cd49afca196f4da 100644 (file)
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -305,7 +305,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #                            operations, where only the first argument has to be considered.
         #                            If theObject has only one argument shape, this flag is automatically
         #                            considered as True, not regarding really passed value.
-        #  \return True in case of success, False otherwise.
+        #  \return list of published sub-shapes
         #
         #  @ref tui_restore_prs_params "Example"
         def RestoreSubShapes (self, theObject, theArgs=[],