X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FTest%2FTest1512.py;h=8494772c8061d27c759f557269492c13c56a8880;hb=b3ded1f96149594b5f75bfd81f762802713704b4;hp=c9b8d2ecf224d39cab84646ba30451f6375e7873;hpb=7074394f8f08413d885f63be01df6bd5007b868c;p=modules%2Fshaper.git diff --git a/src/ModelAPI/Test/Test1512.py b/src/ModelAPI/Test/Test1512.py index c9b8d2ecf..8494772c8 100755 --- a/src/ModelAPI/Test/Test1512.py +++ b/src/ModelAPI/Test/Test1512.py @@ -104,10 +104,9 @@ aSession.finishOperation() # Do cut a hole from a box #========================================================================= aSession.startOperation() -aCut1 = aPart.addFeature("Boolean") +aCut1 = aPart.addFeature("Cut") aCut1.selectionList("main_objects").append(aBox.firstResult(), None) aCut1.selectionList("tool_objects").append(aHoleExt.firstResult(), None) -aCut1.integer("bool_type").setValue(0) # cut aSession.finishOperation() #========================================================================= @@ -136,10 +135,11 @@ aSession.finishOperation() # Do fuse with a tower. Tower must be an argument (not tool) to add the problem to the faces owners detection. #========================================================================= aSession.startOperation() -aFuse = aPart.addFeature("Boolean") +aFuse = aPart.addFeature("Fuse") +aFuse.string("creation_method").setValue("advanced") aFuse.selectionList("main_objects").append(aTower.firstResult(), None) aFuse.selectionList("tool_objects").append(aCut1.firstResult(), None) -aFuse.integer("bool_type").setValue(1) # fuse +aFuse.boolean("remove_intersection_edges").setValue(False) aSession.finishOperation() #========================================================================= @@ -155,13 +155,13 @@ def check_owner(selection, topology_type, feature): aSession.abortOperation() # check faces -check_owner("Extrusion_1_1/Generated_Face_1", "face", aBox) -check_owner("Boolean_2_1/Modified_3", "face", aBox) -check_owner("Boolean_1_1/Modified_1", "face", aHoleExt) -check_owner("Boolean_2_1/Modified_2", "face", aTower) +check_owner("Extrusion_1_1/Generated_Face&Sketch_1/SketchLine_4", "face", aBox) +check_owner("Fuse_1_1/Modified_Face&Extrusion_1_1/To_Face", "face", aBox) +check_owner("Cut_1_1/Modified_Face&Sketch_2/SketchCircle_1_2", "face", aHoleExt) +check_owner("Fuse_1_1/Modified_Face&Sketch_3/SketchCircle_2_2", "face", aTower) # check edges without ambiguity -check_owner("Boolean_2_1/Modified_3&Extrusion_1_1/Generated_Face_2", "edge", aBox) -check_owner("Boolean_2_1/Modified_2&Extrusion_3_1/To_Face_1_1", "edge", aTower) +check_owner("[Fuse_1_1/Modified_Face&Extrusion_1_1/To_Face][Extrusion_1_1/Generated_Face&Sketch_1/SketchLine_3]", "edge", aBox) +check_owner("[Fuse_1_1/Modified_Face&Sketch_3/SketchCircle_2_2][Extrusion_3_1/To_Face]", "edge", aTower) # check the connected topology method: solid is not a compound of connected topology assert(aFuse.firstResult().shape().isConnectedTopology() == False)