diff --git a/src/Tools/blocFissure/CasTests/execution_Cas.py b/src/Tools/blocFissure/CasTests/execution_Cas.py index 487ac69bc..580861961 100644 --- a/src/Tools/blocFissure/CasTests/execution_Cas.py +++ b/src/Tools/blocFissure/CasTests/execution_Cas.py @@ -127,7 +127,7 @@ problemes.append(casStandard(cubeTransverse.dicoParams, cubeTransverse.reference # ---tous les cas en sequence, ou les cas selectionnés ... -runall = False +runall = True if runall: torun = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,] else: #prob 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27 diff --git a/src/Tools/blocFissure/materielCasTests/fissureGauche.py b/src/Tools/blocFissure/materielCasTests/fissureGauche.py index b378fa587..6efe23942 100644 --- a/src/Tools/blocFissure/materielCasTests/fissureGauche.py +++ b/src/Tools/blocFissure/materielCasTests/fissureGauche.py @@ -1,4 +1,4 @@ -# -*- coding: iso-8859-1 -*- +# -*- coding: utf-8 -*- import sys import salome @@ -42,7 +42,9 @@ Partition_1 = geompy.MakePartition([Box_1], [Fillet_1], [], [], geompy.ShapeType geomObj_3 = geompy.MakeCylinderRH(1450, 8000) Cylinder_3 = geompy.MakeRotation(geomObj_3, OZ, 180*math.pi/180.0) Cut_1 = geompy.MakeCut(Partition_1, Cylinder_3) -[faceFiss1] = geompy.SubShapes(Cut_1, [61]) +geompy.addToStudy( Cut_1, 'Cut_1' ) +[faceFiss1] = geompy.SubShapes(Cut_1, [63]) +geompy.addToStudyInFather( Cut_1, faceFiss1, 'faceFiss1' ) [Vertex_3,geomObj_4] = geompy.SubShapes(faceFiss1, [4, 5]) Cylinder_4 = geompy.MakeCylinderRH(2000, 4000) Cylinder_5 = geompy.MakeCylinderRH(1500, 4000) @@ -72,8 +74,6 @@ geompy.addToStudy( Vertex_2, 'Vertex_2' ) geompy.addToStudy( Box_1, 'Box_1' ) geompy.addToStudy( Partition_1, 'Partition_1' ) geompy.addToStudy( Cylinder_3, 'Cylinder_3' ) -geompy.addToStudy( Cut_1, 'Cut_1' ) -geompy.addToStudyInFather( Cut_1, faceFiss1, 'faceFiss1' ) geompy.addToStudyInFather( faceFiss1, Vertex_3, 'Vertex_3' ) geompy.addToStudy( Cylinder_4, 'Cylinder_4' ) geompy.addToStudy( Cylinder_5, 'Cylinder_5' ) diff --git a/src/Tools/blocFissure/materielCasTests/fissureGauche2.py b/src/Tools/blocFissure/materielCasTests/fissureGauche2.py index 431668130..420118628 100644 --- a/src/Tools/blocFissure/materielCasTests/fissureGauche2.py +++ b/src/Tools/blocFissure/materielCasTests/fissureGauche2.py @@ -1,4 +1,4 @@ -# -*- coding: iso-8859-1 -*- +# -*- coding: utf-8 -*- import sys import salome @@ -42,7 +42,9 @@ Vertex_3 = geompy.MakeVertex(400, 500, 800) objetSain = geompy.MakeBoxTwoPnt(Vertex_3, Vertex_2) Rotation_1 = geompy.MakeRotation(Extrusion_1, OX, 180*math.pi/180.0) Partition_2 = geompy.MakePartition([Rotation_1], [Extrusion_2], [], [], geompy.ShapeType["FACE"], 0, [], 0) -[FaceFissExtSimple] = geompy.SubShapes(Partition_2, [13]) +geompy.addToStudy( Partition_2, 'Partition_2' ) +[FaceFissExtSimple] = geompy.SubShapes(Partition_2, [17]) +geompy.addToStudyInFather( Partition_2, FaceFissExtSimple, 'FaceFissExtSimple' ) Plane_1 = geompy.MakePlaneLCS(None, 2000, 3) FaceFissExtCoupe = geompy.MakePartition([FaceFissExtSimple], [Plane_1], [], [], geompy.ShapeType["FACE"], 0, [], 0) geompy.Export(FaceFissExtCoupe, os.path.join(gmu.pathBloc, "materielCasTests/faceGauche2FissCoupe.brep"), "BREP") @@ -63,8 +65,6 @@ geompy.addToStudy( Vertex_2, 'Vertex_2' ) geompy.addToStudy( Vertex_3, 'Vertex_3' ) geompy.addToStudy( objetSain, 'objetSain' ) geompy.addToStudy( Rotation_1, 'Rotation_1' ) -geompy.addToStudy( Partition_2, 'Partition_2' ) -geompy.addToStudyInFather( Partition_2, FaceFissExtSimple, 'FaceFissExtSimple' ) geompy.addToStudy( Plane_1, 'Plane_1' ) geompy.addToStudy( FaceFissExtCoupe, 'FaceFissExtCoupe' )