Fix instability of "plug.py" model.

diff --git a/test.models/plug.py b/test.models/plug.py
index 60a80ffc1a8d9dba640d33a6681aae4196c2fcd4..582730b4a30ac0a810b3083c5f2b67c9464177ff 100644 (file)
--- a/test.models/plug.py
+++ b/test.models/plug.py
@@ -140,18 +140,18 @@ SketchConstraintPerpendicular_1 = Sketch_1.setPerpendicular(SketchLine_17.result
 SketchConstraintVertical_6 = Sketch_1.setVertical(SketchLine_19.result())
 SketchConstraintHorizontal_6 = Sketch_1.setHorizontal(SketchLine_18.result())
 SketchConstraintParallel_2 = Sketch_1.setParallel(SketchLine_20.result(), SketchLine_7.result())
-SketchConstraintParallel_3 = Sketch_1.setParallel(SketchLine_21.result(), SketchLine_19.result())
-SketchConstraintVertical_7 = Sketch_1.setVertical(SketchLine_23.result())
+SketchConstraintVertical_7 = Sketch_1.setVertical(SketchLine_21.result())
+SketchConstraintVertical_8 = Sketch_1.setVertical(SketchLine_23.result())
 SketchConstraintHorizontal_7 = Sketch_1.setHorizontal(SketchLine_24.result())
 SketchConstraintCollinear_1 = Sketch_1.setCollinear(SketchLine_28.result(), SketchLine_24.result())
 SketchConstraintCollinear_2 = Sketch_1.setCollinear(SketchLine_32.result(), SketchLine_28.result())
-SketchConstraintVertical_8 = Sketch_1.setVertical(SketchLine_34.result())
+SketchConstraintVertical_9 = Sketch_1.setVertical(SketchLine_34.result())
 SketchConstraintHorizontal_8 = Sketch_1.setHorizontal(SketchLine_30.result())
 SketchConstraintCollinear_3 = Sketch_1.setCollinear(SketchLine_26.result(), SketchLine_30.result())
-SketchConstraintVertical_9 = Sketch_1.setVertical(SketchLine_31.result())
-SketchConstraintVertical_10 = Sketch_1.setVertical(SketchLine_29.result())
-SketchConstraintVertical_11 = Sketch_1.setVertical(SketchLine_27.result())
-SketchConstraintVertical_12 = Sketch_1.setVertical(SketchLine_25.result())
+SketchConstraintVertical_10 = Sketch_1.setVertical(SketchLine_31.result())
+SketchConstraintVertical_11 = Sketch_1.setVertical(SketchLine_29.result())
+SketchConstraintVertical_12 = Sketch_1.setVertical(SketchLine_27.result())
+SketchConstraintVertical_13 = Sketch_1.setVertical(SketchLine_25.result())
 SketchConstraintDistance_1 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_24.result(), "D4_out/2", True)
 SketchConstraintDistance_2 = Sketch_1.setDistance(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_30.result(), "D4_out/2-Channel_Depth", True)
 SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchLine_34.endPoint(), SketchLine_1.endPoint(), "Chamfer")
@@ -170,10 +170,10 @@ SketchConstraintTangent_1 = Sketch_1.setTangent(SketchArc_1.results()[1], Sketch
 SketchConstraintTangent_2 = Sketch_1.setTangent(SketchArc_1.results()[1], SketchLine_6.result())
 SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], "Fillet1")
 SketchConstraintDistance_5 = Sketch_1.setDistance(SketchLine_7.endPoint(), SketchLine_35.result(), "D1_in/2", True)
-SketchConstraintAngle_4 = Sketch_1.setAngleComplementary(SketchLine_23.result(), SketchLine_22.result(), 45)
 SketchConstraintCollinear_4 = Sketch_1.setCollinear(SketchLine_14.result(), SketchLine_9.result())
 SketchConstraintDistanceHorizontal_4 = Sketch_1.setHorizontalDistance(SketchLine_34.startPoint(), SketchLine_23.startPoint(), "Width/32*11")
 SketchConstraintDistanceHorizontal_5 = Sketch_1.setHorizontalDistance(SketchLine_23.startPoint(), SketchLine_22.startPoint(), "Chamfer")
+SketchConstraintDistanceVertical_4 = Sketch_1.setVerticalDistance(SketchLine_23.startPoint(), SketchLine_22.startPoint(), "Chamfer")
 SketchConstraintDistanceHorizontal_6 = Sketch_1.setHorizontalDistance(SketchLine_15.startPoint(), SketchLine_8.endPoint(), 10)
 SketchConstraintDistance_6 = Sketch_1.setDistance(SketchLine_8.endPoint(), SketchLine_35.result(), "D3_out/2", True)
 SketchConstraintDistance_7 = Sketch_1.setDistance(SketchLine_11.startPoint(), SketchLine_35.result(), "(D3_out+D1_in)/4", True)
@@ -286,12 +286,12 @@ model.testResultsVolumes(Fillet_5, [28343.655816829603281803429126740])
 
 ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [], model.selection(), "D4_out/2", "D4_out/2", [model.selection("SOLID", "Fillet_5_1")])
 Sketch_3 = model.addSketch(Part_1_doc, model.standardPlane("XOY"))
-SketchLine_37 = Sketch_3.addLine(9, -9.914857089637437, 9, -18.52898094212539)
-SketchLine_38 = Sketch_3.addLine(9, -18.52898094212539, -2.5, -18.52898094212539)
+SketchLine_37 = Sketch_3.addLine(9, -9.914857089637437, 9, -18)
+SketchLine_38 = Sketch_3.addLine(9, -18, 0.5, -18)
 SketchConstraintCoincidence_39 = Sketch_3.setCoincident(SketchLine_37.endPoint(), SketchLine_38.startPoint())
-SketchLine_39 = Sketch_3.addLine(-2.5, -18.52898094212539, -2.5, -10.52898094212539)
+SketchLine_39 = Sketch_3.addLine(0.5, -18, 0.5, -10)
 SketchConstraintCoincidence_40 = Sketch_3.setCoincident(SketchLine_38.endPoint(), SketchLine_39.startPoint())
-SketchLine_40 = Sketch_3.addLine(-2.5, -10.52898094212539, 7.788407623149843, -8.714857089637437)
+SketchLine_40 = Sketch_3.addLine(0.5, -10, 7.788407623149843, -8.714857089637437)
 SketchConstraintCoincidence_41 = Sketch_3.setCoincident(SketchLine_39.endPoint(), SketchLine_40.startPoint())
 SketchLine_41 = Sketch_3.addLine(7.788407623149843, -8.714857089637437, 8, -9.914857089637437)
 SketchConstraintCoincidence_42 = Sketch_3.setCoincident(SketchLine_40.endPoint(), SketchLine_41.startPoint())
@@ -300,34 +300,25 @@ SketchConstraintCoincidence_43 = Sketch_3.setCoincident(SketchLine_41.endPoint()
 SketchConstraintCoincidence_44 = Sketch_3.setCoincident(SketchLine_42.endPoint(), SketchLine_37.startPoint())
 SketchProjection_5 = Sketch_3.addProjection(model.selection("EDGE", "PartSet/OX"), False)
 SketchLine_43 = SketchProjection_5.createdFeature()
-SketchProjection_6 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_33"), False)
+SketchProjection_6 = Sketch_3.addProjection(model.selection("EDGE", "([Revolution_1_1/Generated_Face&Sketch_1/SketchLine_34][Revolution_1_1/Generated_Face&Sketch_1/SketchLine_33])([Revolution_1_1/Generated_Face&Sketch_1/SketchLine_33][Fillet_2_1/MF:Fillet&Sketch_1/SketchLine_32])_Fillet_2_1"), False)
 SketchLine_44 = SketchProjection_6.createdFeature()
-SketchProjection_7 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_33"), False)
-SketchLine_45 = SketchProjection_7.createdFeature()
-SketchProjection_8 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_33"), False)
-SketchLine_46 = SketchProjection_8.createdFeature()
 SketchProjection_9 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_32"), False)
 SketchLine_47 = SketchProjection_9.createdFeature()
-SketchProjection_10 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_32"), False)
-SketchLine_48 = SketchProjection_10.createdFeature()
-SketchProjection_11 = Sketch_3.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_32"), False)
-SketchLine_49 = SketchProjection_11.createdFeature()
-SketchConstraintVertical_13 = Sketch_3.setVertical(SketchLine_37.result())
-SketchConstraintVertical_14 = Sketch_3.setVertical(SketchLine_39.result())
+SketchConstraintVertical_14 = Sketch_3.setVertical(SketchLine_37.result())
+SketchConstraintVertical_15 = Sketch_3.setVertical(SketchLine_39.result())
 SketchConstraintHorizontal_9 = Sketch_3.setHorizontal(SketchLine_38.result())
 SketchConstraintHorizontal_10 = Sketch_3.setHorizontal(SketchLine_42.result())
 SketchConstraintPerpendicular_2 = Sketch_3.setPerpendicular(SketchLine_40.result(), SketchLine_41.result())
-SketchConstraintDistanceVertical_4 = Sketch_3.setVerticalDistance(SketchLine_42.startPoint(), SketchLine_40.endPoint(), 1.2)
-SketchConstraintMirror_1 = Sketch_3.addMirror(SketchLine_43.result(), [SketchLine_46.result(), SketchLine_49.result()])
+SketchConstraintDistanceVertical_5 = Sketch_3.setVerticalDistance(SketchLine_42.startPoint(), SketchLine_40.endPoint(), 1.2)
+SketchConstraintMirror_1 = Sketch_3.addMirror(SketchLine_43.result(), [SketchLine_44.result(), SketchLine_47.result()])
 [SketchLine_50, SketchLine_51] = SketchConstraintMirror_1.mirrored()
 SketchLine_50.setAuxiliary(True)
 SketchLine_51.setAuxiliary(True)
 SketchConstraintCoincidence_45 = Sketch_3.setCoincident(SketchAPI_Line(SketchLine_51).startPoint(), SketchLine_37.result())
-SketchConstraintCoincidence_46 = Sketch_3.setCoincident(SketchAPI_Line(SketchLine_50).startPoint(), SketchLine_40.result())
-SketchConstraintAngle_5 = Sketch_3.setAngle(SketchLine_51.result(), SketchLine_40.result(), 10)
+SketchConstraintCoincidence_46 = Sketch_3.setCoincident(SketchAPI_Line(SketchLine_50).startPoint(), SketchLine_39.endPoint())
+SketchConstraintAngle_4 = Sketch_3.setAngle(SketchLine_51.result(), SketchLine_40.result(), 10)
 SketchConstraintDistanceHorizontal_15 = Sketch_3.setHorizontalDistance(SketchAPI_Line(SketchLine_50).endPoint(), SketchLine_42.startPoint(), "Slot_Width")
-SketchConstraintDistanceVertical_5 = Sketch_3.setVerticalDistance(SketchLine_39.startPoint(), SketchLine_39.endPoint(), 8)
-SketchConstraintDistanceHorizontal_16 = Sketch_3.setHorizontalDistance(SketchLine_39.endPoint(), SketchAPI_Line(SketchLine_50).startPoint(), 3)
+SketchConstraintDistanceVertical_6 = Sketch_3.setVerticalDistance(SketchLine_39.startPoint(), SketchLine_39.endPoint(), 8)
 ExtrusionCut_2.setNestedSketch(Sketch_3)
 model.do()
 # check Sketch_3
@@ -362,9 +353,9 @@ SketchConstraintCoincidence_53 = Sketch_4.setCoincident(SketchLine_57.endPoint()
 SketchArc_2 = Sketch_4.addArc(27.95, -12.5, 29.4, -12.5, 29, -11.5, False)
 SketchConstraintCoincidence_54 = Sketch_4.setCoincident(SketchLine_58.endPoint(), SketchArc_2.startPoint())
 SketchConstraintCoincidence_55 = Sketch_4.setCoincident(SketchLine_55.endPoint(), SketchArc_2.endPoint())
-SketchConstraintVertical_15 = Sketch_4.setVertical(SketchLine_52.result())
-SketchConstraintVertical_16 = Sketch_4.setVertical(SketchLine_55.result())
-SketchConstraintVertical_17 = Sketch_4.setVertical(SketchLine_58.result())
+SketchConstraintVertical_16 = Sketch_4.setVertical(SketchLine_52.result())
+SketchConstraintVertical_17 = Sketch_4.setVertical(SketchLine_55.result())
+SketchConstraintVertical_18 = Sketch_4.setVertical(SketchLine_58.result())
 SketchConstraintHorizontal_11 = Sketch_4.setHorizontal(SketchLine_56.result())
 SketchProjection_13 = Sketch_4.addProjection(model.selection("VERTEX", "Sketch_1/SketchLine_23_EndVertex"), False)
 SketchPoint_4 = SketchProjection_13.createdFeature()
@@ -372,7 +363,7 @@ SketchConstraintDistanceHorizontal_17 = Sketch_4.setHorizontalDistance(SketchAPI
 SketchConstraintDistanceHorizontal_18 = Sketch_4.setHorizontalDistance(SketchLine_54.startPoint(), SketchLine_54.endPoint(), "Drill2_InnerRadius")
 SketchProjection_14 = Sketch_4.addProjection(model.selection("EDGE", "Sketch_1/SketchLine_20"), False)
 SketchLine_59 = SketchProjection_14.createdFeature()
-SketchConstraintAngle_6 = Sketch_4.setAngle(SketchLine_57.result(), SketchLine_56.result(), 45)
+SketchConstraintAngle_5 = Sketch_4.setAngle(SketchLine_57.result(), SketchLine_56.result(), 45)
 SketchConstraintMirror_2 = Sketch_4.addMirror(SketchLine_53.result(), [SketchLine_59.result()])
 [SketchLine_60] = SketchConstraintMirror_2.mirrored()
 SketchLine_60.setAuxiliary(True)
@@ -384,12 +375,12 @@ SketchPoint_5 = Sketch_4.addPoint(29.9, -19)
 SketchConstraintCoincidence_56 = Sketch_4.setCoincident(SketchPoint_5.coordinates(), SketchLine_60.result())
 SketchConstraintCoincidence_57 = Sketch_4.setCoincident(SketchPoint_5.coordinates(), SketchLine_57.result())
 SketchConstraintDistance_15 = Sketch_4.setDistance(SketchPoint_5.coordinates(), SketchLine_52.result(), "Drill2_Radius", True)
-SketchConstraintDistanceVertical_6 = Sketch_4.setVerticalDistance(SketchLine_56.endPoint(), SketchPoint_5.coordinates(), 0.5)
+SketchConstraintDistanceVertical_7 = Sketch_4.setVerticalDistance(SketchLine_56.endPoint(), SketchPoint_5.coordinates(), 0.5)
 model.do()
 # check Sketch_4
 model.checkSketch(Sketch_4, 0)
 
-RevolutionCut_1 = model.addRevolutionCut(Part_1_doc, [model.selection("FACE", "Sketch_4/Face-SketchLine_56f-SketchLine_57f-SketchLine_58f-SketchArc_2_2f-SketchLine_55r-SketchLine_54r-SketchLine_52r")], model.selection("EDGE", "Sketch_4/SketchLine_52"), 360, 0, [model.selection("SOLID", "ExtrusionCut_2_1")])
+RevolutionCut_1 = model.addRevolutionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_4")], model.selection("EDGE", "Sketch_4/SketchLine_48"), 360, 0, [model.selection("SOLID", "ExtrusionCut_2_1")])
 # check RevolutionCut_1
 model.testNbResults(RevolutionCut_1, 1)
 model.testNbSubResults(RevolutionCut_1, [0])
@@ -416,10 +407,10 @@ 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())
+SketchConstraintVertical_19 = 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")
+SketchConstraintDistanceVertical_8 = Sketch_5.setVerticalDistance(SketchLine_65.startPoint(), SketchLine_61.startPoint(), "Chamfer/2")
+SketchConstraintDistanceVertical_9 = Sketch_5.setVerticalDistance(SketchLine_61.startPoint(), SketchLine_63.endPoint(), "Chamfer*1.5")
 RevolutionCut_2.setNestedSketch(Sketch_5)
 model.do()
 # check Sketch_5