Issue #2157: Fix incorrect searching of features coincident to fillet point

[modules/shaper.git] / test.models / plug.py

diff --git a/test.models/plug.py b/test.models/plug.py
index 5c7c8fab297b4853679fdca02771437b1364c136..59bbf13368ff365d5dde22013ee9a2eb586cd901 100644 (file)
--- a/test.models/plug.py
+++ b/test.models/plug.py
@@ -383,20 +383,24 @@ model.testResultsVolumes(RevolutionCut_1, [28297.246041844206047244369983673])
 RevolutionCut_2 = model.addRevolutionCut(Part_1_doc, [], model.selection("EDGE", "PartSet/OX"), 360, 0, [model.selection("SOLID", "RevolutionCut_1_1")])
 Sketch_5 = model.addSketch(Part_1_doc, model.standardPlane("XOY"))
 SketchLine_61 = Sketch_5.addLine(63.5, 10.5, 64, 10.5)
+SketchLine_61.setAuxiliary(True)
 SketchProjection_15 = Sketch_5.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_7"), False)
 SketchLine_62 = SketchProjection_15.createdFeature()
 SketchConstraintCoincidence_58 = Sketch_5.setCoincident(SketchLine_61.startPoint(), SketchLine_62.result())
 SketchConstraintCoincidence_59 = Sketch_5.setCoincident(SketchAPI_Line(SketchLine_62).endPoint(), SketchLine_61.endPoint())
-SketchLine_63 = Sketch_5.addLine(64, 10.5, 64, 11)
-SketchConstraintCoincidence_60 = Sketch_5.setCoincident(SketchLine_61.endPoint(), SketchLine_63.startPoint())
-SketchProjection_16 = Sketch_5.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_8"), False)
-SketchLine_64 = SketchProjection_16.createdFeature()
-SketchConstraintCoincidence_61 = Sketch_5.setCoincident(SketchLine_63.endPoint(), SketchLine_64.result())
-SketchLine_65 = Sketch_5.addLine(64, 11, 63.5, 10.5)
-SketchConstraintCoincidence_62 = Sketch_5.setCoincident(SketchLine_63.endPoint(), SketchLine_65.startPoint())
-SketchConstraintCoincidence_62 = Sketch_5.setCoincident(SketchLine_65.endPoint(), SketchLine_61.startPoint())
-SketchConstraintEqual_2 = Sketch_5.setEqual(SketchLine_61.result(), SketchLine_63.result())
+SketchLine_63 = Sketch_5.addLine(64.25, 10.25, 64.25, 11.25)
+SketchLine_64 = Sketch_5.addLine(64.25, 11.25, 63.25, 10.25)
+SketchConstraintCoincidence_60 = Sketch_5.setCoincident(SketchLine_63.endPoint(), SketchLine_64.startPoint())
 SketchConstraintLength_3 = Sketch_5.setLength(SketchLine_61.result(), "Chamfer")
+SketchConstraintCoincidence_61 = Sketch_5.setCoincident(SketchLine_61.startPoint(), SketchLine_64.result())
+SketchLine_65 = Sketch_5.addLine(63.25, 10.25, 64.25, 10.25)
+SketchConstraintCoincidence_62 = Sketch_5.setCoincident(SketchLine_64.endPoint(), SketchLine_65.startPoint())
+SketchConstraintCoincidence_63 = Sketch_5.setCoincident(SketchLine_63.startPoint(), SketchLine_65.endPoint())
+SketchConstraintEqual_2 = Sketch_5.setEqual(SketchLine_65.result(), SketchLine_63.result())
+SketchConstraintVertical_18 = Sketch_5.setVertical(SketchLine_63.result())
+SketchConstraintHorizontal_12 = Sketch_5.setHorizontal(SketchLine_65.result())
+SketchConstraintDistanceVertical_7 = Sketch_5.setVerticalDistance(SketchLine_65.startPoint(), SketchLine_61.startPoint(), "Chamfer/2")
+SketchConstraintDistanceVertical_8 = Sketch_5.setVerticalDistance(SketchLine_61.startPoint(), SketchLine_63.endPoint(), "Chamfer*1.5")
 model.do()
 RevolutionCut_2.setNestedSketch(Sketch_5)
 # check Sketch_5
@@ -422,7 +426,7 @@ model.testNbSubShapes(Partition_1, GeomAPI_Shape.VERTEX, [1476])
 model.testResultsVolumes(Partition_1, [28288.886256640704232268035411835])
 
 Result = model.addRemoveSubShapes(Part_1_doc, model.selection("COMPSOLID", "Partition_1_1"))
-Result.setSubShapesToRemove([model.selection("SOLID", "Partition_1_1_1")])
+Result.setSubShapesToRemove([model.selection("SOLID", "Partition_1_1_2")])
 Result.result().setName("Plug")
 # check Remove_SubShapes_1
 model.testNbResults(Result, 1)
@@ -433,7 +437,7 @@ model.testNbSubShapes(Result, GeomAPI_Shape.EDGE, [366])
 model.testNbSubShapes(Result, GeomAPI_Shape.VERTEX, [732])
 model.testResultsVolumes(Result, [14144.443128843522572424262762070])
 
-Group_1 = model.addGroup(Part_1_doc, [model.selection("FACE", "Plug/Modified_Face_1_1"), model.selection("FACE", "Plug/Modified_Face_2_1"), model.selection("FACE", "Plug/Modified_Face_3_1"), model.selection("FACE", "Plug/Modified_Face_4_1")])
+Group_1 = model.addGroup(Part_1_doc, [model.selection("FACE", "Plug/Modified_Face_3_1"), model.selection("FACE", "Plug/Modified_Face_5_1"), model.selection("FACE", "Plug/Modified_Face_46_1"), model.selection("FACE", "Plug/Modified_Face_48_1")])
 Group_1.result().setColor(68, 68, 68)
 # check Group_1
 model.checkGroup(Group_1, GeomAPI_Shape.FACE)