From: azv Date: Tue, 6 Nov 2018 15:33:57 +0000 (+0300) Subject: Update "big" models X-Git-Tag: End2018~189 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a714178facdc56d6be46e97ea3986a30d169a915;p=modules%2Fshaper.git Update "big" models --- diff --git a/test.models/CSWA.py b/test.models/CSWA.py index 62d919fa8..2885ff6c2 100644 --- a/test.models/CSWA.py +++ b/test.models/CSWA.py @@ -127,8 +127,8 @@ SketchConstraintCoincidence_23 = Sketch_3.setCoincident(SketchArc_3.results()[1] SketchConstraintCoincidence_23.setName("SketchConstraintCoincidence_24") model.do() ExtrusionFuse_1 = model.addExtrusionFuse(Part_1_doc, [model.selection("FACE", "Sketch_3/Face-SketchArc_3_2f-SketchLine_12f-SketchArc_5_2r")], model.selection(), 5, 0, [model.selection("SOLID", "ExtrusionCut_1_1")]) -Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "ExtrusionFuse_1_1/To_Face")) -SketchPoint_4 = Sketch_4.addPoint(model.selection("VERTEX", "[(ExtrusionFuse_1_1/Modified_Face&Sketch_1/SketchArc_1_2)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_3_2)(ExtrusionFuse_1_1/To_Face)][(ExtrusionFuse_1_1/Modified_Face&Sketch_1/SketchLine_9)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_3_2)(ExtrusionFuse_1_1/To_Face)][ExtrusionFuse_1_1/To_Face]")) +Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_5_2)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchLine_12)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_3_2)")) +SketchPoint_4 = Sketch_4.addPoint(model.selection("VERTEX", "[ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_5_2][ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchLine_12][(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_5_2)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchLine_12)(ExtrusionFuse_1_1/Generated_Face&Sketch_3/SketchArc_3_2)]")) SketchCircle_2 = Sketch_4.addCircle(-15, 35.00000000000001, 5) SketchConstraintCoincidence_24 = Sketch_4.setCoincident(SketchPoint_4.result(), SketchCircle_2.center()) SketchConstraintCoincidence_24.setName("SketchConstraintCoincidence_25") @@ -140,7 +140,7 @@ SketchArc_6 = Sketch_5.addArc(model.selection("EDGE", "[ExtrusionCut_1_1/Modifie SketchArc_7 = Sketch_5.addArc(-45, 35, -45, 5, -25.41666666666737, 12.27351642784166, False) SketchConstraintCoincidence_25 = Sketch_5.setCoincident(SketchArc_6.result(), SketchArc_7.center()) SketchConstraintCoincidence_25.setName("SketchConstraintCoincidence_26") -SketchCircle_3 = Sketch_5.addCircle(model.selection("EDGE", "[(ExtrusionFuse_2_1/Modified_Face&ExtrusionFuse_1_1/To_Face)(ExtrusionFuse_2_1/To_Face)][ExtrusionFuse_2_1/To_Face]")) +SketchCircle_3 = Sketch_5.addCircle(model.selection("EDGE", "[ExtrusionFuse_2_1/Generated_Face&Sketch_4/SketchCircle_2_2][_weak_name_6_ExtrusionFuse_2_1]")) SketchArc_8 = Sketch_5.addArc(-15, 35.00000000000001, -25.41666666666737, 12.27351642784166, -30.00000000000075, 14.99999999999944, True) SketchConstraintCoincidence_26 = Sketch_5.setCoincident(SketchCircle_3.result(), SketchArc_8.center()) SketchConstraintCoincidence_26.setName("SketchConstraintCoincidence_27") @@ -194,14 +194,14 @@ SketchConstraintCoincidence_41 = Sketch_6.setCoincident(SketchLine_14.endPoint() SketchConstraintCoincidence_41.setName("SketchConstraintCoincidence_42") model.do() ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("WIRE", "Sketch_6/Face-SketchArc_10_2f-SketchLine_18f-SketchLine_19r-SketchLine_16r_wire")], 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")) +Sketch_7 = model.addSketch(Part_1_doc, model.selection("FACE", "_weak_name_30_ExtrusionCut_2_1")) SketchCircle_4 = Sketch_7.addCircle(45, -35, 5) -SketchLine_20 = Sketch_7.addLine(model.selection("EDGE", "[ExtrusionCut_2_1/Modified_Face&Sketch_1/SketchLine_5][ExtrusionCut_2_1/From_Face]")) +SketchLine_20 = Sketch_7.addLine(model.selection("EDGE", "[ExtrusionCut_2_1/Modified_Face&Sketch_1/SketchLine_5][_weak_name_30_ExtrusionCut_2_1]")) SketchConstraintDistance_9 = Sketch_7.setDistance(SketchCircle_4.center(), SketchLine_20.result(), 10, False) SketchConstraintRadius_6 = Sketch_7.setRadius(SketchCircle_4.results()[1], "10/2") 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&Sketch_6/SketchLine_16][ExtrusionCut_2_1/Generated_Face&Sketch_6/SketchArc_10_2][ExtrusionCut_2_1/From_Face]")) +SketchPoint_5 = Sketch_7.addPoint(model.selection("VERTEX", "[ExtrusionCut_2_1/Generated_Face&Sketch_6/SketchLine_16][ExtrusionCut_2_1/Generated_Face&Sketch_6/SketchArc_10_2][_weak_name_30_ExtrusionCut_2_1]")) SketchConstraintCoincidence_42 = Sketch_7.setCoincident(SketchLine_21.startPoint(), SketchPoint_5.result()) SketchConstraintCoincidence_42.setName("SketchConstraintCoincidence_43") SketchConstraintCoincidence_43 = Sketch_7.setCoincident(SketchCircle_4.center(), SketchLine_21.endPoint()) diff --git a/test.models/case24.py b/test.models/case24.py index 6dca168c2..1a79ffb34 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -175,7 +175,7 @@ SketchConstraintParallel_1 = Sketch_3.setParallel(SketchLine_17.result(), Sketch SketchConstraintDistance_7 = Sketch_3.setDistance(SketchLine_21.startPoint(), SketchLine_18.result(), 3) model.do() RevolutionFuse_1 = model.addRevolutionFuse(Part_1_doc, [model.selection("COMPOUND", "Sketch_3")], model.selection("EDGE", "Sketch_3/SketchLine_21"), 71, 0, [model.selection("SOLID", "ExtrusionFuse_2_1")]) -Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "RevolutionFuse_1_1/Modified_Face&weak_name_1")) +Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "(RevolutionFuse_1_1/Modified_Face&Sketch_1/SketchLine_1)(ExtrusionFuse_1_1/Generated_Face&Sketch_1/SketchLine_8)(ExtrusionFuse_1_1/Generated_Face&Sketch_1/SketchArc_1_2)(RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_16)(RevolutionFuse_1_1/Modified_Face&Sketch_1/SketchLine_7)")) SketchLine_22 = Sketch_4.addLine(-3, -20, 17, -20) SketchLine_22.setName("SketchLine_26") SketchLine_22.result().setName("SketchLine_26") diff --git a/test.models/gear.py b/test.models/gear.py index a34b6744b..3b0a64de9 100644 --- a/test.models/gear.py +++ b/test.models/gear.py @@ -163,7 +163,7 @@ SketchConstraintLength_9 = Sketch_3.setLength(SketchLine_84.result(), "2*R_fille SketchConstraintLength_10 = Sketch_3.setLength(SketchLine_83.result(), "2*R_fillet") model.do() Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("COMPOUND", "PartSet/Sketch_1")], model.selection("EDGE", "PartSet/Sketch_1/SketchLine_1"), 360, 0) -Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "_weak_name_1_Revolution_1_1")) +Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "Revolution_1_1/Generated_Face&PartSet/Sketch_1/SketchLine_8")) SketchPoint_4 = Sketch_4.addPoint(model.selection("VERTEX", "PartSet/Origin")) SketchLine_86 = Sketch_4.addLine(0, -13.49999999999519, 3.1, -13.49999999999519) SketchLine_87 = Sketch_4.addLine(model.selection("EDGE", "PartSet/OZ")) @@ -195,7 +195,7 @@ SketchConstraintCoincidence_61 = Sketch_4.setCoincident(SketchPoint_6.coordinate SketchConstraintCoincidence_62 = Sketch_4.setCoincident(SketchPoint_6.coordinates(), SketchLine_89.result()) SketchConstraintDistance_6 = Sketch_4.setDistance(SketchPoint_6.coordinates(), SketchLine_86.result(), 24.5) model.do() -ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection(), model.selection("FACE", "_weak_name_5_Revolution_1_1"), 0, model.selection(), 0, [model.selection("SOLID", "Revolution_1_1")]) +ExtrusionCut_1 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_1")], model.selection(), model.selection("FACE", "Revolution_1_1/Generated_Face&PartSet/Sketch_1/SketchLine_3"), 0, model.selection(), 0, [model.selection("SOLID", "Revolution_1_1")]) RevolutionCut_1 = model.addRevolutionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_2")], model.selection("EDGE", "PartSet/OX"), 0, 360, [model.selection("SOLID", "ExtrusionCut_1_1")]) ExtrusionCut_2 = model.addExtrusionCut(Part_1_doc, [model.selection("COMPOUND", "Sketch_3")], model.selection(), 0, 5, [model.selection("SOLID", "RevolutionCut_1_1")]) model.do() diff --git a/test.models/plug.py b/test.models/plug.py index 869bf4d9d..8915f5316 100644 --- a/test.models/plug.py +++ b/test.models/plug.py @@ -437,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&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_3)(Plug/Modified_Face&Sketch_1/SketchLine_29)(Plug/Modified_Face&Sketch_1/SketchLine_30)(Plug/Modified_Face&Sketch_1/SketchLine_31)(Plug/Modified_Face&Sketch_1/SketchLine_33)(Plug/Modified_Face&Sketch_1/SketchLine_34)(Plug/Modified_Face&Sketch_1/SketchLine_1)(Plug/Modified_Face&Sketch_1/SketchLine_2)(Plug/Modified_Face&Sketch_1/SketchLine_32)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchLine_10)(Plug/Modified_Face&Sketch_1/SketchLine_9)(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_7)(Plug/Modified_Face&Sketch_1/SketchLine_8)(Plug/Modified_Face&Sketch_1/SketchLine_11)(Plug/Modified_Face&Sketch_1/SketchLine_12)(Plug/Modified_Face&Sketch_1/SketchLine_13)(Plug/Modified_Face&Sketch_1/SketchLine_14)(Plug/Modified_Face&Sketch_1/SketchLine_15)(Plug/Modified_Face&Sketch_1/SketchLine_16)(Plug/Modified_Face&Sketch_1/SketchLine_17)(Plug/Modified_Face&Sketch_1/SketchLine_18)(Plug/Modified_Face&Sketch_1/SketchLine_19)(Plug/Modified_Face&Sketch_1/SketchLine_20)(Plug/Modified_Face&Sketch_1/SketchLine_6)(Plug/Modified_Face&Sketch_1/SketchLine_5)(Plug/Modified_Face&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_27)(Plug/Modified_Face&Sketch_1/SketchLine_26)(Plug/Modified_Face&Sketch_1/SketchLine_25)(Plug/Modified_Face&Sketch_1/SketchLine_24)(Plug/Modified_Face&Sketch_1/SketchLine_23)(Plug/Modified_Face&Sketch_1/SketchLine_22)(Plug/Modified_Face&Sketch_1/SketchLine_21)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_4/SketchLine_58)(Plug/Modified_Face&Sketch_4/SketchArc_2_2)(Plug/Modified_Face&Sketch_1/SketchLine_6)(Plug/Modified_Face&Sketch_1/SketchLine_5)(Plug/Modified_Face&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_27)(Plug/Modified_Face&Sketch_1/SketchLine_26)(Plug/Modified_Face&Sketch_1/SketchLine_25)(Plug/Modified_Face&Sketch_1/SketchLine_24)(Plug/Modified_Face&Sketch_1/SketchLine_23)(Plug/Modified_Face&Sketch_1/SketchLine_22)(Plug/Modified_Face&Sketch_1/SketchLine_21)(Plug/Modified_Face&Sketch_1/SketchLine_3)(Plug/Modified_Face&Sketch_1/SketchLine_29)(Plug/Modified_Face&Sketch_1/SketchLine_30)(Plug/Modified_Face&Sketch_1/SketchLine_31)(Plug/Modified_Face&Sketch_1/SketchLine_33)(Plug/Modified_Face&Sketch_1/SketchLine_34)(Plug/Modified_Face&Sketch_1/SketchLine_1)(Plug/Modified_Face&Sketch_1/SketchLine_2)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchLine_10)(Plug/Modified_Face&Sketch_1/SketchLine_9)(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_7)(Plug/Modified_Face&Sketch_1/SketchLine_8)(Plug/Modified_Face&Sketch_1/SketchLine_11)(Plug/Modified_Face&Sketch_1/SketchLine_12)(Plug/Modified_Face&Sketch_1/SketchLine_13)(Plug/Modified_Face&Sketch_1/SketchLine_14)(Plug/Modified_Face&Sketch_1/SketchLine_15)(Plug/Modified_Face&Sketch_1/SketchLine_16)(Plug/Modified_Face&Sketch_1/SketchLine_17)(Plug/Modified_Face&Sketch_1/SketchLine_18)(Plug/Modified_Face&Sketch_1/SketchLine_19)(Plug/Modified_Face&Sketch_1/SketchLine_20)(Plug/Modified_Face&Sketch_4/SketchLine_58)(Plug/Modified_Face&Sketch_4/SketchArc_2_2)")]) +Group_1 = model.addGroup(Part_1_doc, [model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_2/SketchCircle_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_3)(Plug/Modified_Face&Sketch_1/SketchLine_29)(Plug/Modified_Face&Sketch_1/SketchLine_30)(Plug/Modified_Face&Sketch_1/SketchLine_31)(Plug/Modified_Face&Sketch_1/SketchLine_33)(Plug/Modified_Face&Sketch_1/SketchLine_34)(Plug/Modified_Face&Sketch_1/SketchLine_1)(Plug/Modified_Face&Sketch_1/SketchLine_2)(Plug/Modified_Face&Sketch_1/SketchLine_32)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchLine_10)(Plug/Modified_Face&Sketch_1/SketchLine_9)(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_7)(Plug/Modified_Face&Sketch_5/SketchLine_64)(Plug/Modified_Face&Sketch_1/SketchLine_8)(Plug/Modified_Face&Sketch_1/SketchLine_11)(Plug/Modified_Face&Sketch_1/SketchLine_12)(Plug/Modified_Face&Sketch_1/SketchLine_13)(Plug/Modified_Face&Sketch_1/SketchLine_14)(Plug/Modified_Face&Sketch_1/SketchLine_15)(Plug/Modified_Face&Sketch_1/SketchLine_16)(Plug/Modified_Face&Sketch_1/SketchLine_17)(Plug/Modified_Face&Sketch_1/SketchLine_18)(Plug/Modified_Face&Sketch_1/SketchLine_19)(Plug/Modified_Face&Sketch_1/SketchLine_20)(Plug/Modified_Face&Sketch_1/SketchLine_6)(Plug/Modified_Face&Sketch_1/SketchLine_5)(Plug/Modified_Face&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_2/SketchCircle_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_27)(Plug/Modified_Face&Sketch_1/SketchLine_26)(Plug/Modified_Face&Sketch_1/SketchLine_25)(Plug/Modified_Face&Sketch_1/SketchLine_24)(Plug/Modified_Face&Sketch_1/SketchLine_23)(Plug/Modified_Face&Sketch_1/SketchLine_22)(Plug/Modified_Face&Sketch_1/SketchLine_21)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_4/SketchLine_57)(Plug/Modified_Face&Sketch_4/SketchLine_58)(Plug/Modified_Face&Sketch_4/SketchArc_2_2)(Plug/Modified_Face&Sketch_4/SketchLine_55)(Plug/Modified_Face&Sketch_1/SketchLine_6)(Plug/Modified_Face&Sketch_1/SketchLine_5)(Plug/Modified_Face&Sketch_1/SketchLine_4)(Plug/Modified_Face&Sketch_1/SketchLine_28)(Plug/Modified_Face&Sketch_1/SketchLine_27)(Plug/Modified_Face&Sketch_1/SketchLine_26)(Plug/Modified_Face&Sketch_1/SketchLine_25)(Plug/Modified_Face&Sketch_1/SketchLine_24)(Plug/Modified_Face&Sketch_1/SketchLine_23)(Plug/Modified_Face&Sketch_1/SketchLine_22)(Plug/Modified_Face&Sketch_1/SketchLine_21)(Plug/Modified_Face&Sketch_1/SketchLine_3)(Plug/Modified_Face&Sketch_1/SketchLine_29)(Plug/Modified_Face&Sketch_1/SketchLine_30)(Plug/Modified_Face&Sketch_1/SketchLine_31)(Plug/Modified_Face&Sketch_3/SketchLine_42)(Plug/Modified_Face&Sketch_3/SketchLine_41)(Plug/Modified_Face&Sketch_3/SketchLine_40)(Plug/Modified_Face&Sketch_1/SketchLine_33)(Plug/Modified_Face&Sketch_1/SketchLine_34)(Plug/Modified_Face&Sketch_1/SketchLine_1)(Plug/Modified_Face&Sketch_1/SketchLine_2)"), model.selection("FACE", "(Plug/Modified_Face&Sketch_1/SketchLine_10)(Plug/Modified_Face&Sketch_1/SketchLine_9)(Plug/Modified_Face&Sketch_1/SketchArc_1_2)(Plug/Modified_Face&Sketch_1/SketchLine_7)(Plug/Modified_Face&Sketch_5/SketchLine_64)(Plug/Modified_Face&Sketch_1/SketchLine_8)(Plug/Modified_Face&Sketch_1/SketchLine_11)(Plug/Modified_Face&Sketch_1/SketchLine_12)(Plug/Modified_Face&Sketch_1/SketchLine_13)(Plug/Modified_Face&Sketch_1/SketchLine_14)(Plug/Modified_Face&Sketch_1/SketchLine_15)(Plug/Modified_Face&Sketch_1/SketchLine_16)(Plug/Modified_Face&Sketch_1/SketchLine_17)(Plug/Modified_Face&Sketch_1/SketchLine_18)(Plug/Modified_Face&Sketch_1/SketchLine_19)(Plug/Modified_Face&Sketch_1/SketchLine_20)(Plug/Modified_Face&Sketch_4/SketchLine_57)(Plug/Modified_Face&Sketch_4/SketchLine_58)(Plug/Modified_Face&Sketch_4/SketchArc_2_2)(Plug/Modified_Face&Sketch_4/SketchLine_55)")]) Group_1.result().setColor(68, 68, 68) # check Group_1 model.checkGroup(Group_1, GeomAPI_Shape.FACE)