Fix regressions in test scripts caused by recent changed behaviour of SubShapeAll...

diff --git a/src/SMESH_SWIG/ex19_sphereINcube.py b/src/SMESH_SWIG/ex19_sphereINcube.py
index 043a2e3128e465fc6663df3e9b6d5098b420d689..f50a0c8e4fe21bbbe24821d74df16d71c8349bcc 100644 (file)
--- a/src/SMESH_SWIG/ex19_sphereINcube.py
+++ b/src/SMESH_SWIG/ex19_sphereINcube.py
@@ -76,17 +76,13 @@ f4 = MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, -1), plan_trim)
 
 
 #sphere_decoupee = MakePartition(solids, sphere_outils, [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(sphere_troue,geompy.ShapeType["SOLID"])
-sphere_decoupee = MakePartition(solids, [f1], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(sphere_decoupee,geompy.ShapeType["SOLID"])
-sphere_decoupee = MakePartition(solids, [f2], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(sphere_decoupee,geompy.ShapeType["SOLID"])
-sphere_decoupee = MakePartition(solids, [f3], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(sphere_decoupee,geompy.ShapeType["SOLID"])
-sphere_decoupee = MakePartition(solids, [f4], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(sphere_decoupee,geompy.ShapeType["SOLID"])
-
-sphere_partie = geompy.MakeCompound(solids)
+
+sphere_decoupee = MakePartition([sphere_troue],    [f1], [], [], ShapeType["SOLID"])
+sphere_decoupee = MakePartition([sphere_decoupee], [f2], [], [], ShapeType["SOLID"])
+sphere_decoupee = MakePartition([sphere_decoupee], [f3], [], [], ShapeType["SOLID"])
+sphere_decoupee = MakePartition([sphere_decoupee], [f4], [], [], ShapeType["SOLID"])
+
+sphere_partie = geompy.MakeCompound([sphere_decoupee])
 
 sphere_partie   = GetBlockNearPoint(sphere_decoupee, MakeVertex(-sphere_rayon, 0, 0))
 sphere_bloc     = RemoveExtraEdges(sphere_partie)
@@ -113,17 +109,12 @@ cube_plein   = MakeBox(-cube_cote, -cube_cote, -cube_cote,  +cube_cote, +cube_co
 cube_trou    = MakeCut(cube_plein, sphere_pleine)
 #cube_decoupe = MakePartition([cube_trou], sphere_outils, [], [], ShapeType["SOLID"])
 
-solids = geompy.SubShapeAll(cube_trou,geompy.ShapeType["SOLID"])
-cube_decoupe = MakePartition(solids, [f1], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(cube_decoupe,geompy.ShapeType["SOLID"])
-cube_decoupe = MakePartition(solids, [f2], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(cube_decoupe,geompy.ShapeType["SOLID"])
-cube_decoupe = MakePartition(solids, [f3], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(cube_decoupe,geompy.ShapeType["SOLID"])
-cube_decoupe = MakePartition(solids, [f4], [], [], ShapeType["SOLID"])
-solids = geompy.SubShapeAll(cube_decoupe,geompy.ShapeType["SOLID"])
-
-cube_decoupe = geompy.MakeCompound(solids)
+cube_decoupe = MakePartition([cube_trou],    [f1], [], [], ShapeType["SOLID"])
+cube_decoupe = MakePartition([cube_decoupe], [f2], [], [], ShapeType["SOLID"])
+cube_decoupe = MakePartition([cube_decoupe], [f3], [], [], ShapeType["SOLID"])
+cube_decoupe = MakePartition([cube_decoupe], [f4], [], [], ShapeType["SOLID"])
+
+cube_decoupe = geompy.MakeCompound([cube_decoupe])
 
 
 cube_partie  = GetBlockNearPoint(cube_decoupe, MakeVertex(-cube_cote, 0, 0))