From a89aeef1f12f2484b4c3d56b9e1c1476e5d7b00e Mon Sep 17 00:00:00 2001 From: skl Date: Fri, 3 Nov 2006 14:37:22 +0000 Subject: [PATCH] Update test for new version of PartitionAlgo. --- src/SMESH_SWIG/SMESH_Partition1_tetra.py | 4 ++- src/SMESH_SWIG/ex19_sphereINcube.py | 46 ++++++++++++++++++++---- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/src/SMESH_SWIG/SMESH_Partition1_tetra.py index 96fc134f6..e0f284a96 100644 --- a/src/SMESH_SWIG/SMESH_Partition1_tetra.py +++ b/src/SMESH_SWIG/SMESH_Partition1_tetra.py @@ -71,7 +71,9 @@ colis_cc_multi = geompy.MultiRotate1D(colis_cc, vz, 4) # -- -alveole = geompy.MakePartition([colis_cc_multi, barier]) +Compound1 = geompy.MakeCompound([colis_cc_multi, barier]) +SubShape_theShape = geompy.SubShapeAll(Compound1,geompy.ShapeType["SOLID"]) +alveole = geompy.MakePartition(SubShape_theShape) print "Analysis of the geometry to mesh (right after the Partition) :" diff --git a/src/SMESH_SWIG/ex19_sphereINcube.py b/src/SMESH_SWIG/ex19_sphereINcube.py index 02357b0f4..ec5f5d398 100644 --- a/src/SMESH_SWIG/ex19_sphereINcube.py +++ b/src/SMESH_SWIG/ex19_sphereINcube.py @@ -23,6 +23,7 @@ from geompy import * import smesh +import geompy # Geometrie # ========= @@ -59,13 +60,30 @@ blocs = [boite] sphere_troue = MakeCut(sphere_pleine, boite) -sphere_outils = [] -sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, 1), plan_trim)) -sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, -1), plan_trim)) -sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 1, 0), plan_trim)) -sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ(-1, 1, 0), plan_trim)) +#sphere_outils = [] +#sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, 1), plan_trim)) +#sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, -1), plan_trim)) +#sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 1, 0), plan_trim)) +#sphere_outils.append(MakePlane(sphere_centre, MakeVectorDXDYDZ(-1, 1, 0), plan_trim)) -sphere_decoupee = MakePartition([sphere_troue], sphere_outils, [], [], ShapeType["SOLID"]) +f1 = MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 0, 1), plan_trim) +f2 = MakePlane(sphere_centre, MakeVectorDXDYDZ(-1, 1, 0), plan_trim) +f3 = MakePlane(sphere_centre, MakeVectorDXDYDZ( 1, 1, 0), plan_trim) +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_partie = GetBlockNearPoint(sphere_decoupee, MakeVertex(-sphere_rayon, 0, 0)) sphere_bloc = RemoveExtraEdges(sphere_partie) @@ -90,7 +108,21 @@ blocs.append(MakeMirrorByPoint(sphere_bloc, sphere_centre)) cube_plein = MakeBox(-cube_cote, -cube_cote, -cube_cote, +cube_cote, +cube_cote, +cube_cote) cube_trou = MakeCut(cube_plein, sphere_pleine) -cube_decoupe = MakePartition([cube_trou], sphere_outils, [], [], ShapeType["SOLID"]) +#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_partie = GetBlockNearPoint(cube_decoupe, MakeVertex(-cube_cote, 0, 0)) cube_bloc = RemoveExtraEdges(cube_partie)