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

Additional changes: fix bugs, update documentation

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/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index b8af061b626fd0e2c0a149123268cc45a14ebaf0..d90d0101bdc206a6c25df838d0fa5ebccc501147 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -741,7 +741,7 @@ CORBA::Boolean GEOM_Gen_i::RestoreSubShapes (SALOMEDS::Study_ptr     theStudy,
            if (!CORBA::is_nil(aSubO))
              aGroupOp->UnionIDs(aSubO, anIDs);
          }
-         else {
+         else if (anIDs->length() > 0) {
            // single sub-shape
            aSubO = aShapesOp->GetSubShape(theObject, anIDs[0]);
          }

diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py
index a37fa0502a6b6241cd6e4347a7a191f3c3901fc2..79d14c84ad4031539f4dbf974ed98d19f0832bc2 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
@@ -424,4 +425,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"