X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=test.models%2Fcase24.py;h=bb6d23603471a41d4e73aeb94c4c33129519f44c;hb=60607122ae7077bba06bf15b14bd5cc2c4df9c6a;hp=3c003a303b5e66aaeca71923720462bb7cf83d68;hpb=d4b0a5cb916f4eccf4a0bce02e43a54c7a67cb93;p=modules%2Fshaper.git diff --git a/test.models/case24.py b/test.models/case24.py index 3c003a303..bb6d23603 100644 --- a/test.models/case24.py +++ b/test.models/case24.py @@ -1,22 +1,21 @@ -## Copyright (C) 2014-2017 CEA/DEN, EDF R&D -## -## This library is free software; you can redistribute it and/or -## modify it under the terms of the GNU Lesser General Public -## License as published by the Free Software Foundation; either -## version 2.1 of the License, or (at your option) any later version. -## -## This library is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -## Lesser General Public License for more details. -## -## You should have received a copy of the GNU Lesser General Public -## License along with this library; if not, write to the Free Software -## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -## -## See http:##www.salome-platform.org/ or -## email : webmaster.salome@opencascade.com -## +# Copyright (C) 2014-2020 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# from SketchAPI import * @@ -652,7 +651,7 @@ 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", "[RevolutionFuse_3_1/Modified_Face&Sketch_1/SketchLine_1&weak_name_2][RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8][RevolutionFuse_3_1/Modified_Face&Sketch_4/SketchLine_22&weak_name_2][RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27]")) +SketchPoint_4 = Sketch_10.addPoint(model.selection("VERTEX", "[(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)(ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)2(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchArc_1_2)2(RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27)2(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_2_1/From_Face)2_ExtrusionCut_2_1][RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8][(RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27)(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_2_1/From_Face)(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_3_1/Modified_Face&Sketch_4/SketchArc_4_2)2(ExtrusionCut_2_1/Modified_Face&Sketch_5/SketchLine_40)2][RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27]")) 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/SketchLine_1_StartVertex")) @@ -661,10 +660,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/Modified_Face&Sketch_2/SketchLine_9&weak_name_2][RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14][RevolutionFuse_3_1/Modified_Face&Sketch_3/SketchLine_15&weak_name_2][RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20]")) +SketchPoint_6 = Sketch_10.addPoint(model.selection("VERTEX", "[(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)(ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchArc_2_2)2(RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20)2(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face)2_ExtrusionCut_2_1][RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14][(RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20)(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face)(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)2(RevolutionFuse_3_1/Modified_Face&Sketch_3/SketchArc_3_2)2(ExtrusionCut_2_1/Modified_Face&Sketch_5/SketchLine_40)2][RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20]")) SketchConstraintCoincidence_124 = Sketch_10.setCoincident(SketchLine_78.startPoint(), SketchPoint_6.result()) SketchConstraintCoincidence_124.setName("SketchConstraintCoincidence_122") -SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "[ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_1&weak_name_2][ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8][RevolutionFuse_3_1/Modified_Face&Sketch_2/SketchLine_9&weak_name_2][RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14]")) +SketchPoint_7 = Sketch_10.addPoint(model.selection("VERTEX", "[(ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)(ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchArc_1_2)2(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)2(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2_ExtrusionCut_2_1][ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8][(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)(ExtrusionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchArc_2_2)2(RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20)2(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face)2_ExtrusionCut_2_1][RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14]")) SketchConstraintCoincidence_125 = Sketch_10.setCoincident(SketchLine_78.endPoint(), SketchPoint_7.result()) SketchConstraintCoincidence_125.setName("SketchConstraintCoincidence_123") SketchArc_10 = Sketch_10.addArc(89, 0, 89, -20, 89, 20, False) @@ -687,7 +686,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/Modified_Face&Sketch_3/SketchLine_15&weak_name_2][RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20][RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face]")) +SketchPoint_8 = Sketch_10.addPoint(model.selection("VERTEX", "[(RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20)(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face)(RevolutionFuse_1_1/Modified_Face&Sketch_2/SketchLine_14)2(RevolutionFuse_3_1/Modified_Face&Sketch_3/SketchArc_3_2)2(ExtrusionCut_2_1/Modified_Face&Sketch_5/SketchLine_40)2][RevolutionFuse_1_1/Generated_Face&Sketch_3/SketchLine_20][RevolutionFuse_3_1/Modified_Face&RevolutionFuse_1_1/To_Face]")) 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) @@ -698,7 +697,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/Modified_Face&Sketch_4/SketchLine_22&weak_name_2][RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27][RevolutionFuse_3_1/Modified_Face&RevolutionFuse_2_1/From_Face]")) +SketchPoint_9 = Sketch_10.addPoint(model.selection("VERTEX", "[(RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27)(RevolutionFuse_3_1/Modified_Face&RevolutionFuse_2_1/From_Face)(RevolutionFuse_2_1/Modified_Face&Sketch_1/SketchLine_8)2(RevolutionFuse_3_1/Modified_Face&Sketch_4/SketchArc_4_2)2(ExtrusionCut_2_1/Modified_Face&Sketch_5/SketchLine_40)2][RevolutionFuse_2_1/Generated_Face&Sketch_4/SketchLine_27][RevolutionFuse_3_1/Modified_Face&RevolutionFuse_2_1/From_Face]")) 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) @@ -771,7 +770,7 @@ model.do() ExtrusionFuse_3 = model.addExtrusionFuse(Part_1_doc, [model.selection("FACE", "Sketch_10/Face-SketchArc_16_2f-SketchLine_81r-SketchArc_17_2r-SketchLine_83f-SketchLine_84f-SketchLine_85r-SketchArc_18_2r-SketchLine_82f"), model.selection("FACE", "Sketch_10/Face-SketchArc_19_2f-SketchLine_86r-SketchArc_20_2r-SketchLine_88f-SketchLine_89f-SketchLine_90r-SketchArc_21_2r-SketchLine_87f")], model.selection(), 20, 0, [model.selection("SOLID", "ExtrusionCut_2_1")]) 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/SketchLine_90_EndVertex")) +SketchPoint_11 = Sketch_11.addPoint(model.selection("VERTEX", "Sketch_2/SketchLine_9_EndVertex")) SketchConstraintCoincidence_139 = Sketch_11.setCoincident(SketchCircle_2.center(), SketchPoint_11.result()) SketchConstraintCoincidence_139.setName("SketchConstraintCoincidence_137") SketchConstraintRadius_11 = Sketch_11.setRadius(SketchCircle_2.results()[1], 6)