X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test.models%2Fangle30.py;h=2873a942a0a350905f1ddf3af0d198ce14a47910;hb=99ec31c777055dab5411d31bb490fee1935f31ce;hp=08f4d7b42b603e47de93a7cc4ac96878dfa18f0d;hpb=2f9cc8a307aeb75f6ee8c2c5c97f90acd5f3d53e;p=modules%2Fshaper.git diff --git a/test.models/angle30.py b/test.models/angle30.py index 08f4d7b42..2873a942a 100644 --- a/test.models/angle30.py +++ b/test.models/angle30.py @@ -492,18 +492,18 @@ Boolean_4 = model.addFuse(Part_1_doc, [model.selection("SOLID", "Boolean_1_1")], Boolean_5 = model.addFuse(Part_1_doc, [model.selection("SOLID", "Boolean_4_1")], [model.selection("SOLID", "Extrusion_7_1")]) Boolean_6 = model.addCut(Part_1_doc, [model.selection("SOLID", "Boolean_5_1")], [model.selection("SOLID", "Boolean_3_1")]) Extrusion_8 = model.addExtrusion(Part_1_doc, [model.selection("WIRE", "Sketch_1/Wire-SketchLine_10r-SketchLine_11r-SketchLine_8r-SketchLine_3r-SketchLine_9r-SketchLine_6r-SketchArc_1_2r-SketchArc_2_2f")], model.selection(), 55, 55) -Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_8_1/Generated_Face_7")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_8_1/Generated_Face_1")) SketchLine_54 = Sketch_7.addLine(55, -9.237604307034024, 55, -60) SketchLine_54.setName("SketchLine_66") SketchLine_54.result().setName("SketchLine_66") -SketchPoint_6 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_7&Extrusion_8_1/Generated_Face_6&Extrusion_8_1/To_Face_1")) +SketchPoint_6 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_2&Extrusion_8_1/Generated_Face_1&Extrusion_8_1/To_Face_1")) SketchLine_55 = Sketch_7.addLine(55, -9.237604307034024, 55, -70) SketchLine_55.setName("SketchLine_57") SketchLine_55.result().setName("SketchLine_57") SketchLine_55.setAuxiliary(True) SketchConstraintCoincidence_91 = Sketch_7.setCoincident(SketchLine_55.startPoint(), SketchPoint_6.result()) SketchConstraintCoincidence_91.setName("SketchConstraintCoincidence_95") -SketchPoint_7 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_8&Extrusion_8_1/Generated_Face_7&Extrusion_8_1/To_Face_1")) +SketchPoint_7 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_8&Extrusion_8_1/Generated_Face_1&Extrusion_8_1/To_Face_1")) SketchConstraintCoincidence_92 = Sketch_7.setCoincident(SketchLine_55.endPoint(), SketchPoint_7.result()) SketchConstraintCoincidence_92.setName("SketchConstraintCoincidence_96") SketchLine_56 = Sketch_7.addLine(45.00000000000001, -70, -45.00000000000001, -70) @@ -515,7 +515,7 @@ SketchLine_57.result().setName("SketchLine_58") SketchLine_57.setAuxiliary(True) SketchConstraintCoincidence_93 = Sketch_7.setCoincident(SketchLine_55.endPoint(), SketchLine_57.startPoint()) SketchConstraintCoincidence_93.setName("SketchConstraintCoincidence_97") -SketchPoint_8 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_8&Extrusion_8_1/Generated_Face_7&Extrusion_8_1/From_Face_1")) +SketchPoint_8 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_8&Extrusion_8_1/Generated_Face_1&Extrusion_8_1/From_Face_1")) SketchConstraintCoincidence_94 = Sketch_7.setCoincident(SketchLine_57.endPoint(), SketchPoint_8.result()) SketchConstraintCoincidence_94.setName("SketchConstraintCoincidence_98") SketchLine_58 = Sketch_7.addLine(-55.00000000000001, -59.99999999999999, -55, -9.237604307034024) @@ -525,7 +525,7 @@ SketchLine_59 = Sketch_7.addLine(-55, -70, -55, -9.237604307034024) SketchLine_59.setAuxiliary(True) SketchConstraintCoincidence_95 = Sketch_7.setCoincident(SketchLine_57.endPoint(), SketchLine_59.startPoint()) SketchConstraintCoincidence_95.setName("SketchConstraintCoincidence_99") -SketchPoint_9 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_7&Extrusion_8_1/Generated_Face_6&Extrusion_8_1/From_Face_1")) +SketchPoint_9 = Sketch_7.addPoint(model.selection("VERTEX", "Extrusion_8_1/Generated_Face_2&Extrusion_8_1/Generated_Face_1&Extrusion_8_1/From_Face_1")) SketchConstraintCoincidence_96 = Sketch_7.setCoincident(SketchLine_59.endPoint(), SketchPoint_9.result()) SketchConstraintCoincidence_96.setName("SketchConstraintCoincidence_100") SketchLine_60 = Sketch_7.addLine(-55, -9.237604307034024, -61.32702426187202, -9.237604307034024) @@ -605,7 +605,7 @@ SketchConstraintRadius_15 = Sketch_7.setRadius(SketchCircle_6.results()[1], 5) SketchCircle_7 = Sketch_7.addCircle(-44, -20.23760430703402, 5) SketchConstraintRadius_16 = Sketch_7.setRadius(SketchCircle_7.results()[1], 5) SketchConstraintDistance_31 = Sketch_7.setDistance(SketchCircle_6.center(), SketchLine_54.result(), 11) -SketchLine_66 = Sketch_7.addLine(model.selection("EDGE", "Extrusion_8_1/Generated_Face_7&Extrusion_8_1/Generated_Face_6")) +SketchLine_66 = Sketch_7.addLine(model.selection("EDGE", "Extrusion_8_1/Generated_Face_2&Extrusion_8_1/Generated_Face_1")) SketchLine_66.setName("SketchLine_69") SketchLine_66.result().setName("SketchLine_69") SketchConstraintDistance_32 = Sketch_7.setDistance(SketchCircle_6.center(), SketchLine_66.result(), 11) @@ -613,18 +613,18 @@ SketchConstraintDistance_33 = Sketch_7.setDistance(SketchCircle_7.center(), Sket SketchConstraintDistance_34 = Sketch_7.setDistance(SketchCircle_7.center(), SketchLine_66.result(), 11) model.do() ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_7/Wire-SketchLine_66f-SketchLine_67f-SketchLine_68f-SketchLine_60f-SketchLine_61f-SketchLine_62f-SketchLine_63f-SketchLine_64f-SketchArc_14_2r-SketchArc_15_2r"), model.selection("FACE", "Sketch_7/Face-SketchCircle_4_2f"), model.selection("FACE", "Sketch_7/Face-SketchCircle_5_2f"), model.selection("FACE", "Sketch_7/Face-SketchCircle_7_2f"), model.selection("FACE", "Sketch_7/Face-SketchCircle_6_2f")], model.selection(), 0, 10, [model.selection("SOLID", "Extrusion_8_1")]) -Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_8_1/Generated_Face_5")) +Sketch_8 = model.addSketch(Part_1_doc, model.selection("FACE", "Extrusion_8_1/Generated_Face_3")) 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_6&ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_5")) +SketchPoint_10 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_4&ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_3")) 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", "ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_5&Extrusion_8_1/Generated_Face_4")) +SketchPoint_11 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_1&Extrusion_8_1/Generated_Face_3&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) @@ -636,7 +636,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_3&Extrusion_8_1/Generated_Face_5&Extrusion_8_1/Generated_Face_4")) +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")) 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) @@ -646,7 +646,7 @@ SketchLine_72 = Sketch_8.addLine(-55, 76.69872981077803, -55, -34.06366588218793 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_6&ExtrusionCut_1_1/Modfied_3&Extrusion_8_1/Generated_Face_5")) +SketchPoint_13 = Sketch_8.addPoint(model.selection("VERTEX", "ExtrusionCut_1_1/Modfied_4&ExtrusionCut_1_1/Modfied_2&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) @@ -756,9 +756,7 @@ SketchConstraintLength_3 = Sketch_8.setLength(SketchLine_75.result(), 170.764972 SketchConstraintLength_4 = Sketch_8.setLength(SketchLine_77.result(), 32.509756356351) SketchConstraintLength_5 = Sketch_8.setLength(SketchLine_76.result(), 126.065149813077) SketchConstraintDistance_43 = Sketch_8.setDistance(SketchArc_18.endPoint(), SketchLine_69.result(), 24.999999559068) -SketchConstraintDistance_43.setName("SketchConstraintDistance_44") SketchConstraintDistance_44 = Sketch_8.setDistance(SketchArc_18.startPoint(), SketchLine_69.result(), 25) -SketchConstraintDistance_44.setName("SketchConstraintDistance_45") model.do() ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("FACE", "Sketch_8/Face-SketchLine_79r-SketchLine_80r-SketchLine_81r-SketchLine_73r-SketchLine_74r-SketchLine_75r-SketchLine_76r-SketchLine_77r-SketchArc_16_2r-SketchArc_17_2r"), model.selection("WIRE", "Sketch_8/Wire-SketchCircle_8_2f"), model.selection("WIRE", "Sketch_8/Wire-SketchCircle_9_2f"), model.selection("WIRE", "Sketch_8/Wire-SketchArc_19_2f-SketchArc_18_2f-SketchLine_82f-SketchLine_83r")], model.selection(), 0, 10, [model.selection("SOLID", "ExtrusionCut_1_1")]) Boolean_7 = model.addFuse(Part_1_doc, [model.selection("SOLID", "Boolean_6_1")], [model.selection("SOLID", "ExtrusionCut_2_1")]) @@ -781,4 +779,4 @@ model.testNbSubShapes(Boolean_7, GeomAPI_Shape.EDGE, [266]) model.testNbSubShapes(Boolean_7, GeomAPI_Shape.VERTEX, [532]) model.testResultsVolumes(Boolean_7, [156999.209584889642428606748580933]) -assert(model.checkPythonDump) +assert(model.checkPythonDump())