From: azv Date: Wed, 29 Aug 2018 05:49:50 +0000 (+0300) Subject: Update "big models" X-Git-Tag: SHAPER_V9_1_0RC1~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fc0fc28bf1527bda9b79e33694d412428e386508;p=modules%2Fshaper.git Update "big models" --- diff --git a/test.models/CSWA.py b/test.models/CSWA.py index 91fe1738c..b1f5181dc 100644 --- a/test.models/CSWA.py +++ b/test.models/CSWA.py @@ -195,11 +195,11 @@ SketchConstraintCoincidence_41.setName("SketchConstraintCoincidence_42") model.do() ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_6/Wire-SketchArc_10_2f-SketchLine_16r-SketchLine_18f-SketchLine_19r")], model.selection(), 0, 9, [model.selection("SOLID", "ExtrusionFuse_3_1")]) Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/From_Face_1")) -SketchCircle_4 = Sketch_7.addCircle(45, 35, 5) +SketchCircle_4 = Sketch_7.addCircle(45, -35, 5) SketchLine_20 = Sketch_7.addLine(model.selection("EDGE", "ExtrusionCut_2_1/Modfied_2&ExtrusionCut_2_1/From_Face_1")) SketchConstraintDistance_9 = Sketch_7.setDistance(SketchCircle_4.center(), SketchLine_20.result(), 10) SketchConstraintRadius_6 = Sketch_7.setRadius(SketchCircle_4.results()[1], "10/2") -SketchLine_21 = Sketch_7.addLine(35, 35, 45, 35) +SketchLine_21 = Sketch_7.addLine(35, -35, 45, -35) SketchLine_21.setAuxiliary(True) SketchPoint_5 = Sketch_7.addPoint(model.selection("VERTEX", "ExtrusionCut_2_1/Generated_Face_1&ExtrusionCut_2_1/Generated_Face_4&ExtrusionCut_2_1/From_Face_1")) SketchConstraintCoincidence_42 = Sketch_7.setCoincident(SketchLine_21.startPoint(), SketchPoint_5.result()) diff --git a/test.models/angle30.py b/test.models/angle30.py index da333d57a..5a37ad7d3 100644 --- a/test.models/angle30.py +++ b/test.models/angle30.py @@ -675,14 +675,14 @@ Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_8_1/Ge SketchLine_67 = Sketch_8.addLine(55, -34.06366588218793, 55, 66.69872981077805) SketchLine_67.setName("SketchLine_79") SketchLine_67.result().setName("SketchLine_79") -SketchPoint_10 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_4&Extrusion_8_1/Generated_Face_3&ExtrusionCut_1_1/Modfied_1")) +SketchPoint_10 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_3&Extrusion_8_1/Generated_Face_3&ExtrusionCut_1_1/Modfied_13")) SketchLine_68 = Sketch_8.addLine(55, -34.06366588218793, 55, 76.69872981077803) SketchLine_68.setName("SketchLine_70") SketchLine_68.result().setName("SketchLine_70") SketchLine_68.setAuxiliary(True) SketchConstraintCoincidence_116 = Sketch_8.setCoincident(SketchLine_68.startPoint(), SketchPoint_10.result()) SketchConstraintCoincidence_116.setName("SketchConstraintCoincidence_120") -SketchPoint_11 = Sketch_8.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_3&ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_4")) +SketchPoint_11 = Sketch_8.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_3&ExtrusionCut_1_1/Modfied_13&Extrusion_8_1/Generated_Face_4")) SketchConstraintCoincidence_117 = Sketch_8.setCoincident(SketchLine_68.endPoint(), SketchPoint_11.result()) SketchConstraintCoincidence_117.setName("SketchConstraintCoincidence_121") SketchLine_69 = Sketch_8.addLine(45, 76.69872981077805, -44.9999999570576, 76.69872981077805) @@ -694,7 +694,7 @@ SketchLine_70.result().setName("SketchLine_71") SketchLine_70.setAuxiliary(True) SketchConstraintCoincidence_118 = Sketch_8.setCoincident(SketchLine_68.endPoint(), SketchLine_70.startPoint()) SketchConstraintCoincidence_118.setName("SketchConstraintCoincidence_122") -SketchPoint_12 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_2&Extrusion_8_1/Generated_Face_3&Extrusion_8_1/Generated_Face_4")) +SketchPoint_12 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_3&Extrusion_8_1/Generated_Face_4")) SketchConstraintCoincidence_119 = Sketch_8.setCoincident(SketchLine_70.endPoint(), SketchPoint_12.result()) SketchConstraintCoincidence_119.setName("SketchConstraintCoincidence_123") SketchLine_71 = Sketch_8.addLine(-55, 66.69872976783566, -55, -34.06366588218793) @@ -706,7 +706,7 @@ SketchLine_72.result().setName("SketchLine_72") SketchLine_72.setAuxiliary(True) SketchConstraintCoincidence_120 = Sketch_8.setCoincident(SketchLine_70.endPoint(), SketchLine_72.startPoint()) SketchConstraintCoincidence_120.setName("SketchConstraintCoincidence_124") -SketchPoint_13 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_4&ExtrusionCut_1_1/Modfied_2&Extrusion_8_1/Generated_Face_3")) +SketchPoint_13 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_3&ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_3")) SketchConstraintCoincidence_121 = Sketch_8.setCoincident(SketchLine_72.endPoint(), SketchPoint_13.result()) SketchConstraintCoincidence_121.setName("SketchConstraintCoincidence_125") SketchLine_73 = Sketch_8.addLine(-55, -34.06366588218793, -83.25521566485324, -34.06366588218793) diff --git a/test.models/bearing_puller.py b/test.models/bearing_puller.py index c6e7f6c47..5a20aecd3 100644 --- a/test.models/bearing_puller.py +++ b/test.models/bearing_puller.py @@ -119,6 +119,8 @@ SketchConstraintCoincidence_13 = Sketch_2.setCoincident(SketchLine_10.startPoint SketchCircle_2 = Sketch_2.addCircle(model.selection("EDGE", "Revolution_1_1/Generated_Face_2&Revolution_1_1/Generated_Face_1")) SketchConstraintCoincidence_14 = Sketch_2.setCoincident(SketchLine_10.endPoint(), SketchCircle_2.results()[1]) SketchLine_11 = Sketch_2.addLine(15.87713238415337, 2.499999967850816, 39.43375672974065, 43.30127018922192) +SketchLine_11.setName("SketchLine_11") +SketchLine_11.result().setName("SketchLine_11") SketchLine_12 = Sketch_2.addLine(model.selection("EDGE", "PartSet/OX")) SketchLine_12.setName("SketchLine_7") SketchLine_12.result().setName("SketchLine_7") @@ -243,7 +245,7 @@ SketchConstraintDistance_10 = Sketch_3.setDistance(SketchCircle_3.center(), Sket SketchConstraintDistance_10.setName("SketchConstraintDistance_9") SketchConstraintDistance_11 = Sketch_3.setDistance(SketchCircle_4.center(), SketchLine_28.result(), 40) SketchConstraintDistance_11.setName("SketchConstraintDistance_10") -SketchProjection_1 = Sketch_3.addProjection(model.selection("EDGE", "Cut_2_1/Modified_Face_17&Cut_2_1/Modified_Face_7")) +SketchProjection_1 = Sketch_3.addProjection(model.selection("EDGE", "Cut_2_1/Modified_Face_divided_20_e_15_1"), False) SketchLine_29 = SketchProjection_1.createdFeature() SketchLine_29.setName("SketchLine_26") SketchLine_29.result().setName("SketchLine_26") @@ -502,7 +504,7 @@ Extrusion_3 = model.addExtrusion(Part_2_doc, [model.selection("WIRE", "Sketch_2/ Fuse_1 = model.addFuse(Part_2_doc, [model.selection("SOLID", "Pipe_1_1")], [model.selection("SOLID", "Extrusion_1_1"), model.selection("SOLID", "Extrusion_1_2")]) Extrusion_4 = model.addExtrusion(Part_2_doc, [model.selection("FACE", "Sketch_2/Face-SketchCircle_3_2f")], model.selection(), "Gap", "Gap") Cut_1 = model.addCut(Part_2_doc, [model.selection("SOLID", "Fuse_1_1")], [model.selection("SOLID", "Extrusion_2_1")]) -Translation_1 = model.addTranslation(Part_2_doc, [model.selection("SOLID", "Cut_1_1")], model.selection("VERTEX", "Sketch_2/Vertex-SketchArc_3_2s"), model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_21e")) +Translation_1 = model.addTranslation(Part_2_doc, [model.selection("SOLID", "Cut_1_1")], model.selection("VERTEX", "Sketch_2/Edge-SketchCircle_2_2__cc"), model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_21e")) model.do() Part_3 = model.duplicatePart(Part_2) Part_3.setName("Arm 2") diff --git a/test.models/bracket32.py b/test.models/bracket32.py index 42dcf26c4..de8e95449 100644 --- a/test.models/bracket32.py +++ b/test.models/bracket32.py @@ -398,10 +398,10 @@ model.do() Sketch_4 = model.addSketch(Part_1_doc, model.defaultPlane("YOZ")) SketchCircle_3 = Sketch_4.addCircle(0, 85, 7) SketchCircle_4 = Sketch_4.addCircle(0, 55, 7) -SketchPoint_1 = Sketch_4.addPoint(model.selection("VERTEX", "Sketch_3/Vertex-SketchCircle_1")) +SketchPoint_1 = Sketch_4.addPoint(model.selection("VERTEX", "Sketch_3/Edge-SketchCircle_1_2__cc")) SketchConstraintCoincidence_61 = Sketch_4.setCoincident(SketchPoint_1.coordinates(), SketchCircle_3.center()) SketchConstraintCoincidence_61.setName("SketchConstraintCoincidence_19") -SketchPoint_2 = Sketch_4.addPoint(model.selection("VERTEX", "Sketch_3/Vertex-SketchCircle_2")) +SketchPoint_2 = Sketch_4.addPoint(model.selection("VERTEX", "Sketch_3/Edge-SketchCircle_2_2__cc")) SketchConstraintCoincidence_62 = Sketch_4.setCoincident(SketchPoint_2.coordinates(), SketchCircle_4.center()) SketchConstraintCoincidence_62.setName("SketchConstraintCoincidence_20") SketchConstraintRadius_9 = Sketch_4.setRadius(SketchCircle_3.results()[1], "TDI/2") @@ -436,7 +436,7 @@ SketchConstraintMirror_2.setName("SketchConstraintMirror_3") model.do() Sketch_6 = model.addSketch(Part_1_doc, model.defaultPlane("XOY")) SketchCircle_9 = Sketch_6.addCircle(30, -41, 4) -SketchPoint_3 = Sketch_6.addPoint(model.selection("VERTEX", "Sketch_5/Vertex-SketchCircle_5")) +SketchPoint_3 = Sketch_6.addPoint(model.selection("VERTEX", "Sketch_5/Edge-SketchCircle_5_2__cc")) SketchConstraintCoincidence_63 = Sketch_6.setCoincident(SketchPoint_3.coordinates(), SketchCircle_9.center()) SketchConstraintCoincidence_63.setName("SketchConstraintCoincidence_21") SketchConstraintRadius_12 = Sketch_6.setRadius(SketchCircle_9.results()[1], "BHD/2") @@ -457,7 +457,7 @@ model.do() Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "PartSet/YOZ"), 30, False) Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) SketchLine_41 = Sketch_7.addLine(-41, 0, -41, 8) -SketchPoint_4 = Sketch_7.addPoint(model.selection("VERTEX", "Sketch_5/Vertex-SketchCircle_5")) +SketchPoint_4 = Sketch_7.addPoint(model.selection("VERTEX", "Sketch_5/Edge-SketchCircle_5_2__cc")) SketchConstraintCoincidence_64 = Sketch_7.setCoincident(SketchLine_41.startPoint(), SketchPoint_4.result()) SketchConstraintCoincidence_64.setName("SketchConstraintCoincidence_34") SketchLine_42 = Sketch_7.addLine(-41, 8, -34, 8) @@ -546,7 +546,7 @@ SketchLine_49.result().setName("SketchLine_55") SketchLine_50 = Sketch_8.addLine(32, 0, 41, 0) SketchLine_50.setName("SketchLine_49") SketchLine_50.result().setName("SketchLine_49") -SketchPoint_5 = Sketch_8.addPoint(model.selection("VERTEX", "Sketch_6/Vertex-SketchCircle_10")) +SketchPoint_5 = Sketch_8.addPoint(model.selection("VERTEX", "Sketch_6/Edge-SketchCircle_10_2__cc")) SketchConstraintCoincidence_78 = Sketch_8.setCoincident(SketchLine_50.endPoint(), SketchPoint_5.result()) SketchConstraintCoincidence_78.setName("SketchConstraintCoincidence_50") SketchLine_51 = Sketch_8.addLine(41, 0, 41, 8) @@ -643,7 +643,7 @@ SketchLine_57.result().setName("SketchLine_63") SketchLine_58 = Sketch_9.addLine(-32, 0, -41, 0) SketchLine_58.setName("SketchLine_57") SketchLine_58.result().setName("SketchLine_57") -SketchPoint_8 = Sketch_9.addPoint(model.selection("VERTEX", "Sketch_6/Vertex-SketchCircle_11")) +SketchPoint_8 = Sketch_9.addPoint(model.selection("VERTEX", "Sketch_6/Edge-SketchCircle_11_2__cc")) SketchConstraintCoincidence_95 = Sketch_9.setCoincident(SketchLine_58.endPoint(), SketchPoint_8.result()) SketchConstraintCoincidence_95.setName("SketchConstraintCoincidence_67") SketchLine_59 = Sketch_9.addLine(-41, 0, -41, 7.999999999999999) @@ -738,7 +738,7 @@ SketchLine_65.result().setName("SketchLine_71") SketchLine_66 = Sketch_10.addLine(32, 0, 41, 0) SketchLine_66.setName("SketchLine_65") SketchLine_66.result().setName("SketchLine_65") -SketchPoint_11 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_6/Vertex-SketchCircle_12")) +SketchPoint_11 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_6/Edge-SketchCircle_12_2__cc")) SketchConstraintCoincidence_112 = Sketch_10.setCoincident(SketchLine_66.endPoint(), SketchPoint_11.result()) SketchConstraintCoincidence_112.setName("SketchConstraintCoincidence_84") SketchLine_67 = Sketch_10.addLine(41, 0, 41, 7.999999999999999) diff --git a/test.models/case24.py b/test.models/case24.py index a77f822ff..5db96a7f2 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -224,7 +224,7 @@ SketchConstraintParallel_2 = Sketch_4.setParallel(SketchLine_25.result(), Sketch SketchConstraintDistance_11 = Sketch_4.setDistance(SketchLine_23.startPoint(), SketchLine_29.result(), 3) model.do() RevolutionFuse_2 = model.addRevolutionFuse(Part_1_doc, [model.selection("FACE", "Sketch_4/Face-SketchLine_26f-SketchLine_22f-SketchLine_23f-SketchLine_27f-SketchArc_4_2f")], model.selection("EDGE", "Sketch_4/Edge-SketchLine_29"), 0, 71, [model.selection("SOLID", "RevolutionFuse_1_1")]) -Sketch_5 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOZ")) +Sketch_5 = model.addSketch(Part_1_doc, model.standardPlane("XOZ")) SketchLine_30 = Sketch_5.addLine(0, 0, 0, 82) SketchLine_31 = Sketch_5.addLine(model.selection("EDGE", "PartSet/OZ")) SketchConstraintCoincidence_45 = Sketch_5.setCoincident(SketchLine_30.endPoint(), SketchLine_31.result()) @@ -305,7 +305,7 @@ SketchConstraintDistance_15 = Sketch_5.setDistance(SketchLine_37.startPoint(), S SketchConstraintDistance_15.setName("SketchConstraintDistance_16") model.do() RevolutionFuse_3 = model.addRevolutionFuse(Part_1_doc, [model.selection("WIRE", "Sketch_5/Wire-SketchLine_30r-SketchLine_39r-SketchLine_32r-SketchLine_40r-SketchLine_38r-SketchArc_6_2f-SketchArc_7_2r")], model.selection("EDGE", "PartSet/OZ"), 45, 315, [model.selection("SOLID", "RevolutionFuse_2_1")]) -Sketch_6 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/YOZ")) +Sketch_6 = model.addSketch(Part_1_doc, model.standardPlane("YOZ")) SketchLine_38 = Sketch_6.addLine(19.99999999999999, 60, -20, 60) SketchLine_38.setName("SketchLine_48") SketchLine_38.result().setName("SketchLine_48") @@ -375,6 +375,8 @@ SketchConstraintCoincidence_70.setName("SketchConstraintCoincidence_81") SketchConstraintCoincidence_71 = Sketch_6.setCoincident(SketchLine_38.startPoint(), SketchLine_46.result()) SketchConstraintCoincidence_71.setName("SketchConstraintCoincidence_82") SketchLine_49 = Sketch_6.addLine(-19.99999999999998, 30.00000000000001, 20, 30) +SketchLine_49.setName("SketchLine_49") +SketchLine_49.result().setName("SketchLine_49") SketchLine_49.setAuxiliary(True) SketchConstraintCoincidence_72 = Sketch_6.setCoincident(SketchLine_43.startPoint(), SketchLine_49.startPoint()) SketchConstraintCoincidence_72.setName("SketchConstraintCoincidence_85") @@ -411,7 +413,7 @@ SketchConstraintCoincidence_84 = Sketch_6.setCoincident(SketchLine_41.startPoint SketchConstraintCoincidence_84.setName("SketchConstraintCoincidence_156") model.do() ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_6")], model.selection(), 100, 0, [model.selection("SOLID", "RevolutionFuse_3_1")]) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOZ")) +Sketch_7 = model.addSketch(Part_1_doc, model.standardPlane("XOZ")) SketchLine_50 = Sketch_7.addLine(65, 23.09999999999939, 65, 23.00000523211526) SketchLine_50.setName("SketchLine_61") SketchLine_50.result().setName("SketchLine_61") @@ -494,7 +496,7 @@ SketchConstraintDistance_21 = Sketch_7.setDistance(SketchLine_50.startPoint(), S SketchConstraintDistance_21.setName("SketchConstraintDistance_23") model.do() RevolutionFuse_4 = model.addRevolutionFuse(Part_1_doc, [model.selection("COMPOUND", "Sketch_7")], model.selection("EDGE", "PartSet/OZ"), 14.4, 14.4, [model.selection("SOLID", "ExtrusionCut_1_1")]) -Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOZ")) +Sketch_8 = model.addSketch(Part_1_doc, model.standardPlane("XOZ")) SketchCircle_1 = Sketch_8.addCircle(0, 45, 12.5) SketchLine_60 = Sketch_8.addLine(model.selection("EDGE", "Sketch_5/Edge-SketchLine_30")) SketchLine_60.setName("SketchLine_63") @@ -536,6 +538,8 @@ SketchLine_67 = Sketch_9.addLine(58, -2, 58.00000000000001, 3.999997221073) SketchLine_67.setName("SketchLine_93") SketchLine_67.result().setName("SketchLine_93") SketchLine_68 = Sketch_9.addLine(58, -2, 58, 8) +SketchLine_68.setName("SketchLine_68") +SketchLine_68.result().setName("SketchLine_68") SketchLine_68.setAuxiliary(True) SketchConstraintCoincidence_103 = Sketch_9.setCoincident(SketchLine_65.endPoint(), SketchLine_68.startPoint()) SketchConstraintCoincidence_103.setName("SketchConstraintCoincidence_113") @@ -644,11 +648,11 @@ SketchConstraintRadius_9.setName("SketchConstraintRadius_16") SketchConstraintRadius_10 = Sketch_9.setRadius(SketchArc_9.results()[1], 4) SketchConstraintRadius_10.setName("SketchConstraintRadius_17") model.do() -Sketch_10 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOY")) +Sketch_10 = model.addSketch(Part_1_doc, model.standardPlane("XOY")) SketchLine_77 = Sketch_10.addLine(64, 20, 89, 20) SketchLine_77.setName("SketchLine_76") SketchLine_77.result().setName("SketchLine_76") -SketchPoint_4 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_4/Vertex-SketchLine_22s-SketchLine_27e-SketchLine_25e")) +SketchPoint_4 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_9&RevolutionFuse_2_1/Modfied_6&RevolutionFuse_3_1/Modfied_divided_22_1&RevolutionFuse_2_1/Modfied_11")) SketchConstraintCoincidence_122 = Sketch_10.setCoincident(SketchLine_77.startPoint(), SketchPoint_4.result()) SketchConstraintCoincidence_122.setName("SketchConstraintCoincidence_120") SketchPoint_5 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_1s-SketchLine_8e-SketchLine_4e")) @@ -657,10 +661,10 @@ SketchConstraintCoincidence_123.setName("SketchConstraintCoincidence_121") SketchLine_78 = Sketch_10.addLine(64, -20, 89, -20) SketchLine_78.setName("SketchLine_77") SketchLine_78.result().setName("SketchLine_77") -SketchPoint_6 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_12&RevolutionFuse_1_1/Modfied_5&RevolutionFuse_3_1/Modfied_1divided_f_2&RevolutionFuse_1_1/Modfied_10")) +SketchPoint_6 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_10&RevolutionFuse_1_1/Modfied_5&RevolutionFuse_3_1/Modfied_divided_21_1&RevolutionFuse_1_1/Modfied_10")) SketchConstraintCoincidence_124 = Sketch_10.setCoincident(SketchLine_78.startPoint(), SketchPoint_6.result()) SketchConstraintCoincidence_124.setName("SketchConstraintCoincidence_122") -SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_9s-SketchLine_14e-SketchLine_12e")) +SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "ExtrusionFuse_2_1/Modfied_7&ExtrusionFuse_2_1/Modfied_6&RevolutionFuse_3_1/Modfied_10&RevolutionFuse_1_1/Modfied_5")) SketchConstraintCoincidence_125 = Sketch_10.setCoincident(SketchLine_78.endPoint(), SketchPoint_7.result()) SketchConstraintCoincidence_125.setName("SketchConstraintCoincidence_123") SketchArc_10 = Sketch_10.addArc(89.00000104846708, 1.669244441022778e-015, 89, -20, 89, 20, False) @@ -683,7 +687,7 @@ SketchConstraintCoincidence_129 = Sketch_10.setCoincident(SketchArc_11.startPoin SketchConstraintCoincidence_129.setName("SketchConstraintCoincidence_127") SketchConstraintTangent_19 = Sketch_10.setTangent(SketchArc_11.results()[1], SketchLine_78.result()) SketchConstraintTangent_19.setName("SketchConstraintTangent_24") -SketchPoint_8 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_1divided_f_2&RevolutionFuse_1_1/Modfied_10&RevolutionFuse_3_1/Modfied_8")) +SketchPoint_8 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_divided_21_1&RevolutionFuse_1_1/Modfied_10&RevolutionFuse_3_1/Modfied_8")) SketchConstraintCoincidence_130 = Sketch_10.setCoincident(SketchArc_11.endPoint(), SketchPoint_8.result()) SketchConstraintCoincidence_130.setName("SketchConstraintCoincidence_128") SketchArc_12 = Sketch_10.addArc(64.00001789135865, 23.01137360115889, 64, 20, 61.15622559702543, 22.02080994708722, True) @@ -694,7 +698,7 @@ SketchConstraintCoincidence_131 = Sketch_10.setCoincident(SketchArc_12.startPoin SketchConstraintCoincidence_131.setName("SketchConstraintCoincidence_129") SketchConstraintTangent_20 = Sketch_10.setTangent(SketchArc_12.results()[1], SketchLine_77.result()) SketchConstraintTangent_20.setName("SketchConstraintTangent_25") -SketchPoint_9 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_1divided_f_1&RevolutionFuse_2_1/Modfied_11&RevolutionFuse_3_1/Modfied_7")) +SketchPoint_9 = Sketch_10.addPoint(model.selection("VERTEX", "RevolutionFuse_3_1/Modfied_divided_22_1&RevolutionFuse_2_1/Modfied_11&RevolutionFuse_3_1/Modfied_7")) SketchConstraintCoincidence_132 = Sketch_10.setCoincident(SketchArc_12.endPoint(), SketchPoint_9.result()) SketchConstraintCoincidence_132.setName("SketchConstraintCoincidence_130") SketchLine_79 = Sketch_10.addLine(61.15622559702543, 22.02080994708722, 59.81204392543111, 22.0208099470871) @@ -735,6 +739,8 @@ SketchLine_91.setName("SketchLine_90") SketchLine_91.result().setName("SketchLine_90") SketchLine_90.setName("SketchLine_85") SketchLine_90.result().setName("SketchLine_85") +SketchLine_89.setName("SketchLine_89") +SketchLine_89.result().setName("SketchLine_89") SketchLine_88.setName("SketchLine_84") SketchLine_88.result().setName("SketchLine_84") SketchLine_87.setName("SketchLine_88") @@ -763,7 +769,7 @@ SketchArc_13.result().setName("SketchArc_16") SketchArc_13.results()[1].setName("SketchArc_16_2") model.do() ExtrusionFuse_3 = model.addExtrusionFuse(Part_1_doc, [model.selection("FACE", "Sketch_10/Face-SketchArc_16_2f-SketchLine_81r-SketchLine_82f-SketchArc_17_2r-SketchLine_83f-SketchLine_84f-SketchLine_85r-SketchArc_18_2r"), model.selection("FACE", "Sketch_10/Face-SketchArc_19_2f-SketchLine_86r-SketchLine_87f-SketchArc_20_2r-SketchLine_88f-SketchLine_89f-SketchLine_90r-SketchArc_21_2r")], model.selection(), 20, 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) -Sketch_11 = model.addSketch(Part_1_doc, model.selection("FACE", "PartSet/XOY")) +Sketch_11 = model.addSketch(Part_1_doc, model.standardPlane("XOY")) SketchCircle_2 = Sketch_11.addCircle(89, 0, 6) SketchPoint_11 = Sketch_11.addPoint(model.selection("VERTEX", "Sketch_2/Vertex-SketchPoint_1-SketchLine_10s-SketchLine_9e")) SketchConstraintCoincidence_139 = Sketch_11.setCoincident(SketchCircle_2.center(), SketchPoint_11.result()) diff --git a/test.models/clothespin.py b/test.models/clothespin.py index f84b88985..f69307ae2 100644 --- a/test.models/clothespin.py +++ b/test.models/clothespin.py @@ -370,7 +370,7 @@ SketchLine_41.setName("SketchLine_43") SketchLine_41.result().setName("SketchLine_43") model.do() ExtrusionCut_3 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_4")], model.selection(), model.selection("FACE", "ExtrusionCut_1_1/Modfied_2"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) -Plane_4 = model.addPlane(Part_1_doc, model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_1"), model.selection("VERTEX", "ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_6&Extrusion_1_1/Generated_Face_7"), model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_2_1/Modfied_6&ExtrusionCut_3_1/Modfied_3")) +Plane_4 = model.addPlane(Part_1_doc, model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_1"), model.selection("VERTEX", "ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_6&Extrusion_1_1/Generated_Face_7"), model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_2_1/Modfied_5&ExtrusionCut_3_1/Modfied_3")) Sketch_5 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) SketchArc_4 = Sketch_5.addArc(25, -7.50002056854448, 22, -7.5, 28, -7.5, True) SketchPoint_5 = Sketch_5.addPoint(22, -7.5) @@ -465,7 +465,7 @@ SketchLine_56.setName("SketchLine_58") SketchLine_56.result().setName("SketchLine_58") model.do() ExtrusionFuse_1 = model.addExtrusionFuse(Part_1_doc, [model.selection("COMPOUND", "Sketch_6")], model.selection(), model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_3f-SketchLine_4f-SketchLine_5f-SketchLine_7f-SketchArc_1_2f-SketchLine_8f-SketchLine_9f-SketchLine_10r-SketchLine_11r-SketchLine_12r-SketchLine_14r-SketchArc_2_2r"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_5_1")]) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_9")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_8")) SketchLine_64 = Sketch_7.addLine(50.25, -4.5, 31.25, -4.5) SketchLine_64.setName("SketchLine_76") SketchLine_64.result().setName("SketchLine_76") @@ -788,7 +788,7 @@ SketchConstraintCoincidence_142 = Sketch_8.setCoincident(SketchPoint_21.coordina SketchConstraintCoincidence_142.setName("SketchConstraintCoincidence_145") model.do() ExtrusionCut_7 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_8")], model.selection(), 10, 0, [model.selection("SOLID", "ExtrusionCut_6_1")]) -Sketch_9 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_26")) +Sketch_9 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_14")) SketchLine_94 = Sketch_9.addLine(21, 4.163450069699051, 21, 0) SketchLine_94.setName("SketchLine_107") SketchLine_94.result().setName("SketchLine_107") @@ -1305,7 +1305,7 @@ SketchLine_147.setName("SketchLine_43") SketchLine_147.result().setName("SketchLine_43") model.do() ExtrusionCut_12 = model.addExtrusionCut(Part_2_doc, [model.selection("COMPOUND", "Sketch_4")], model.selection(), model.selection("FACE", "ExtrusionCut_1_1/Modfied_2"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) -Plane_9 = model.addPlane(Part_2_doc, model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_1"), model.selection("VERTEX", "ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_6&Extrusion_1_1/Generated_Face_7"), model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_2_1/Modfied_6&ExtrusionCut_3_1/Modfied_3")) +Plane_9 = model.addPlane(Part_2_doc, model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_1"), model.selection("VERTEX", "ExtrusionCut_3_1/Modfied_3&Extrusion_1_1/Generated_Face_6&Extrusion_1_1/Generated_Face_7"), model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_5&ExtrusionCut_2_1/Modfied_5&ExtrusionCut_3_1/Modfied_3")) Sketch_15 = model.addSketch(Part_2_doc, model.selection("FACE", "Plane_1")) SketchArc_27 = Sketch_15.addArc(25, -7.50002056854448, 22, -7.5, 28, -7.5, True) SketchPoint_29 = Sketch_15.addPoint(22, -7.5) @@ -1400,7 +1400,7 @@ SketchLine_162.setName("SketchLine_58") SketchLine_162.result().setName("SketchLine_58") model.do() ExtrusionFuse_2 = model.addExtrusionFuse(Part_2_doc, [model.selection("COMPOUND", "Sketch_6")], model.selection(), model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_3f-SketchLine_4f-SketchLine_5f-SketchLine_7f-SketchArc_1_2f-SketchLine_8f-SketchLine_9f-SketchLine_10r-SketchLine_11r-SketchLine_12r-SketchLine_14r-SketchArc_2_2r"), 0, model.selection(), 0, [model.selection("SOLID", "ExtrusionCut_5_1")]) -Sketch_17 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_9")) +Sketch_17 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_2_1/Modfied_8")) SketchLine_170 = Sketch_17.addLine(50.25, -4.5, 31.25, -4.5) SketchLine_170.setName("SketchLine_76") SketchLine_170.result().setName("SketchLine_76") @@ -1723,7 +1723,7 @@ SketchConstraintCoincidence_316 = Sketch_18.setCoincident(SketchPoint_45.coordin SketchConstraintCoincidence_316.setName("SketchConstraintCoincidence_145") model.do() ExtrusionCut_16 = model.addExtrusionCut(Part_2_doc, [model.selection("COMPOUND", "Sketch_8")], model.selection(), 10, 0, [model.selection("SOLID", "ExtrusionCut_6_1")]) -Sketch_19 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_26")) +Sketch_19 = model.addSketch(Part_2_doc, model.selection("FACE", "ExtrusionCut_7_1/Modfied_14")) SketchLine_200 = Sketch_19.addLine(21, 4.163450069699051, 21, 0) SketchLine_200.setName("SketchLine_107") SketchLine_200.result().setName("SketchLine_107") @@ -1893,8 +1893,8 @@ SketchConstraintDistance_34 = Sketch_20.setDistance(SketchLine_211.result(), Ske model.do() ExtrusionCut_18 = model.addExtrusionCut(Part_2_doc, [model.selection("WIRE", "Sketch_10/Wire-SketchCircle_1_2f")], model.selection(), 0, 0.75, [model.selection("SOLID", "ExtrusionCut_8_1")]) model.do() -Rotation_1 = model.addRotation(partSet, [model.selection("COMPOUND", "Part_2/")], model.selection("EDGE", "Part_1/ExtrusionCut_9_1/Modfied_1&ExtrusionCut_7_1/Modfied_31"), 180) -Placement_1 = model.addPlacement(partSet, [model.selection("COMPOUND", "Rotation_1/")], model.selection("FACE", "Rotation_1/ExtrusionCut_5_1/Modfied_1"), model.selection("FACE", "Part_1/ExtrusionCut_5_1/Modfied_1"), False, True) +Rotation_1 = model.addRotation(partSet, [model.selection("COMPOUND", "Part_2/")], model.selection("EDGE", "Part_1/ExtrusionCut_9_1/Modfied_1&ExtrusionCut_7_1/Modfied_19"), 180) +Placement_1 = model.addPlacement(partSet, [model.selection("COMPOUND", "Rotation_1/")], model.selection("FACE", "Rotation_1/ExtrusionCut_5_1/Modfied_5"), model.selection("FACE", "Part_1/ExtrusionCut_5_1/Modfied_5"), False, True) Rotation_2 = model.addRotation(partSet, [model.selection("COMPOUND", "Placement_1/")], model.selection("EDGE", "Part_1/ExtrusionCut_5_1/Modfied_5&ExtrusionCut_8_1/Modfied_3"), 7) Rotation_2.result().setColor(255, 85, 0) model.end() diff --git a/test.models/ecran.py b/test.models/ecran.py index 47effa500..726b5099f 100644 --- a/test.models/ecran.py +++ b/test.models/ecran.py @@ -117,6 +117,7 @@ SketchConstraintCoincidence_23 = Sketch_1.setCoincident(SketchLine_5.result(), S model.do() Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-SketchLine_1f-SketchLine_10f-SketchLine_11f-SketchLine_12f-SketchLine_13f-SketchLine_4f-SketchLine_8f-SketchLine_9f-SketchArc_1_2r-SketchArc_2_2f")], model.selection(), "307/2.", "307/2.") Extrusion_1.setName("Profil") +Extrusion_1.result().setName("Extrusion_1_1") Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face_3")) SketchLine_14 = Sketch_2.addLine(149.5, -2.3, 153.5, -2.3) SketchPoint_1 = Sketch_2.addPoint(model.selection("VERTEX", "Extrusion_1_1/Generated_Face_4&Extrusion_1_1/Generated_Face_3&Extrusion_1_1/To_Face_1")) @@ -157,6 +158,7 @@ SketchConstraintCoincidence_34.setName("SketchConstraintCoincidence_39") model.do() ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_2")], model.selection(), model.selection("FACE", "Extrusion_1_1/Generated_Face_6"), 0, model.selection(), 0, [model.selection("SOLID", "Extrusion_1_1")]) ExtrusionCut_1.setName("Decoupe_Angle") +ExtrusionCut_1.result().setName("ExtrusionCut_1_1") Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face_2")) SketchLine_22 = Sketch_3.addLine(153.5, -10.3, 153.5, -8.3) SketchLine_22.setName("SketchLine_29") @@ -204,6 +206,7 @@ Sketch_3.setName("Sketch_4") Sketch_3.result().setName("Sketch_4") ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_4")], model.selection(), 0, 10, [model.selection("SOLID", "ExtrusionCut_1_1")]) ExtrusionCut_2.setName("Chamfrein_1") +ExtrusionCut_2.result().setName("ExtrusionCut_2_1") Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_1_1/Modfied_5")) SketchLine_30 = Sketch_4.addLine(-149.5, 10.3, -149.5, 8.3) SketchLine_30.setName("SketchLine_35") @@ -372,11 +375,11 @@ SketchConstraintLength_8.setName("SketchConstraintLength_9") SketchConstraintLength_9 = Sketch_5.setLength(SketchLine_44.result(), 8) SketchConstraintLength_9.setName("SketchConstraintLength_10") SketchConstraintEqual_4 = Sketch_5.setEqual(SketchLine_47.result(), SketchLine_53.result()) -SketchPoint_5 = Sketch_5.addPoint(153.5, -28.84999053274707) +SketchPoint_5 = Sketch_5.addPoint(153.5, -28.85) SketchPoint_5.setName("SketchPoint_7") SketchPoint_5.result().setName("SketchPoint_7") SketchConstraintMiddle_1 = Sketch_5.setMiddlePoint(SketchPoint_5.coordinates(), SketchLine_42.result()) -SketchLine_55 = Sketch_5.addLine(153.5, -28.84999053274707, -153.5, -28.84999053274707) +SketchLine_55 = Sketch_5.addLine(153.5, -28.85, -153.5, -28.85) SketchLine_55.setName("SketchLine_54") SketchLine_55.result().setName("SketchLine_54") SketchLine_55.setAuxiliary(True) @@ -508,28 +511,28 @@ Sketch_5.setName("Sketch_6") Sketch_5.result().setName("Sketch_6") ExtrusionCut_4 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_6/Wire-SketchArc_9_2f-SketchArc_10_2f-SketchLine_73r-SketchLine_74r-SketchLine_75r-SketchLine_76r"), model.selection("WIRE", "Sketch_6/Wire-SketchLine_58f-SketchLine_61f-SketchLine_60f-SketchLine_51f-SketchArc_4_2f-SketchArc_5_2f"), model.selection("WIRE", "Sketch_6/Wire-SketchLine_57f-SketchLine_47f-SketchLine_62f-SketchLine_63f-SketchArc_3_2f-SketchArc_6_2f")], model.selection(), 0, 10, [model.selection("SOLID", "ExtrusionCut_3_1")]) Sketch_6 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_4_1/Modfied_1")) -SketchArc_11 = Sketch_6.addArc(44.89, -23.54999053274703, 43.89, -23.54999053274703, 44.89, -22.54999053274703, False) -SketchArc_12 = Sketch_6.addArc(44.89, -13.54999053274703, 44.89, -14.54999053274703, 43.89, -13.54999053274703, False) -SketchArc_13 = Sketch_6.addArc(5.89, -13.54999053274703, 6.89, -13.54999053274703, 5.89, -14.54999053274703, False) +SketchArc_11 = Sketch_6.addArc(44.89, -23.55, 43.89, -23.55, 44.89, -22.55, False) +SketchArc_12 = Sketch_6.addArc(44.89, -13.55, 44.89, -14.55, 43.89, -13.55, False) +SketchArc_13 = Sketch_6.addArc(5.89, -13.55, 6.89, -13.55, 5.89, -14.55, False) SketchArc_13.setName("SketchArc_14") SketchArc_13.result().setName("SketchArc_14") SketchArc_13.results()[1].setName("SketchArc_14_2") -SketchLine_76 = Sketch_6.addLine(6.89, -23.54999053274703, 43.89, -23.54999053274703) +SketchLine_76 = Sketch_6.addLine(6.89, -23.55, 43.89, -23.55) SketchLine_76.setName("SketchLine_81") SketchLine_76.result().setName("SketchLine_81") SketchConstraintCoincidence_92 = Sketch_6.setCoincident(SketchArc_11.startPoint(), SketchLine_76.endPoint()) SketchConstraintCoincidence_92.setName("SketchConstraintCoincidence_98") -SketchLine_77 = Sketch_6.addLine(6.89, -13.54999053274703, 43.89, -13.54999053274703) +SketchLine_77 = Sketch_6.addLine(6.89, -13.55, 43.89, -13.55) SketchLine_77.setName("SketchLine_82") SketchLine_77.result().setName("SketchLine_82") SketchConstraintCoincidence_93 = Sketch_6.setCoincident(SketchArc_13.startPoint(), SketchLine_77.startPoint()) SketchConstraintCoincidence_93.setName("SketchConstraintCoincidence_99") -SketchLine_78 = Sketch_6.addLine(44.89, -22.54999053274703, 44.89, -14.54999053274703) +SketchLine_78 = Sketch_6.addLine(44.89, -22.55, 44.89, -14.55) SketchLine_78.setName("SketchLine_83") SketchLine_78.result().setName("SketchLine_83") SketchConstraintCoincidence_94 = Sketch_6.setCoincident(SketchArc_12.startPoint(), SketchLine_78.endPoint()) SketchConstraintCoincidence_94.setName("SketchConstraintCoincidence_100") -SketchLine_79 = Sketch_6.addLine(5.89, -22.54999053274703, 5.89, -14.54999053274703) +SketchLine_79 = Sketch_6.addLine(5.89, -22.55, 5.89, -14.55) SketchLine_79.setName("SketchLine_84") SketchLine_79.result().setName("SketchLine_84") SketchConstraintCoincidence_95 = Sketch_6.setCoincident(SketchArc_13.endPoint(), SketchLine_79.endPoint()) @@ -568,7 +571,7 @@ SketchLine_81 = Sketch_6.addLine(model.selection("EDGE", "Sketch_6/Edge-SketchLi SketchLine_81.setName("SketchLine_86") SketchLine_81.result().setName("SketchLine_86") SketchConstraintDistance_13 = Sketch_6.setDistance(SketchLine_76.endPoint(), SketchLine_81.result(), 5.3) -SketchArc_14 = Sketch_6.addArc(5.89, -23.54999053274703, 5.89, -22.54999053274703, 6.89, -23.54999053274703, False) +SketchArc_14 = Sketch_6.addArc(5.89, -23.55, 5.89, -22.55, 6.89, -23.55, False) SketchArc_14.setName("SketchArc_15") SketchArc_14.result().setName("SketchArc_15") SketchArc_14.results()[1].setName("SketchArc_15_2") @@ -582,13 +585,13 @@ SketchConstraintCoincidence_107 = Sketch_6.setCoincident(SketchArc_14.center(), SketchConstraintCoincidence_107.setName("SketchConstraintCoincidence_114") SketchConstraintEqual_10 = Sketch_6.setEqual(SketchArc_11.results()[1], SketchArc_14.results()[1]) SketchConstraintEqual_10.setName("SketchConstraintEqual_11") -SketchPoint_6 = Sketch_6.addPoint(0, -28.84999053274704) +SketchPoint_6 = Sketch_6.addPoint(0, -28.85) SketchPoint_6.setName("SketchPoint_8") SketchPoint_6.result().setName("SketchPoint_8") -SketchPoint_7 = Sketch_6.addPoint(50.77, -28.84999053274703) +SketchPoint_7 = Sketch_6.addPoint(50.77, -28.85) SketchPoint_7.setName("SketchPoint_9") SketchPoint_7.result().setName("SketchPoint_9") -SketchPoint_8 = Sketch_6.addPoint(101.54, -28.84999053274702) +SketchPoint_8 = Sketch_6.addPoint(101.54, -28.85) SketchPoint_8.setName("SketchPoint_10") SketchPoint_8.result().setName("SketchPoint_10") SketchConstraintCoincidence_108 = Sketch_6.setCoincident(SketchLine_80.result(), SketchPoint_6.coordinates()) @@ -710,7 +713,7 @@ SketchArc_24.results()[1].setName("SketchArc_25_2") SketchArc_23.setName("SketchArc_24") SketchArc_23.result().setName("SketchArc_24") SketchArc_23.results()[1].setName("SketchArc_24_2") -SketchPoint_9 = Sketch_6.addPoint(0, -49.84999053274704) +SketchPoint_9 = Sketch_6.addPoint(0, -49.85) SketchPoint_9.setName("SketchPoint_11") SketchPoint_9.result().setName("SketchPoint_11") SketchConstraintCoincidence_112 = Sketch_6.setCoincident(SketchPoint_9.coordinates(), SketchLine_80.result()) @@ -844,28 +847,28 @@ Sketch_6.setName("Sketch_7") Sketch_6.result().setName("Sketch_7") ExtrusionCut_5 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_7/Wire-SketchArc_20_2f-SketchArc_21_2f-SketchArc_22_2f-SketchArc_23_2f-SketchLine_91r-SketchLine_92f-SketchLine_93r-SketchLine_94f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_52_2f-SketchArc_53_2f-SketchArc_56_2f-SketchArc_57_2f-SketchLine_114r-SketchLine_115f-SketchLine_116r-SketchLine_121f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_44_2f-SketchArc_45_2f-SketchArc_48_2f-SketchArc_49_2f-SketchLine_107f-SketchLine_113f-SketchLine_117r-SketchLine_123r"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_16_2f-SketchArc_17_2f-SketchArc_18_2f-SketchArc_19_2f-SketchLine_87f-SketchLine_88f-SketchLine_89r-SketchLine_90r"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_11_2f-SketchArc_12_2f-SketchArc_14_2f-SketchLine_81f-SketchLine_82r-SketchLine_83f-SketchLine_84r-SketchArc_15_2f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_36_2f-SketchArc_38_2f-SketchArc_40_2f-SketchArc_41_2f-SketchLine_108r-SketchLine_119r-SketchLine_127f-SketchLine_129f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_37_2f-SketchArc_39_2f-SketchArc_42_2f-SketchArc_43_2f-SketchLine_118r-SketchLine_120f-SketchLine_122r-SketchLine_130f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_24_2f-SketchArc_25_2f-SketchArc_26_2f-SketchArc_27_2f-SketchLine_98f-SketchLine_100r-SketchLine_101f-SketchLine_103r"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_30_2f-SketchArc_31_2f-SketchArc_34_2f-SketchArc_35_2f-SketchLine_95f-SketchLine_96r-SketchLine_97f-SketchLine_105r"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_46_2f-SketchArc_47_2f-SketchArc_50_2f-SketchArc_51_2f-SketchLine_124f-SketchLine_125r-SketchLine_126f-SketchLine_128r"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_54_2f-SketchArc_55_2f-SketchArc_58_2f-SketchArc_59_2f-SketchLine_109f-SketchLine_110r-SketchLine_111r-SketchLine_112f"), model.selection("WIRE", "Sketch_7/Wire-SketchArc_28_2f-SketchArc_29_2f-SketchArc_32_2f-SketchArc_33_2f-SketchLine_99r-SketchLine_102f-SketchLine_104f-SketchLine_106r")], model.selection(), 0, 10, [model.selection("SOLID", "ExtrusionCut_4_1")]) Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionCut_5_1/Modfied_1")) -SketchLine_126 = Sketch_7.addLine(-153.5, -37.049990532747, -152.3000099350335, -37.0499905327475) +SketchLine_126 = Sketch_7.addLine(-153.5, -37.05, -152.3, -37.05) SketchLine_126.setName("SketchLine_135") SketchLine_126.result().setName("SketchLine_135") -SketchLine_127 = Sketch_7.addLine(-150.8, -38.54999290880026, -150.8, -43.54999111476925) +SketchLine_127 = Sketch_7.addLine(-150.8, -38.55, -150.8, -43.55) SketchLine_127.setName("SketchLine_138") SketchLine_127.result().setName("SketchLine_138") SketchPoint_10 = Sketch_7.addPoint(model.selection("VERTEX", "Sketch_6/Vertex-SketchLine_67s-SketchLine_68e-SketchLine_69e")) SketchPoint_10.setName("SketchPoint_12") SketchPoint_10.result().setName("SketchPoint_12") -SketchLine_128 = Sketch_7.addLine(-150.8, -45.049990532747, -153.5, -45.04999053274734) +SketchLine_128 = Sketch_7.addLine(-150.8, -45.05, -153.5, -45.05) SketchLine_128.setName("SketchLine_131") SketchLine_128.result().setName("SketchLine_131") SketchLine_128.setAuxiliary(True) SketchConstraintCoincidence_113 = Sketch_7.setCoincident(SketchLine_128.endPoint(), SketchPoint_10.result()) SketchConstraintCoincidence_113.setName("SketchConstraintCoincidence_120") -SketchLine_129 = Sketch_7.addLine(-153.5, -45.04999053274734, -153.5, -37.049990532747) +SketchLine_129 = Sketch_7.addLine(-153.5, -45.05, -153.5, -37.05) SketchLine_129.setName("SketchLine_132") SketchLine_129.result().setName("SketchLine_132") -SketchLine_130 = Sketch_7.addLine(-152.2999985784279, -45.04999053274759, -153.5, -45.04999053274734) +SketchLine_130 = Sketch_7.addLine(-152.3, -45.05, -153.5, -45.05) SketchLine_130.setName("SketchLine_137") SketchLine_130.result().setName("SketchLine_137") -SketchLine_131 = Sketch_7.addLine(-150.8, -37.04999053274745, -150.8, -45.049990532747) +SketchLine_131 = Sketch_7.addLine(-150.8, -37.05, -150.8, -45.05) SketchLine_131.setName("SketchLine_134") SketchLine_131.result().setName("SketchLine_134") SketchLine_131.setAuxiliary(True) @@ -873,7 +876,7 @@ SketchConstraintCoincidence_114 = Sketch_7.setCoincident(SketchLine_131.endPoint SketchConstraintCoincidence_114.setName("SketchConstraintCoincidence_121") SketchConstraintCoincidence_115 = Sketch_7.setCoincident(SketchLine_128.endPoint(), SketchLine_129.startPoint()) SketchConstraintCoincidence_115.setName("SketchConstraintCoincidence_122") -SketchLine_132 = Sketch_7.addLine(-153.5, -37.049990532747, -150.8, -37.04999053274745) +SketchLine_132 = Sketch_7.addLine(-153.5, -37.05, -150.8, -37.05) SketchLine_132.setName("SketchLine_133") SketchLine_132.result().setName("SketchLine_133") SketchLine_132.setAuxiliary(True) @@ -890,11 +893,11 @@ SketchPoint_11.setName("SketchPoint_13") SketchPoint_11.result().setName("SketchPoint_13") SketchConstraintCoincidence_118 = Sketch_7.setCoincident(SketchLine_132.endPoint(), SketchPoint_11.result()) SketchConstraintCoincidence_118.setName("SketchConstraintCoincidence_125") -SketchArc_59 = Sketch_7.addArc(-152.3, -38.54999053274712, -150.8, -38.54999290880026, -152.3000099350335, -37.0499905327475, False) +SketchArc_59 = Sketch_7.addArc(-152.3, -38.55, -150.8, -38.55, -152.3000099350335, -37.05, False) SketchArc_59.setName("SketchArc_60") SketchArc_59.result().setName("SketchArc_60") SketchArc_59.results()[1].setName("SketchArc_60_2") -SketchLine_133 = Sketch_7.addLine(-150.8, -38.54999290880026, -150.8, -45.049990532747) +SketchLine_133 = Sketch_7.addLine(-150.8, -38.55, -150.8, -45.05) SketchLine_133.setName("SketchLine_136") SketchLine_133.result().setName("SketchLine_136") SketchLine_133.setAuxiliary(True) @@ -912,7 +915,7 @@ SketchConstraintCoincidence_123 = Sketch_7.setCoincident(SketchLine_126.endPoint SketchConstraintCoincidence_123.setName("SketchConstraintCoincidence_130") SketchConstraintCoincidence_124 = Sketch_7.setCoincident(SketchLine_133.startPoint(), SketchLine_131.result()) SketchConstraintCoincidence_124.setName("SketchConstraintCoincidence_131") -SketchArc_60 = Sketch_7.addArc(-152.3, -43.54999053274783, -152.2999985784279, -45.04999053274759, -150.8, -43.54999111476925, False) +SketchArc_60 = Sketch_7.addArc(-152.3, -43.55, -152.3, -45.05, -150.8, -43.55, False) SketchArc_60.setName("SketchArc_61") SketchArc_60.result().setName("SketchArc_61") SketchArc_60.results()[1].setName("SketchArc_61_2") diff --git a/test.models/flange.py b/test.models/flange.py index e3f64e294..bf7d9362d 100644 --- a/test.models/flange.py +++ b/test.models/flange.py @@ -110,7 +110,7 @@ SketchLine_16.setName("SketchLine_17") SketchLine_16.result().setName("SketchLine_17") SketchConstraintCoincidence_22 = Sketch_3.setCoincident(SketchArc_10.endPoint(), SketchLine_16.result()) model.do() -Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_3/Wire-SketchLine_12f-SketchLine_13f-SketchLine_17r-SketchLine_18r-SketchArc_10_2f")], model.selection(), "172/2", "172/2") +Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_3/Wire-SketchLine_12f-SketchLine_13f-SketchArc_10_2f-SketchLine_17r-SketchLine_18r")], model.selection(), "172/2", "172/2") Cut_2 = model.addCut(Part_1_doc, [model.selection("SOLID", "Cut_1_1")], [model.selection("SOLID", "Extrusion_2_1")]) Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_1_1/Generated_Face_10")) SketchLine_18 = Sketch_4.addLine(-65, 16, -65, -16) diff --git a/test.models/gear.py b/test.models/gear.py index 4c042e49a..217e25a83 100644 --- a/test.models/gear.py +++ b/test.models/gear.py @@ -46,7 +46,6 @@ SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_4.result()) SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_3.result()) SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_5.result()) -SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_8.result()) SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_6.result()) SketchConstraintDistance_1 = Sketch_1.setDistance(SketchLine_1.endPoint(), SketchLine_8.result(), 30) SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_3.result(), 37.5) diff --git a/test.models/idler_plate.py b/test.models/idler_plate.py index 2b08107f3..c00585ba7 100644 --- a/test.models/idler_plate.py +++ b/test.models/idler_plate.py @@ -151,12 +151,12 @@ SketchConstraintHorizontal_4 = Sketch_2.setHorizontal(SketchLine_8.result()) SketchConstraintHorizontal_5 = Sketch_2.setHorizontal(SketchLine_9.result()) SketchConstraintTangent_15 = Sketch_2.setTangent(SketchLine_8.result(), SketchArc_17.results()[1]) SketchConstraintTangent_16 = Sketch_2.setTangent(SketchArc_17.results()[1], SketchLine_9.result()) -SketchPoint_4 = Sketch_2.addPoint(model.selection("VERTEX", "Sketch_1/Vertex-SketchCircle_2-SketchArc_9")) +SketchPoint_4 = Sketch_2.addPoint(model.selection("VERTEX", "Sketch_1/Edge-SketchCircle_2_2__cc")) SketchCircle_3 = Sketch_2.addCircle(-7.5, 18.75, 8.125) SketchConstraintCoincidence_48 = Sketch_2.setCoincident(SketchPoint_4.result(), SketchCircle_3.center()) SketchArc_19 = Sketch_2.addArc(model.selection("EDGE", "Sketch_1/Edge-SketchArc_9_2")) SketchConstraintEqual_1 = Sketch_2.setEqual(SketchCircle_3.results()[1], SketchArc_19.results()[1]) -SketchPoint_5 = Sketch_2.addPoint(model.selection("VERTEX", "Sketch_1/Vertex-SketchArc_1-SketchArc_3-SketchArc_4-SketchCircle_1-SketchArc_11-SketchArc_14-SketchLine_1s-SketchLine_2s-SketchLine_5s")) +SketchPoint_5 = Sketch_2.addPoint(model.selection("VERTEX", "Sketch_1/Edge-SketchCircle_1_2__cc")) SketchCircle_4 = Sketch_2.addCircle(0, 0, 8.75) SketchConstraintCoincidence_49 = Sketch_2.setCoincident(SketchPoint_5.result(), SketchCircle_4.center()) SketchConstraintRadius_12 = Sketch_2.setRadius(SketchCircle_4.results()[1], "17.5/2") diff --git a/test.models/piece_02.py b/test.models/piece_02.py index 6c10f5b7f..95025acd1 100644 --- a/test.models/piece_02.py +++ b/test.models/piece_02.py @@ -220,8 +220,6 @@ SketchLine_25.setName("SketchLine_26") SketchLine_25.result().setName("SketchLine_26") SketchConstraintCoincidence_38 = Sketch_4.setCoincident(SketchLine_25.startPoint(), SketchLine_19.result()) SketchConstraintCoincidence_38.setName("SketchConstraintCoincidence_39") -SketchConstraintCoincidence_39 = Sketch_4.setCoincident(SketchLine_25.endPoint(), SketchLine_19.result()) -SketchConstraintCoincidence_39.setName("SketchConstraintCoincidence_40") SketchLine_26 = Sketch_4.addLine(42, -33, 42, -43) SketchLine_26.setName("SketchLine_27") SketchLine_26.result().setName("SketchLine_27") @@ -262,8 +260,6 @@ SketchLine_27 = Sketch_4.addLine(0, -38, 42, -38) SketchLine_27.setName("SketchLine_28") SketchLine_27.result().setName("SketchLine_28") SketchLine_27.setAuxiliary(True) -SketchConstraintCoincidence_50 = Sketch_4.setCoincident(SketchLine_27.startPoint(), SketchLine_19.result()) -SketchConstraintCoincidence_50.setName("SketchConstraintCoincidence_51") SketchConstraintCoincidence_51 = Sketch_4.setCoincident(SketchLine_27.endPoint(), SketchLine_20.result()) SketchConstraintCoincidence_51.setName("SketchConstraintCoincidence_52") SketchConstraintMiddle_10 = Sketch_4.setMiddlePoint(SketchLine_27.endPoint(), SketchLine_20.result()) diff --git a/test.models/piece_09.py b/test.models/piece_09.py index b10608231..99e22b96c 100644 --- a/test.models/piece_09.py +++ b/test.models/piece_09.py @@ -135,8 +135,7 @@ SketchConstraintEqual_3 = Sketch_1.setEqual(SketchLine_1.result(), SketchLine_6. SketchConstraintEqual_4 = Sketch_1.setEqual(SketchArc_1.results()[1], SketchArc_4.results()[1]) SketchConstraintEqual_5 = Sketch_1.setEqual(SketchLine_3.result(), SketchLine_5.result()) SketchConstraintEqual_6 = Sketch_1.setEqual(SketchLine_9.result(), SketchLine_11.result()) -SketchConstraintEqual_7 = Sketch_1.setEqual(SketchArc_6.results()[1], SketchArc_7.results()[1]) -SketchConstraintEqual_8 = Sketch_1.setEqual(SketchLine_7.result(), SketchLine_13.result()) +SketchConstraintEqual_7 = Sketch_1.setEqual(SketchLine_7.result(), SketchLine_13.result()) SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_7.result(), "epaisseur*coeff") SketchConstraintDistance_1 = Sketch_1.setDistance(SketchArc_5.endPoint(), SketchLine_3.result(), "epaisseur*coeff") SketchConstraintDistance_2 = Sketch_1.setDistance(SketchArc_6.endPoint(), SketchLine_4.result(), "epaisseur*coeff") @@ -181,11 +180,9 @@ SketchConstraintCoincidence_34 = Sketch_2.setCoincident(SketchLine_21.endPoint() SketchConstraintTangent_20 = Sketch_2.setTangent(SketchLine_21.result(), SketchArc_12.results()[1]) SketchLine_22 = Sketch_2.addLine(-31.25, -32.50000000000001, -25.00000000000001, -32.50000000000001) SketchConstraintCoincidence_35 = Sketch_2.setCoincident(SketchArc_12.endPoint(), SketchLine_22.startPoint()) -#SketchConstraintCoincidence_36 = Sketch_2.setCoincident(SketchAPI_Line(SketchLine_15).startPoint(), SketchLine_22.endPoint()) SketchLine_23 = Sketch_2.addLine(-24.99999999999999, -35.00000000000001, -24.99999999999999, -32.50000000000002) -SketchConstraintCoincidence_37 = Sketch_2.setCoincident(SketchAPI_Line(SketchLine_14).endPoint(), SketchLine_23.startPoint()) -#SketchConstraintCoincidence_38 = Sketch_2.setCoincident(SketchAPI_Line(SketchLine_15).startPoint(), SketchLine_23.endPoint()) -SketchConstraintCoincidence_38 = Sketch_2.setCoincident(SketchLine_22.endPoint(), SketchLine_23.endPoint()) +SketchConstraintCoincidence_36 = Sketch_2.setCoincident(SketchAPI_Line(SketchLine_14).endPoint(), SketchLine_23.startPoint()) +SketchConstraintCoincidence_37 = Sketch_2.setCoincident(SketchLine_22.endPoint(), SketchLine_23.endPoint()) SketchConstraintHorizontal_5 = Sketch_2.setHorizontal(SketchLine_16.result()) SketchConstraintHorizontal_6 = Sketch_2.setHorizontal(SketchLine_22.result()) SketchConstraintHorizontal_7 = Sketch_2.setHorizontal(SketchLine_20.result()) @@ -204,21 +201,17 @@ SketchConstraintDistance_9 = Sketch_2.setDistance(SketchLine_21.endPoint(), Sket SketchConstraintDistance_10 = Sketch_2.setDistance(SketchArc_11.startPoint(), SketchLine_18.result(), "epaisseur*coeff") SketchConstraintCoincidence_39 = Sketch_2.setCoincident(SketchLine_16.startPoint(), SketchAPI_Line(SketchLine_14).endPoint()) SketchPoint_2 = Sketch_2.addPoint(model.selection("VERTEX", "PartSet/Origin")) -#SketchConstraintDistance_11 = Sketch_2.setDistance(SketchLine_16.result(), SketchPoint_2.coordinates(), "(h4-d_diff)*coeff") -SketchConstraintDistance_12 = Sketch_2.setDistance(SketchPoint_2.coordinates(), SketchLine_17.result(), "e3*coeff") -#SketchConstraintCoincidence_40 = Sketch_2.setCoincident(SketchLine_16.startPoint(), SketchLine_15.result()) +SketchConstraintDistance_11 = Sketch_2.setDistance(SketchPoint_2.coordinates(), SketchLine_17.result(), "e3*coeff", False) SketchConstraintRadius_3 = Sketch_2.setRadius(SketchArc_9.results()[1], "r2*coeff") SketchConstraintEqual_9 = Sketch_2.setEqual(SketchArc_9.results()[1], SketchArc_10.results()[1]) SketchConstraintEqual_10 = Sketch_2.setEqual(SketchArc_11.results()[1], SketchArc_12.results()[1]) SketchConstraintRadius_4 = Sketch_2.setRadius(SketchArc_12.results()[1], "r3*coeff") SketchConstraintDistance_13 = Sketch_2.setDistance(SketchArc_10.startPoint(), SketchLine_19.result(), "d8*coeff") -#SketchConstraintDistance_14 = Sketch_2.setDistance(SketchLine_17.startPoint(), SketchLine_23.result(), "(e3-epaisseur_plat)*coeff") model.do() Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_2/Wire-SketchLine_16r-SketchArc_9_2f-SketchLine_17r-SketchArc_10_2f-SketchLine_18r-SketchLine_19r-SketchLine_20r-SketchArc_11_2r-SketchLine_21r-SketchArc_12_2r-SketchLine_22r-SketchLine_23f")], model.selection(), "d6*coeff", 0) Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_2_1/Generated_Face_3")) SketchLine_24 = Sketch_3.addLine(46.25, 22.91561885925604, 51.3, 20.00000000000001) SketchLine_25 = Sketch_3.addLine(model.selection("EDGE", "Extrusion_2_1/Generated_Face_3&Extrusion_2_1/To_Face_1")) -#SketchConstraintCoincidence_41 = Sketch_3.setCoincident(SketchLine_24.startPoint(), SketchLine_25.result()) SketchLine_26 = Sketch_3.addLine(51.3, 20.00000000000001, 62.50000000000001, 20.00000000000001) SketchConstraintCoincidence_42 = Sketch_3.setCoincident(SketchLine_24.endPoint(), SketchLine_26.startPoint()) SketchLine_27 = Sketch_3.addLine(62.50000000000001, 20.00000000000001, 62.5, -4.999999999999999) diff --git a/test.models/piece_12.py b/test.models/piece_12.py index 391436d04..05c3b5107 100644 --- a/test.models/piece_12.py +++ b/test.models/piece_12.py @@ -462,7 +462,6 @@ SketchConstraintVertical_6 = Sketch_4.setVertical(SketchLine_31.result()) SketchConstraintVertical_6.setName("SketchConstraintVertical_3") SketchConstraintVertical_7 = Sketch_4.setVertical(SketchLine_32.result()) SketchConstraintVertical_7.setName("SketchConstraintVertical_4") -SketchConstraintHorizontal_9 = Sketch_4.setHorizontal(SketchLine_30.result()) SketchConstraintEqual_7 = Sketch_4.setEqual(SketchLine_31.result(), SketchLine_32.result()) SketchConstraintEqual_7.setName("SketchConstraintEqual_5") SketchConstraintMiddle_4 = Sketch_4.setMiddlePoint(SketchLine_30.result(), SketchAPI_Line(SketchLine_29).startPoint()) @@ -518,10 +517,10 @@ SketchConstraintLength_10 = Sketch_4.setLength(SketchLine_36.result(), 12.975642 SketchConstraintLength_10.setName("SketchConstraintLength_7") model.do() Extrusion_4 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_4/Wire-SketchLine_19f-SketchLine_20f-SketchLine_24f-SketchLine_21f-SketchLine_22f-SketchLine_23f")], model.selection(), model.selection("FACE", "Extrusion_1_1/Generated_Face_1"), 0, model.selection(), 0) -Smash_2 = model.addSmash(Part_1_doc, [model.selection("SOLID", "ExtrusionCut_6_1_1"), model.selection("SOLID", "Extrusion_4_1")], [model.selection("SOLID", "ExtrusionCut_6_1_2")]) -ExtrusionCut_7 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_4/Face-SketchCircle_9_2f")], model.selection(), 0, 10, [model.selection("SOLID", "Smash_2_1_1")]) +Smash_2 = model.addSmash(Part_1_doc, [model.selection("SOLID", "Extrusion_4_1")], [model.selection("COMPSOLID", "ExtrusionCut_6_1")]) +ExtrusionCut_7 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_4/Face-SketchCircle_9_2f")], model.selection(), 0, 10, [model.selection("SOLID", "Smash_2_1_3")]) ExtrusionCut_8 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_4/Face-SketchCircle_9_2f")], model.selection(), 0, 10, [model.selection("SOLID", "ExtrusionCut_7_1_1")]) -Sketch_5 = model.addSketch(Part_1_doc, model.selection("FACE", "Smash_2_1_1/Modified_Face_1")) +Sketch_5 = model.addSketch(Part_1_doc, model.selection("FACE", "Smash_2_1_3/Modified_Face_1")) SketchPoint_3 = Sketch_5.addPoint(model.selection("VERTEX", "PartSet/Origin")) SketchPoint_3.setName("SketchPoint_2") SketchPoint_3.result().setName("SketchPoint_2") @@ -780,6 +779,8 @@ Parameter_Epaisseur.setValue(33.9) model.do() model.testResultsVolumes(Part_1, [118105.9369682]) Parameter_Epaisseur.setValue(34) +model.do() +model.testResultsVolumes(Part_1, [118190.673218984]) model.end() assert(model.checkPythonDump()) diff --git a/test.models/sprocket.py b/test.models/sprocket.py index 54c2d8442..30c174ab2 100644 --- a/test.models/sprocket.py +++ b/test.models/sprocket.py @@ -233,7 +233,6 @@ M_REF_DATA = [(1.5, 14094.989002197671652538701891899), for m in M_REF_DATA: Param_m.setValue(m[0]) model.do() - model.generateTests(Boolean_1, "Boolean_1") model.testNbResults(Boolean_1, 1) model.testNbSubResults(Boolean_1, [0]) diff --git a/test.models/wheel_rim.py b/test.models/wheel_rim.py index 9bc2cb9d1..fc8455017 100644 --- a/test.models/wheel_rim.py +++ b/test.models/wheel_rim.py @@ -264,6 +264,6 @@ model.testNbSubShapes(Boolean_1, GeomAPI_Shape.SOLID, [1]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.FACE, [35]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.EDGE, [162]) model.testNbSubShapes(Boolean_1, GeomAPI_Shape.VERTEX, [324]) -model.testResultsVolumes(Boolean_1, [2053931.913933836854994297027587891]) +model.testResultsVolumes(Boolean_1, [2053931.558882251149043440818786621]) assert(model.checkPythonDump())