]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Useful commits from master and V8_5_0
authormpv <mikhail.ponikarov@opencascade.com>
Mon, 2 Jul 2018 11:25:30 +0000 (14:25 +0300)
committermpv <mikhail.ponikarov@opencascade.com>
Mon, 2 Jul 2018 11:25:30 +0000 (14:25 +0300)
14 files changed:
src/FeaturesPlugin/CMakeLists.txt
src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp
src/FeaturesPlugin/FeaturesPlugin_RemoveSubShapes.cpp
src/FeaturesPlugin/Test/Test2197_4.py
src/FeaturesPlugin/Test/Test2495.py [new file with mode: 0644]
src/FeaturesPlugin/Test/Test2514.py [new file with mode: 0644]
src/FeaturesPlugin/Test/Test2520.py [new file with mode: 0644]
src/Model/Model_BodyBuilder.cpp
src/Model/Model_ResultConstruction.cpp
src/ModuleBase/ModuleBase_ParamSpinBox.cpp
src/ModuleBase/ModuleBase_ParamSpinBox.h
src/PartSet/PartSet_OperationPrs.cpp
src/PythonAPI/model/tests/tests.py
src/SHAPERGUI/SHAPERGUI.cpp

index ed5523231db41dedb98db313a44fbdac26acb69c..535c126e56644c81809dcc98041bf848327290e5 100644 (file)
@@ -258,4 +258,7 @@ ADD_UNIT_TESTS(TestExtrusion.py
                Test2419_2.py
                Test2419_3.py
                Test2465.py
+               Test2495.py
+               Test2514.py
+               Test2520.py
 )
index 9724f6d4b77a15cda75a63a5ac59dd135ee7555f..77766fcb58be2cd4dacf071a65bca81d18ae6104 100644 (file)
@@ -416,10 +416,15 @@ void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theRes
             int aNumEdges = 0;
             int aNumClosed = 0;
             GeomShapePtr aNotClosedEdge;
+            GeomEdgePtr aDegenerateEdge;
             GeomAPI_DataMapOfShapeShape alreadyIterated;
             for(; aFaceEdgeExp.more(); aFaceEdgeExp.next()) {
               std::shared_ptr<GeomAPI_Edge> anEdge(new GeomAPI_Edge(aFaceEdgeExp.current()));
-              if (anEdge->isDegenerated() || alreadyIterated.isBound(anEdge))
+              if (anEdge->isDegenerated()) {
+                aDegenerateEdge = anEdge;
+                continue;
+              }
+              if (alreadyIterated.isBound(anEdge))
                 continue;
               alreadyIterated.bind(anEdge, anEdge);
               aNumEdges++;
@@ -433,6 +438,14 @@ void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theRes
               std::ostringstream aStream;
               aStream<<"Base_Edge_"<<theTag++;
               theResultBody->generated(aNotClosedEdge, aStream.str(), theTag++);
+              if (aDegenerateEdge.get()) { // export vertex of the degenerated edge (apex) #2520
+                GeomAPI_ShapeExplorer anEdgeExp(aDegenerateEdge, GeomAPI_Shape::VERTEX);
+                if (anEdgeExp.more()) {
+                  std::ostringstream aStream;
+                  aStream << "Base_Vertex_" << theTag++;
+                  theResultBody->generated(anEdgeExp.current(), aStream.str(), theTag++);
+                }
+              }
             }
           }
         }
index ea29c222d53c0942486e19d3f095fea89f3134a5..a63ac8af06c5bfabb3c44626d260b84cb2052eaf 100644 (file)
@@ -256,12 +256,11 @@ void FeaturesPlugin_RemoveSubShapes::execute()
   std::set<GeomAPI_Shape::ShapeType>::iterator aTypeIter = aTypes.begin();
   for(; aTypeIter != aTypes.end(); aTypeIter++)
     aResultBody->loadDeletedShapes(&aMakeShapeList, aBaseShape, *aTypeIter, 1);
-  aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList,
-                                           aBaseShape,
-                                           GeomAPI_Shape::FACE,
-                                           2,
-                                           "Modified_Face",
-                                           *aMakeShapeList.mapOfSubShapes().get(),
-                                           true, false, true);
+  aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::FACE,
+         2, "Modified_Face", *aMakeShapeList.mapOfSubShapes().get(), true, false, true);
+  aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::EDGE,
+         3, "Modified_Edge", *aMakeShapeList.mapOfSubShapes().get(), false, false, true);
+  aResultBody->loadAndOrientModifiedShapes(&aMakeShapeList, aBaseShape, GeomAPI_Shape::VERTEX,
+         4, "Modified_Vertex", *aMakeShapeList.mapOfSubShapes().get());
   setResult(aResultBody);
 }
index 8478aebcfa0cca4a3f0b146db751e7957e643417..23bb4ff7ba76e595bd3e94aa7ceba19f71a7b87b 100644 (file)
@@ -52,7 +52,7 @@ SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_1.endPoint(),
 SketchConstraintCoincidence_5.setName("SketchConstraintCoincidence_7")
 model.do()
 Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_3f-SketchLine_4f-SketchLine_5r-SketchLine_6r")], model.selection("EDGE", "Sketch_1/Edge-SketchLine_4"), 360, 0)
-Group_1 = model.addGroup(Part_1_doc, [model.selection("EDGE", "Revolution_1_1/Generated_Face_5&Revolution_1_1/Generated_Face_4"), model.selection("EDGE", "Revolution_1_1/Generated_Face_4&Revolution_1_1/Generated_Face_3"), model.selection("EDGE", "Revolution_1_1/Generated_Face_3&Revolution_1_1/Generated_Face_2"), model.selection("EDGE", "Revolution_1_1/Base_Edge_4"), model.selection("EDGE", "Revolution_1_1/Base_Edge_2"), model.selection("EDGE", "Revolution_1_1/Generated_Face_4"), model.selection("EDGE", "Revolution_1_1/Generated_Face_3")])
+Group_1 = model.addGroup(Part_1_doc, [model.selection("EDGE", "Revolution_1_1/Generated_Face_5&Revolution_1_1/Generated_Face_4"), model.selection("EDGE", "Revolution_1_1/Generated_Face_4&Revolution_1_1/Generated_Face_3"), model.selection("EDGE", "Revolution_1_1/Generated_Face_3&Revolution_1_1/Generated_Face_2"), model.selection("EDGE", "Revolution_1_1/Base_Edge_6"), model.selection("EDGE", "Revolution_1_1/Base_Edge_2"), model.selection("EDGE", "Revolution_1_1/Generated_Face_4"), model.selection("EDGE", "Revolution_1_1/Generated_Face_3")])
 model.end()
 
 # check that resulting group selection is valid
diff --git a/src/FeaturesPlugin/Test/Test2495.py b/src/FeaturesPlugin/Test/Test2495.py
new file mode 100644 (file)
index 0000000..8154bd4
--- /dev/null
@@ -0,0 +1,573 @@
+## Copyright (C) 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<mailto:webmaster.salome@opencascade.com>
+##
+
+# -*- coding: utf-8 -*-
+
+from SketchAPI import *
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+model.addParameter(Part_1_doc, "rext_1", "1")
+model.addParameter(Part_1_doc, "rext_2", "2")
+model.addParameter(Part_1_doc, "ep", "0.3")
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
+SketchLine_1 = Sketch_1.addLine(153.5, 27.7, -153.5, 27.7)
+SketchLine_2 = Sketch_1.addLine(-153.5, 27.7, -153.5, 16.19999999999975)
+SketchLine_3 = Sketch_1.addLine(-151.5000000000398, -24.69999999999951, 151.5000000000377, -24.69999999999977)
+SketchLine_4 = Sketch_1.addLine(153.5000000000001, -22.70000000003736, 153.5, -15.80000000000003)
+SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint())
+SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_1.result())
+SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_2.result())
+SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_3.result())
+SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result())
+SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_1.result(), 307)
+SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_2.result(), 11.50000000000025)
+SketchPoint_1 = Sketch_1.addPoint(0, 27.7)
+SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchPoint_1.coordinates(), SketchLine_1.result())
+SketchConstraintCoincidence_3.setName("SketchConstraintCoincidence_5")
+SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OY"), False)
+SketchLine_5 = SketchProjection_1.createdFeature()
+SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchPoint_1.coordinates(), SketchLine_5.result())
+SketchConstraintCoincidence_4.setName("SketchConstraintCoincidence_6")
+SketchConstraintMiddle_1 = Sketch_1.setMiddlePoint(SketchLine_1.result(), SketchPoint_1.coordinates())
+SketchPoint_2 = Sketch_1.addPoint(153.5, 0)
+SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchPoint_2.coordinates(), SketchLine_4.result())
+SketchConstraintCoincidence_5.setName("SketchConstraintCoincidence_7")
+SketchProjection_2 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False)
+SketchLine_6 = SketchProjection_2.createdFeature()
+SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchPoint_2.coordinates(), SketchLine_6.result())
+SketchConstraintCoincidence_6.setName("SketchConstraintCoincidence_8")
+SketchLine_7 = Sketch_1.addLine(-108.1499999999999, 23.04999999999991, -109.8500000000001, 23.04999999999991)
+SketchLine_8 = Sketch_1.addLine(-109.8500000000001, 19.75000000000008, -108.1499999999999, 19.75000000000008)
+SketchLine_8.setName("SketchLine_9")
+SketchLine_8.result().setName("SketchLine_9")
+SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_7.result())
+SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_8.result())
+SketchArc_1 = Sketch_1.addArc(-109.8500000000001, 21.39999999999999, -109.8500000000001, 19.75000000000008, -109.8500000000001, 23.04999999999991, True)
+SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_8.startPoint(), SketchArc_1.startPoint())
+SketchConstraintCoincidence_7.setName("SketchConstraintCoincidence_9")
+SketchArc_2 = Sketch_1.addArc(-108.1499999999999, 21.39999999999999, -108.1499999999999, 19.75000000000008, -108.1499999999999, 23.04999999999991, False)
+SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_8.endPoint(), SketchArc_2.startPoint())
+SketchConstraintCoincidence_8.setName("SketchConstraintCoincidence_10")
+SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchArc_2.endPoint(), SketchLine_7.startPoint())
+SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_11")
+SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_7.endPoint())
+SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_12")
+SketchConstraintTangent_1 = Sketch_1.setTangent(SketchArc_2.results()[1], SketchLine_7.result())
+SketchConstraintTangent_2 = Sketch_1.setTangent(SketchLine_8.result(), SketchArc_2.results()[1])
+SketchConstraintTangent_3 = Sketch_1.setTangent(SketchLine_8.result(), SketchArc_1.results()[1])
+SketchConstraintTangent_4 = Sketch_1.setTangent(SketchLine_7.result(), SketchArc_1.results()[1])
+SketchLine_9 = Sketch_1.addLine(-111.5, 21.39999999999998, -106.5, 21.40000000000011)
+SketchLine_9.setName("SketchLine_10")
+SketchLine_9.result().setName("SketchLine_10")
+SketchLine_9.setAuxiliary(True)
+SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchLine_9.startPoint(), SketchArc_1.results()[1])
+SketchConstraintCoincidence_11.setName("SketchConstraintCoincidence_13")
+SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchLine_9.endPoint(), SketchArc_2.results()[1])
+SketchConstraintCoincidence_12.setName("SketchConstraintCoincidence_14")
+SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchArc_1.center(), SketchLine_9.result())
+SketchConstraintCoincidence_13.setName("SketchConstraintCoincidence_15")
+SketchConstraintCoincidence_14 = Sketch_1.setCoincident(SketchArc_2.center(), SketchLine_9.result())
+SketchConstraintCoincidence_14.setName("SketchConstraintCoincidence_16")
+SketchConstraintLength_3 = Sketch_1.setLength(SketchLine_9.result(), 5)
+SketchConstraintDistance_1 = Sketch_1.setDistance(SketchArc_1.startPoint(), SketchLine_7.result(), 3.3, True)
+SketchPoint_3 = Sketch_1.addPoint(0, 21.40000000000294)
+SketchConstraintCoincidence_15 = Sketch_1.setCoincident(SketchPoint_3.coordinates(), SketchLine_5.result())
+SketchConstraintCoincidence_15.setName("SketchConstraintCoincidence_17")
+SketchConstraintCoincidence_16 = Sketch_1.setCoincident(SketchPoint_3.coordinates(), SketchLine_9.result())
+SketchConstraintCoincidence_16.setName("SketchConstraintCoincidence_18")
+SketchPoint_4 = Sketch_1.addPoint(-109, 21.4)
+SketchConstraintCoincidence_17 = Sketch_1.setCoincident(SketchPoint_4.coordinates(), SketchLine_9.result())
+SketchConstraintCoincidence_17.setName("SketchConstraintCoincidence_19")
+SketchConstraintMiddle_2 = Sketch_1.setMiddlePoint(SketchPoint_4.coordinates(), SketchLine_9.result())
+SketchConstraintMiddle_2.setName("SketchConstraintMiddle_3")
+SketchConstraintDistanceHorizontal_1 = Sketch_1.setHorizontalDistance(SketchPoint_4.coordinates(), SketchPoint_3.coordinates(), 109)
+SketchMultiTranslation_1_objects = [SketchArc_1.results()[1], SketchLine_7.result(), SketchLine_8.result(), SketchArc_2.results()[1]]
+SketchMultiTranslation_1 = Sketch_1.addTranslation(SketchMultiTranslation_1_objects, SketchPoint_4.coordinates(), SketchPoint_3.coordinates(), 3)
+[SketchArc_3, SketchArc_4, SketchLine_10, SketchLine_11, SketchLine_12, SketchLine_13, SketchArc_5, SketchArc_6] = SketchMultiTranslation_1.translated()
+SketchArc_5.setName("SketchArc_4")
+SketchArc_5.result().setName("SketchArc_4")
+SketchArc_5.results()[1].setName("SketchArc_4_2")
+SketchLine_13.setName("SketchLine_14")
+SketchLine_13.result().setName("SketchLine_14")
+SketchLine_12.setName("SketchLine_12")
+SketchLine_12.result().setName("SketchLine_12")
+SketchLine_11.setName("SketchLine_13")
+SketchLine_11.result().setName("SketchLine_13")
+SketchLine_10.setName("SketchLine_11")
+SketchLine_10.result().setName("SketchLine_11")
+SketchArc_4.setName("SketchArc_5")
+SketchArc_4.result().setName("SketchArc_5")
+SketchArc_4.results()[1].setName("SketchArc_5_2")
+SketchConstraintDistance_2 = Sketch_1.setDistance(SketchPoint_4.coordinates(), SketchLine_6.result(), 21.4, True)
+SketchPoint_5 = Sketch_1.addPoint(0, -21)
+SketchConstraintCoincidence_18 = Sketch_1.setCoincident(SketchPoint_5.coordinates(), SketchLine_5.result())
+SketchConstraintCoincidence_18.setName("SketchConstraintCoincidence_20")
+SketchConstraintDistance_3 = Sketch_1.setDistance(SketchPoint_5.coordinates(), SketchLine_6.result(), 21, True)
+SketchMultiTranslation_2_objects = [SketchArc_1.results()[1], SketchLine_7.result(), SketchLine_8.result(), SketchArc_2.results()[1], SketchLine_10.result(), SketchArc_5.results()[1], SketchLine_12.result(), SketchArc_3.results()[1], SketchArc_4.results()[1], SketchLine_13.result(), SketchLine_11.result(), SketchArc_6.results()[1]]
+SketchMultiTranslation_2 = Sketch_1.addTranslation(SketchMultiTranslation_2_objects, SketchPoint_3.coordinates(), SketchPoint_5.coordinates(), 2)
+[SketchArc_7, SketchLine_14, SketchLine_15, SketchArc_8, SketchLine_10, SketchLine_16, SketchArc_5, SketchArc_9, SketchLine_12, SketchLine_17, SketchArc_3, SketchArc_10, SketchArc_4, SketchArc_11, SketchLine_13, SketchLine_18, SketchLine_11, SketchLine_19, SketchArc_6, SketchArc_12] = SketchMultiTranslation_2.translated()
+SketchLine_19.setName("SketchLine_20")
+SketchLine_19.result().setName("SketchLine_20")
+SketchLine_18.setName("SketchLine_19")
+SketchLine_18.result().setName("SketchLine_19")
+SketchLine_17.setName("SketchLine_18")
+SketchLine_17.result().setName("SketchLine_18")
+SketchLine_16.setName("SketchLine_17")
+SketchLine_16.result().setName("SketchLine_17")
+SketchLine_15.setName("SketchLine_16")
+SketchLine_15.result().setName("SketchLine_16")
+SketchLine_14.setName("SketchLine_15")
+SketchLine_14.result().setName("SketchLine_15")
+SketchLine_20 = Sketch_1.addLine(-108.43, 15.69999999999999, -145.43, 15.69999999999999)
+SketchLine_20.setName("SketchLine_21")
+SketchLine_20.result().setName("SketchLine_21")
+SketchLine_21 = Sketch_1.addLine(-146.43, 14.7, -146.43, 6.699999999999998)
+SketchLine_21.setName("SketchLine_22")
+SketchLine_21.result().setName("SketchLine_22")
+SketchLine_22 = Sketch_1.addLine(-145.43, 5.7, -108.43, 5.7)
+SketchLine_22.setName("SketchLine_23")
+SketchLine_22.result().setName("SketchLine_23")
+SketchLine_23 = Sketch_1.addLine(-107.43, 6.7, -107.43, 14.69999999999999)
+SketchLine_23.setName("SketchLine_24")
+SketchLine_23.result().setName("SketchLine_24")
+SketchConstraintHorizontal_5 = Sketch_1.setHorizontal(SketchLine_20.result())
+SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_21.result())
+SketchConstraintHorizontal_6 = Sketch_1.setHorizontal(SketchLine_22.result())
+SketchConstraintVertical_4 = Sketch_1.setVertical(SketchLine_23.result())
+SketchConstraintLength_4 = Sketch_1.setLength(SketchLine_20.result(), 37)
+SketchConstraintLength_5 = Sketch_1.setLength(SketchLine_21.result(), 8)
+SketchArc_13 = Sketch_1.addArc(-146.43, 15.7, -145.43, 15.69999999999999, -146.43, 14.7, False)
+SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_13.results()[1], 1)
+SketchConstraintCoincidence_19 = Sketch_1.setCoincident(SketchLine_20.endPoint(), SketchArc_13.startPoint())
+SketchConstraintCoincidence_19.setName("SketchConstraintCoincidence_31")
+SketchConstraintCoincidence_20 = Sketch_1.setCoincident(SketchArc_13.endPoint(), SketchLine_21.startPoint())
+SketchConstraintCoincidence_20.setName("SketchConstraintCoincidence_29")
+SketchConstraintCoincidence_21 = Sketch_1.setCoincident(SketchArc_13.center(), SketchLine_20.result())
+SketchConstraintCoincidence_21.setName("SketchConstraintCoincidence_30")
+SketchConstraintCoincidence_22 = Sketch_1.setCoincident(SketchArc_13.center(), SketchLine_21.result())
+SketchConstraintCoincidence_22.setName("SketchConstraintCoincidence_32")
+SketchArc_14 = Sketch_1.addArc(-146.43, 5.699999999999998, -146.43, 6.699999999999998, -145.43, 5.7, False)
+SketchConstraintEqual_1 = Sketch_1.setEqual(SketchArc_13.results()[1], SketchArc_14.results()[1])
+SketchConstraintCoincidence_23 = Sketch_1.setCoincident(SketchArc_14.startPoint(), SketchLine_21.endPoint())
+SketchConstraintCoincidence_23.setName("SketchConstraintCoincidence_35")
+SketchConstraintCoincidence_24 = Sketch_1.setCoincident(SketchArc_14.endPoint(), SketchLine_22.startPoint())
+SketchConstraintCoincidence_24.setName("SketchConstraintCoincidence_34")
+SketchConstraintCoincidence_25 = Sketch_1.setCoincident(SketchArc_14.center(), SketchLine_22.result())
+SketchConstraintCoincidence_25.setName("SketchConstraintCoincidence_33")
+SketchConstraintCoincidence_26 = Sketch_1.setCoincident(SketchArc_14.center(), SketchLine_21.result())
+SketchConstraintCoincidence_26.setName("SketchConstraintCoincidence_36")
+SketchArc_15 = Sketch_1.addArc(-107.43, 15.69999999999999, -107.43, 14.69999999999999, -108.43, 15.69999999999999, False)
+SketchConstraintEqual_2 = Sketch_1.setEqual(SketchArc_15.results()[1], SketchArc_13.results()[1])
+SketchConstraintCoincidence_27 = Sketch_1.setCoincident(SketchArc_15.endPoint(), SketchLine_20.startPoint())
+SketchConstraintCoincidence_27.setName("SketchConstraintCoincidence_39")
+SketchConstraintCoincidence_28 = Sketch_1.setCoincident(SketchArc_15.startPoint(), SketchLine_23.endPoint())
+SketchConstraintCoincidence_28.setName("SketchConstraintCoincidence_37")
+SketchConstraintCoincidence_29 = Sketch_1.setCoincident(SketchArc_15.center(), SketchLine_20.result())
+SketchConstraintCoincidence_29.setName("SketchConstraintCoincidence_38")
+SketchConstraintCoincidence_30 = Sketch_1.setCoincident(SketchArc_15.center(), SketchLine_23.result())
+SketchConstraintCoincidence_30.setName("SketchConstraintCoincidence_40")
+SketchArc_16 = Sketch_1.addArc(-107.43, 5.7, -108.43, 5.7, -107.43, 6.7, False)
+SketchConstraintEqual_3 = Sketch_1.setEqual(SketchArc_15.results()[1], SketchArc_16.results()[1])
+SketchConstraintCoincidence_31 = Sketch_1.setCoincident(SketchArc_16.startPoint(), SketchLine_22.endPoint())
+SketchConstraintCoincidence_31.setName("SketchConstraintCoincidence_43")
+SketchConstraintCoincidence_32 = Sketch_1.setCoincident(SketchArc_16.endPoint(), SketchLine_23.startPoint())
+SketchConstraintCoincidence_32.setName("SketchConstraintCoincidence_42")
+SketchConstraintCoincidence_33 = Sketch_1.setCoincident(SketchArc_16.center(), SketchLine_22.result())
+SketchConstraintCoincidence_33.setName("SketchConstraintCoincidence_41")
+SketchConstraintCoincidence_34 = Sketch_1.setCoincident(SketchArc_16.center(), SketchLine_23.result())
+SketchConstraintCoincidence_34.setName("SketchConstraintCoincidence_44")
+SketchConstraintDistance_4 = Sketch_1.setDistance(SketchArc_15.center(), SketchLine_5.result(), 107.43, True)
+SketchConstraintDistance_5 = Sketch_1.setDistance(SketchArc_16.center(), SketchLine_6.result(), 5.7, True)
+SketchPoint_6 = Sketch_1.addPoint(-95.65000000000001, 15.7)
+SketchConstraintCoincidence_35 = Sketch_1.setCoincident(SketchPoint_6.coordinates(), SketchLine_20.result())
+SketchConstraintCoincidence_35.setName("SketchConstraintCoincidence_45")
+SketchConstraintDistance_6 = Sketch_1.setDistance(SketchArc_15.center(), SketchPoint_6.coordinates(), "5.89*2", True)
+SketchMultiTranslation_3_objects = [SketchLine_23.result(), SketchArc_13.results()[1], SketchLine_21.result(), SketchArc_14.results()[1], SketchArc_16.results()[1], SketchLine_22.result(), SketchLine_20.result(), SketchArc_15.results()[1]]
+SketchMultiTranslation_3 = Sketch_1.addTranslation(SketchMultiTranslation_3_objects, SketchArc_13.center(), SketchPoint_6.coordinates(), 6)
+[SketchLine_24, SketchLine_25, SketchLine_26, SketchLine_27, SketchLine_28, SketchArc_17, SketchArc_18, SketchArc_19, SketchArc_20, SketchArc_21, SketchLine_29, SketchLine_30, SketchLine_31, SketchLine_32, SketchLine_33, SketchArc_22, SketchArc_23, SketchArc_24, SketchArc_25, SketchArc_26, SketchArc_27, SketchArc_28, SketchArc_29, SketchArc_30, SketchArc_31, SketchLine_34, SketchLine_35, SketchLine_36, SketchLine_37, SketchLine_38, SketchLine_39, SketchLine_40, SketchLine_41, SketchLine_42, SketchLine_43, SketchArc_32, SketchArc_33, SketchArc_34, SketchArc_35, SketchArc_36] = SketchMultiTranslation_3.translated()
+SketchArc_32.setName("SketchArc_20")
+SketchArc_32.result().setName("SketchArc_20")
+SketchArc_32.results()[1].setName("SketchArc_20_2")
+SketchLine_43.setName("SketchLine_44")
+SketchLine_43.result().setName("SketchLine_44")
+SketchLine_42.setName("SketchLine_43")
+SketchLine_42.result().setName("SketchLine_43")
+SketchLine_41.setName("SketchLine_42")
+SketchLine_41.result().setName("SketchLine_42")
+SketchLine_40.setName("SketchLine_41")
+SketchLine_40.result().setName("SketchLine_41")
+SketchLine_39.setName("SketchLine_28")
+SketchLine_39.result().setName("SketchLine_28")
+SketchLine_38.setName("SketchLine_40")
+SketchLine_38.result().setName("SketchLine_40")
+SketchLine_37.setName("SketchLine_39")
+SketchLine_37.result().setName("SketchLine_39")
+SketchLine_36.setName("SketchLine_38")
+SketchLine_36.result().setName("SketchLine_38")
+SketchLine_35.setName("SketchLine_37")
+SketchLine_35.result().setName("SketchLine_37")
+SketchLine_34.setName("SketchLine_27")
+SketchLine_34.result().setName("SketchLine_27")
+SketchArc_31.setName("SketchArc_32")
+SketchArc_31.result().setName("SketchArc_32")
+SketchArc_31.results()[1].setName("SketchArc_32_2")
+SketchArc_30.setName("SketchArc_31")
+SketchArc_30.result().setName("SketchArc_31")
+SketchArc_30.results()[1].setName("SketchArc_31_2")
+SketchArc_29.setName("SketchArc_30")
+SketchArc_29.result().setName("SketchArc_30")
+SketchArc_29.results()[1].setName("SketchArc_30_2")
+SketchArc_28.setName("SketchArc_29")
+SketchArc_28.result().setName("SketchArc_29")
+SketchArc_28.results()[1].setName("SketchArc_29_2")
+SketchArc_27.setName("SketchArc_19")
+SketchArc_27.result().setName("SketchArc_19")
+SketchArc_27.results()[1].setName("SketchArc_19_2")
+SketchArc_26.setName("SketchArc_28")
+SketchArc_26.result().setName("SketchArc_28")
+SketchArc_26.results()[1].setName("SketchArc_28_2")
+SketchArc_25.setName("SketchArc_27")
+SketchArc_25.result().setName("SketchArc_27")
+SketchArc_25.results()[1].setName("SketchArc_27_2")
+SketchArc_24.setName("SketchArc_26")
+SketchArc_24.result().setName("SketchArc_26")
+SketchArc_24.results()[1].setName("SketchArc_26_2")
+SketchArc_23.setName("SketchArc_25")
+SketchArc_23.result().setName("SketchArc_25")
+SketchArc_23.results()[1].setName("SketchArc_25_2")
+SketchArc_22.setName("SketchArc_18")
+SketchArc_22.result().setName("SketchArc_18")
+SketchArc_22.results()[1].setName("SketchArc_18_2")
+SketchLine_33.setName("SketchLine_36")
+SketchLine_33.result().setName("SketchLine_36")
+SketchLine_32.setName("SketchLine_35")
+SketchLine_32.result().setName("SketchLine_35")
+SketchLine_31.setName("SketchLine_34")
+SketchLine_31.result().setName("SketchLine_34")
+SketchLine_30.setName("SketchLine_33")
+SketchLine_30.result().setName("SketchLine_33")
+SketchLine_29.setName("SketchLine_26")
+SketchLine_29.result().setName("SketchLine_26")
+SketchArc_21.setName("SketchArc_24")
+SketchArc_21.result().setName("SketchArc_24")
+SketchArc_21.results()[1].setName("SketchArc_24_2")
+SketchArc_20.setName("SketchArc_23")
+SketchArc_20.result().setName("SketchArc_23")
+SketchArc_20.results()[1].setName("SketchArc_23_2")
+SketchArc_19.setName("SketchArc_22")
+SketchArc_19.result().setName("SketchArc_22")
+SketchArc_19.results()[1].setName("SketchArc_22_2")
+SketchArc_18.setName("SketchArc_21")
+SketchArc_18.result().setName("SketchArc_21")
+SketchArc_18.results()[1].setName("SketchArc_21_2")
+SketchLine_28.setName("SketchLine_32")
+SketchLine_28.result().setName("SketchLine_32")
+SketchLine_27.setName("SketchLine_31")
+SketchLine_27.result().setName("SketchLine_31")
+SketchLine_26.setName("SketchLine_30")
+SketchLine_26.result().setName("SketchLine_30")
+SketchLine_25.setName("SketchLine_29")
+SketchLine_25.result().setName("SketchLine_29")
+SketchLine_24.setName("SketchLine_25")
+SketchLine_24.result().setName("SketchLine_25")
+SketchPoint_7 = Sketch_1.addPoint(-107.43, -5.3)
+SketchConstraintCoincidence_36 = Sketch_1.setCoincident(SketchPoint_7.coordinates(), SketchLine_23.result())
+SketchConstraintCoincidence_36.setName("SketchConstraintCoincidence_46")
+SketchConstraintDistance_7 = Sketch_1.setDistance(SketchPoint_7.coordinates(), SketchLine_6.result(), 5.3, True)
+SketchMultiTranslation_4_objects = [SketchLine_20.result(), SketchArc_21.results()[1], SketchLine_22.result(), SketchArc_16.results()[1], SketchLine_41.result(), SketchLine_37.result(), SketchLine_38.result(), SketchArc_33.results()[1], SketchLine_43.result(), SketchLine_24.result(), SketchLine_42.result(), SketchArc_13.results()[1], SketchArc_31.results()[1], SketchLine_36.result(), SketchLine_28.result(), SketchArc_19.results()[1], SketchLine_21.result(), SketchArc_36.results()[1], SketchArc_14.results()[1], SketchArc_24.results()[1], SketchLine_31.result(), SketchArc_32.results()[1], SketchArc_20.results()[1], SketchLine_27.result(), SketchLine_34.result(), SketchArc_30.results()[1], SketchLine_39.result(), SketchArc_25.results()[1], SketchArc_34.results()[1], SketchArc_18.results()[1], SketchLine_40.result(), SketchLine_35.result(), SketchArc_35.results()[1], SketchArc_28.results()[1], SketchLine_32.result(), SketchArc_22.results()[1], SketchArc_26.results()[1], SketchLine_26.result(), SketchLine_30.result(), SketchArc_15.results()[1], SketchLine_33.result(), SketchLine_29.result(), SketchLine_23.result(), SketchLine_25.result(), SketchArc_29.results()[1], SketchArc_23.results()[1], SketchArc_27.results()[1], SketchArc_17.results()[1]]
+SketchMultiTranslation_4 = Sketch_1.addTranslation(SketchMultiTranslation_4_objects, SketchArc_15.center(), SketchPoint_7.coordinates(), 2)
+[SketchLine_44, SketchArc_21, SketchArc_37, SketchLine_45, SketchArc_38, SketchLine_41, SketchLine_46, SketchLine_37, SketchLine_47, SketchLine_38, SketchLine_48, SketchArc_33, SketchArc_39, SketchLine_43, SketchLine_49, SketchLine_24, SketchLine_50, SketchLine_42, SketchLine_51, SketchArc_40, SketchArc_31, SketchArc_41, SketchLine_36, SketchLine_52, SketchLine_28, SketchLine_53, SketchArc_19, SketchArc_42, SketchLine_54, SketchArc_36, SketchArc_43, SketchArc_44, SketchArc_24, SketchArc_45, SketchLine_31, SketchLine_55, SketchArc_32, SketchArc_46, SketchArc_20, SketchArc_47, SketchLine_27, SketchLine_56, SketchLine_34, SketchLine_57, SketchArc_30, SketchArc_48, SketchLine_39, SketchLine_58, SketchArc_25, SketchArc_49, SketchArc_34, SketchArc_50, SketchArc_18, SketchArc_51, SketchLine_40, SketchLine_59, SketchLine_35, SketchLine_60, SketchArc_35, SketchArc_52, SketchArc_28, SketchArc_53, SketchLine_32, SketchLine_61, SketchArc_22, SketchArc_54, SketchArc_26, SketchArc_55, SketchLine_26, SketchLine_62, SketchLine_30, SketchLine_63, SketchArc_56, SketchLine_33, SketchLine_64, SketchLine_29, SketchLine_65, SketchLine_66, SketchLine_25, SketchLine_67, SketchArc_29, SketchArc_57, SketchArc_23, SketchArc_58, SketchArc_27, SketchArc_59, SketchArc_17, SketchArc_60] = SketchMultiTranslation_4.translated()
+SketchLine_67.setName("SketchLine_68")
+SketchLine_67.result().setName("SketchLine_68")
+SketchLine_66.setName("SketchLine_67")
+SketchLine_66.result().setName("SketchLine_67")
+SketchLine_65.setName("SketchLine_66")
+SketchLine_65.result().setName("SketchLine_66")
+SketchLine_64.setName("SketchLine_65")
+SketchLine_64.result().setName("SketchLine_65")
+SketchLine_63.setName("SketchLine_64")
+SketchLine_63.result().setName("SketchLine_64")
+SketchLine_62.setName("SketchLine_63")
+SketchLine_62.result().setName("SketchLine_63")
+SketchLine_61.setName("SketchLine_62")
+SketchLine_61.result().setName("SketchLine_62")
+SketchLine_60.setName("SketchLine_61")
+SketchLine_60.result().setName("SketchLine_61")
+SketchLine_59.setName("SketchLine_60")
+SketchLine_59.result().setName("SketchLine_60")
+SketchLine_58.setName("SketchLine_59")
+SketchLine_58.result().setName("SketchLine_59")
+SketchLine_57.setName("SketchLine_58")
+SketchLine_57.result().setName("SketchLine_58")
+SketchLine_56.setName("SketchLine_57")
+SketchLine_56.result().setName("SketchLine_57")
+SketchLine_55.setName("SketchLine_56")
+SketchLine_55.result().setName("SketchLine_56")
+SketchLine_54.setName("SketchLine_55")
+SketchLine_54.result().setName("SketchLine_55")
+SketchLine_53.setName("SketchLine_54")
+SketchLine_53.result().setName("SketchLine_54")
+SketchLine_52.setName("SketchLine_53")
+SketchLine_52.result().setName("SketchLine_53")
+SketchLine_51.setName("SketchLine_52")
+SketchLine_51.result().setName("SketchLine_52")
+SketchLine_50.setName("SketchLine_51")
+SketchLine_50.result().setName("SketchLine_51")
+SketchLine_49.setName("SketchLine_50")
+SketchLine_49.result().setName("SketchLine_50")
+SketchLine_48.setName("SketchLine_49")
+SketchLine_48.result().setName("SketchLine_49")
+SketchLine_47.setName("SketchLine_48")
+SketchLine_47.result().setName("SketchLine_48")
+SketchLine_46.setName("SketchLine_47")
+SketchLine_46.result().setName("SketchLine_47")
+SketchLine_45.setName("SketchLine_46")
+SketchLine_45.result().setName("SketchLine_46")
+SketchLine_44.setName("SketchLine_45")
+SketchLine_44.result().setName("SketchLine_45")
+SketchLine_68 = Sketch_1.addLine(-153.5, 16.19999999999975, -152.2999999999999, 16.20000000000002)
+SketchLine_68.setName("SketchLine_69")
+SketchLine_68.result().setName("SketchLine_69")
+SketchLine_69 = Sketch_1.addLine(-150.7999999999999, 14.70000000000003, -150.7999999999999, 9.699999999999999)
+SketchLine_69.setName("SketchLine_70")
+SketchLine_69.result().setName("SketchLine_70")
+SketchLine_70 = Sketch_1.addLine(-152.2999999999999, 8.199999999999999, -153.4999999999999, 8.199999999999999)
+SketchLine_70.setName("SketchLine_71")
+SketchLine_70.result().setName("SketchLine_71")
+SketchConstraintHorizontal_7 = Sketch_1.setHorizontal(SketchLine_68.result())
+SketchConstraintHorizontal_8 = Sketch_1.setHorizontal(SketchLine_70.result())
+SketchConstraintVertical_5 = Sketch_1.setVertical(SketchLine_69.result())
+SketchArc_61 = Sketch_1.addArc(-152.2999999999999, 14.70000000000002, -150.7999999999999, 14.70000000000003, -152.2999999999999, 16.20000000000002, False)
+SketchConstraintCoincidence_37 = Sketch_1.setCoincident(SketchArc_61.startPoint(), SketchLine_69.startPoint())
+SketchConstraintCoincidence_37.setName("SketchConstraintCoincidence_47")
+SketchConstraintCoincidence_38 = Sketch_1.setCoincident(SketchArc_61.endPoint(), SketchLine_68.endPoint())
+SketchConstraintCoincidence_38.setName("SketchConstraintCoincidence_50")
+SketchConstraintTangent_5 = Sketch_1.setTangent(SketchArc_61.results()[1], SketchLine_69.result())
+SketchConstraintTangent_6 = Sketch_1.setTangent(SketchArc_61.results()[1], SketchLine_68.result())
+SketchArc_62 = Sketch_1.addArc(-152.2999999999999, 9.699999999999999, -152.2999999999999, 8.199999999999999, -150.7999999999999, 9.699999999999999, False)
+SketchConstraintCoincidence_39 = Sketch_1.setCoincident(SketchArc_62.startPoint(), SketchLine_70.startPoint())
+SketchConstraintCoincidence_39.setName("SketchConstraintCoincidence_48")
+SketchConstraintCoincidence_40 = Sketch_1.setCoincident(SketchArc_62.endPoint(), SketchLine_69.endPoint())
+SketchConstraintCoincidence_40.setName("SketchConstraintCoincidence_51")
+SketchConstraintTangent_7 = Sketch_1.setTangent(SketchArc_62.results()[1], SketchLine_69.result())
+SketchConstraintTangent_8 = Sketch_1.setTangent(SketchArc_62.results()[1], SketchLine_70.result())
+SketchConstraintDistance_8 = Sketch_1.setDistance(SketchLine_70.startPoint(), SketchLine_68.result(), 8, True)
+SketchConstraintDistance_9 = Sketch_1.setDistance(SketchLine_70.endPoint(), SketchLine_69.result(), 2.7, True)
+SketchConstraintRadius_2 = Sketch_1.setRadius(SketchArc_61.results()[1], 1.5)
+SketchConstraintEqual_4 = Sketch_1.setEqual(SketchArc_61.results()[1], SketchArc_62.results()[1])
+SketchConstraintDistance_10 = Sketch_1.setDistance(SketchLine_70.endPoint(), SketchLine_6.result(), 8.199999999999999, True)
+SketchPoint_8 = Sketch_1.addPoint(-153.5, -7.799999999999999)
+SketchConstraintCoincidence_41 = Sketch_1.setCoincident(SketchPoint_8.coordinates(), SketchLine_2.result())
+SketchConstraintCoincidence_41.setName("SketchConstraintCoincidence_53")
+SketchConstraintDistance_11 = Sketch_1.setDistance(SketchPoint_8.coordinates(), SketchLine_6.result(), 7.8, True)
+SketchMultiTranslation_5_objects = [SketchLine_68.result(), SketchArc_61.results()[1], SketchLine_69.result(), SketchArc_62.results()[1], SketchLine_70.result()]
+SketchMultiTranslation_5 = Sketch_1.addTranslation(SketchMultiTranslation_5_objects, SketchLine_68.startPoint(), SketchPoint_8.coordinates(), 2)
+[SketchLine_71, SketchArc_63, SketchLine_72, SketchArc_64, SketchLine_73] = SketchMultiTranslation_5.translated()
+SketchLine_73.setName("SketchLine_74")
+SketchLine_73.result().setName("SketchLine_74")
+SketchLine_72.setName("SketchLine_73")
+SketchLine_72.result().setName("SketchLine_73")
+SketchLine_71.setName("SketchLine_72")
+SketchLine_71.result().setName("SketchLine_72")
+SketchConstraintMirror_1_objects = [SketchLine_68.result(), SketchArc_61.results()[1], SketchLine_69.result(), SketchArc_62.results()[1], SketchLine_70.result(), SketchLine_71.result(), SketchArc_63.results()[1], SketchLine_72.result(), SketchArc_64.results()[1], SketchLine_73.result()]
+SketchConstraintMirror_1 = Sketch_1.addMirror(SketchLine_5.result(), SketchConstraintMirror_1_objects)
+[SketchLine_74, SketchArc_65, SketchLine_75, SketchArc_66, SketchLine_76, SketchLine_77, SketchArc_67, SketchLine_78, SketchArc_68, SketchLine_79] = SketchConstraintMirror_1.mirrored()
+SketchLine_79.setName("SketchLine_80")
+SketchLine_79.result().setName("SketchLine_80")
+SketchLine_78.setName("SketchLine_79")
+SketchLine_78.result().setName("SketchLine_79")
+SketchLine_77.setName("SketchLine_78")
+SketchLine_77.result().setName("SketchLine_78")
+SketchLine_76.setName("SketchLine_77")
+SketchLine_76.result().setName("SketchLine_77")
+SketchLine_75.setName("SketchLine_76")
+SketchLine_75.result().setName("SketchLine_76")
+SketchLine_74.setName("SketchLine_75")
+SketchLine_74.result().setName("SketchLine_75")
+SketchLine_80 = Sketch_1.addLine(-153.4999999999999, 8.199999999999999, -153.5, -7.799999999999947)
+SketchLine_80.setName("SketchLine_81")
+SketchLine_80.result().setName("SketchLine_81")
+SketchConstraintCollinear_1 = Sketch_1.setCollinear(SketchLine_2.result(), SketchLine_80.result())
+SketchConstraintCoincidence_42 = Sketch_1.setCoincident(SketchLine_70.endPoint(), SketchLine_80.startPoint())
+SketchConstraintCoincidence_42.setName("SketchConstraintCoincidence_54")
+SketchConstraintCoincidence_43 = Sketch_1.setCoincident(SketchLine_68.startPoint(), SketchLine_2.endPoint())
+SketchConstraintCoincidence_43.setName("SketchConstraintCoincidence_55")
+SketchLine_81 = Sketch_1.addLine(-153.4999999999999, -15.79999999999969, -153.5, -22.70000000003739)
+SketchLine_81.setName("SketchLine_82")
+SketchLine_81.result().setName("SketchLine_82")
+SketchConstraintCollinear_2 = Sketch_1.setCollinear(SketchLine_80.result(), SketchLine_81.result())
+SketchConstraintCoincidence_44 = Sketch_1.setCoincident(SketchLine_81.startPoint(), SketchLine_73.result())
+SketchConstraintCoincidence_44.setName("SketchConstraintCoincidence_49")
+SketchConstraintCoincidence_45 = Sketch_1.setCoincident(SketchLine_80.endPoint(), SketchPoint_8.result())
+SketchConstraintCoincidence_45.setName("SketchConstraintCoincidence_52")
+SketchConstraintVertical_6 = Sketch_1.setVertical(SketchLine_80.result())
+SketchLine_82 = Sketch_1.addLine(153.5, 16.19999999999975, 153.5, 27.7)
+SketchLine_82.setName("SketchLine_83")
+SketchLine_82.result().setName("SketchLine_83")
+SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_82.endPoint(), SketchLine_1.startPoint())
+SketchConstraintCollinear_3 = Sketch_1.setCollinear(SketchLine_4.result(), SketchLine_82.result())
+SketchConstraintCoincidence_46 = Sketch_1.setCoincident(SketchLine_82.startPoint(), SketchLine_74.result())
+SketchConstraintCoincidence_46.setName("SketchConstraintCoincidence_56")
+SketchLine_83 = Sketch_1.addLine(153.5, -7.800000000000278, 153.5, 8.199999999999999)
+SketchLine_83.setName("SketchLine_84")
+SketchLine_83.result().setName("SketchLine_84")
+SketchConstraintCoincidence_47 = Sketch_1.setCoincident(SketchLine_83.endPoint(), SketchLine_76.result())
+SketchConstraintCoincidence_47.setName("SketchConstraintCoincidence_57")
+SketchConstraintCollinear_4 = Sketch_1.setCollinear(SketchLine_4.result(), SketchLine_83.result())
+SketchConstraintCoincidence_48 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_79.result())
+SketchConstraintCoincidence_48.setName("SketchConstraintCoincidence_58")
+SketchConstraintCoincidence_49 = Sketch_1.setCoincident(SketchLine_83.startPoint(), SketchLine_77.result())
+SketchConstraintCoincidence_49.setName("SketchConstraintCoincidence_59")
+SketchLine_84 = Sketch_1.addLine(-153.5, -22.70000000003739, -151.5000000000398, -24.69999999999951)
+SketchLine_84.setName("SketchLine_85")
+SketchLine_84.result().setName("SketchLine_85")
+SketchConstraintAngle_1 = Sketch_1.setAngleComplementary(SketchLine_84.result(), SketchLine_3.result(), 45)
+SketchConstraintCoincidence_50 = Sketch_1.setCoincident(SketchLine_84.startPoint(), SketchLine_81.endPoint())
+SketchConstraintCoincidence_50.setName("SketchConstraintCoincidence_62")
+SketchConstraintCoincidence_51 = Sketch_1.setCoincident(SketchLine_84.endPoint(), SketchLine_3.startPoint())
+SketchConstraintCoincidence_51.setName("SketchConstraintCoincidence_60")
+SketchConstraintDistance_12 = Sketch_1.setDistance(SketchLine_84.startPoint(), SketchLine_3.result(), 2, True)
+SketchConstraintDistance_13 = Sketch_1.setDistance(SketchLine_84.endPoint(), SketchLine_1.result(), "55.4-rext_1-rext_2", True)
+SketchConstraintMirror_2 = Sketch_1.addMirror(SketchLine_5.result(), [SketchLine_84.result()])
+[SketchLine_85] = SketchConstraintMirror_2.mirrored()
+SketchLine_85.setName("SketchLine_86")
+SketchLine_85.result().setName("SketchLine_86")
+SketchConstraintCoincidence_52 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_85.result())
+SketchConstraintCoincidence_52.setName("SketchConstraintCoincidence_61")
+SketchConstraintCoincidence_53 = Sketch_1.setCoincident(SketchLine_4.startPoint(), SketchLine_85.result())
+SketchConstraintCoincidence_53.setName("SketchConstraintCoincidence_63")
+model.do()
+Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "PartSet/YOZ"), model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_4e-SketchLine_80e"))
+Sketch_2 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1"))
+SketchProjection_3 = Sketch_2.addProjection(model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_1s-SketchLine_83e"), False)
+SketchPoint_9 = SketchProjection_3.createdFeature()
+SketchArc_69 = Sketch_2.addArc(27.70000001097709, 0.85, 27.7, 0, 28.55000001097708, 0.85, False)
+SketchConstraintCoincidence_54 = Sketch_2.setCoincident(SketchPoint_9.result(), SketchArc_69.startPoint())
+SketchConstraintCoincidence_54.setName("SketchConstraintCoincidence_64")
+SketchProjection_4 = Sketch_2.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_83"), False)
+SketchLine_86 = SketchProjection_4.createdFeature()
+SketchLine_86.setName("SketchLine_87")
+SketchLine_86.result().setName("SketchLine_87")
+SketchConstraintTangent_9 = Sketch_2.setTangent(SketchLine_86.result(), SketchArc_69.results()[1])
+SketchLine_87 = Sketch_2.addLine(27.70000001097709, 0.85, 28.55000001097708, 0.85)
+SketchLine_87.setName("SketchLine_88")
+SketchLine_87.result().setName("SketchLine_88")
+SketchLine_87.setAuxiliary(True)
+SketchConstraintCoincidence_55 = Sketch_2.setCoincident(SketchArc_69.center(), SketchLine_87.startPoint())
+SketchConstraintCoincidence_55.setName("SketchConstraintCoincidence_65")
+SketchConstraintCoincidence_56 = Sketch_2.setCoincident(SketchArc_69.endPoint(), SketchLine_87.endPoint())
+SketchConstraintCoincidence_56.setName("SketchConstraintCoincidence_66")
+SketchConstraintHorizontal_9 = Sketch_2.setHorizontal(SketchLine_87.result())
+SketchConstraintRadius_3 = Sketch_2.setRadius(SketchArc_69.results()[1], "rext_1-ep/2")
+SketchLine_88 = Sketch_2.addLine(28.55000001097708, 0.85, 28.55000000874763, 10.85)
+SketchLine_88.setName("SketchLine_89")
+SketchLine_88.result().setName("SketchLine_89")
+SketchConstraintCoincidence_57 = Sketch_2.setCoincident(SketchArc_69.endPoint(), SketchLine_88.startPoint())
+SketchConstraintCoincidence_57.setName("SketchConstraintCoincidence_67")
+SketchConstraintVertical_7 = Sketch_2.setVertical(SketchLine_88.result())
+SketchConstraintLength_6 = Sketch_2.setLength(SketchLine_88.result(), 10)
+model.do()
+Edge_1 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_2/Edge-SketchArc_69_2"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_89")])
+Extrusion_1 = model.addExtrusion(Part_1_doc, [model.selection("EDGE", "Edge_1_1"), model.selection("EDGE", "Edge_1_2")], model.selection("EDGE", "PartSet/OX"), 0, 307)
+Plane_5 = model.addPlane(Part_1_doc, model.selection("FACE", "PartSet/YOZ"), model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_3e-SketchLine_86e"))
+Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_2"))
+SketchProjection_5 = Sketch_3.addProjection(model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_3e-SketchLine_86e"), False)
+SketchPoint_10 = SketchProjection_5.createdFeature()
+SketchArc_70 = Sketch_3.addArc(-24.69999999999951, 1.85, -24.69999999999928, -3.648414406296559e-014, -26.54999999999951, 1.85, True)
+SketchConstraintCoincidence_58 = Sketch_3.setCoincident(SketchPoint_10.result(), SketchArc_70.startPoint())
+SketchConstraintCoincidence_58.setName("SketchConstraintCoincidence_68")
+SketchLine_89 = Sketch_3.addLine(-26.54999999999951, 1.85, -24.69999999999951, 1.85)
+SketchLine_89.setName("SketchLine_90")
+SketchLine_89.result().setName("SketchLine_90")
+SketchLine_89.setAuxiliary(True)
+SketchConstraintCoincidence_59 = Sketch_3.setCoincident(SketchArc_70.endPoint(), SketchLine_89.startPoint())
+SketchConstraintCoincidence_59.setName("SketchConstraintCoincidence_69")
+SketchConstraintCoincidence_60 = Sketch_3.setCoincident(SketchArc_70.center(), SketchLine_89.endPoint())
+SketchConstraintCoincidence_60.setName("SketchConstraintCoincidence_70")
+SketchConstraintHorizontal_10 = Sketch_3.setHorizontal(SketchLine_89.result())
+SketchLine_90 = Sketch_3.addLine(-24.69999999999951, 1.85, -24.69999999999977, 0)
+SketchLine_90.setName("SketchLine_91")
+SketchLine_90.result().setName("SketchLine_91")
+SketchLine_90.setAuxiliary(True)
+SketchConstraintCoincidence_61 = Sketch_3.setCoincident(SketchArc_70.center(), SketchLine_90.startPoint())
+SketchConstraintCoincidence_61.setName("SketchConstraintCoincidence_71")
+SketchConstraintCoincidence_62 = Sketch_3.setCoincident(SketchAPI_Point(SketchPoint_10).coordinates(), SketchLine_90.endPoint())
+SketchConstraintCoincidence_62.setName("SketchConstraintCoincidence_72")
+SketchConstraintVertical_8 = Sketch_3.setVertical(SketchLine_90.result())
+SketchLine_91 = Sketch_3.addLine(-26.54999999999951, 1.85, -26.54999999999951, 11.85)
+SketchLine_91.setName("SketchLine_92")
+SketchLine_91.result().setName("SketchLine_92")
+SketchConstraintCoincidence_63 = Sketch_3.setCoincident(SketchArc_70.endPoint(), SketchLine_91.startPoint())
+SketchConstraintCoincidence_63.setName("SketchConstraintCoincidence_73")
+SketchConstraintVertical_9 = Sketch_3.setVertical(SketchLine_91.result())
+SketchConstraintRadius_4 = Sketch_3.setRadius(SketchArc_70.results()[1], "rext_2-ep/2")
+SketchConstraintLength_7 = Sketch_3.setLength(SketchLine_91.result(), 10)
+model.do()
+Edge_2 = model.addEdge(Part_1_doc, [model.selection("EDGE", "Sketch_3/Edge-SketchLine_92"), model.selection("EDGE", "Sketch_3/Edge-SketchArc_70_2")])
+Extrusion_2 = model.addExtrusion(Part_1_doc, [model.selection("EDGE", "Edge_2_1"), model.selection("EDGE", "Edge_2_2")], model.selection("EDGE", "PartSet/OX"), 0, 299)
+Translation_1 = model.addTranslation(Part_1_doc, [model.selection("FACE", "Extrusion_2_2"), model.selection("FACE", "Extrusion_2_1")], model.selection("EDGE", "PartSet/OX"), -2)
+Face_1 = model.addFace(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_1f-SketchLine_2f-SketchLine_3f-SketchLine_4f-SketchLine_7r-SketchLine_9r-SketchArc_1_2r-SketchArc_2_2r-SketchArc_3_2r-SketchLine_11r-SketchLine_12r-SketchArc_4_2r-SketchArc_5_2r-SketchLine_13r-SketchLine_14r-SketchArc_6_2r-SketchArc_7_2r-SketchLine_15r-SketchLine_16r-SketchArc_8_2r-SketchLine_17r-SketchArc_9_2r-SketchLine_18r-SketchArc_10_2r-SketchArc_11_2r-SketchLine_19r-SketchLine_20r-SketchArc_12_2r-SketchLine_21r-SketchLine_22r-SketchLine_23r-SketchLine_24r-SketchArc_13_2r-SketchArc_14_2r-SketchArc_15_2r-SketchArc_16_2r-SketchLine_25r-SketchArc_17_2r-SketchLine_26r-SketchArc_18_2r-SketchArc_19_2r-SketchLine_27r-SketchLine_28r-SketchArc_20_2r-SketchLine_29r-SketchLine_30r-SketchLine_31r-SketchLine_32r-SketchArc_21_2r-SketchArc_22_2r-SketchArc_23_2r-SketchArc_24_2r-SketchLine_33r-SketchLine_34r-SketchLine_35r-SketchLine_36r-SketchArc_25_2r-SketchArc_26_2r-SketchArc_27_2r-SketchArc_28_2r-SketchArc_29_2r-SketchArc_30_2r-SketchArc_31_2r-SketchArc_32_2r-SketchLine_37r-SketchLine_38r-SketchLine_39r-SketchLine_40r-SketchLine_41r-SketchLine_42r-SketchLine_43r-SketchLine_44r-SketchArc_33_2r-SketchArc_34_2r-SketchArc_35_2r-SketchArc_36_2r-SketchLine_45r-SketchArc_37_2r-SketchLine_46r-SketchArc_38_2r-SketchLine_47r-SketchLine_48r-SketchLine_49r-SketchArc_39_2r-SketchLine_50r-SketchLine_51r-SketchLine_52r-SketchArc_40_2r-SketchArc_41_2r-SketchLine_53r-SketchLine_54r-SketchArc_42_2r-SketchLine_55r-SketchArc_43_2r-SketchArc_44_2r-SketchArc_45_2r-SketchLine_56r-SketchArc_46_2r-SketchArc_47_2r-SketchLine_57r-SketchLine_58r-SketchArc_48_2r-SketchLine_59r-SketchArc_49_2r-SketchArc_50_2r-SketchArc_51_2r-SketchLine_60r-SketchLine_61r-SketchArc_52_2r-SketchArc_53_2r-SketchLine_62r-SketchArc_54_2r-SketchArc_55_2r-SketchLine_63r-SketchLine_64r-SketchArc_56_2r-SketchLine_65r-SketchLine_66r-SketchLine_67r-SketchLine_68r-SketchArc_57_2r-SketchArc_58_2r-SketchArc_59_2r-SketchArc_60_2r-SketchLine_69f-SketchLine_70f-SketchLine_71f-SketchArc_61_2r-SketchArc_62_2r-SketchLine_72f-SketchArc_63_2r-SketchLine_73f-SketchArc_64_2r-SketchLine_74f-SketchLine_75r-SketchArc_65_2r-SketchLine_76r-SketchArc_66_2r-SketchLine_77r-SketchLine_78r-SketchArc_67_2r-SketchLine_79r-SketchArc_68_2r-SketchLine_80r-SketchLine_81f-SketchLine_82f-SketchLine_83f-SketchLine_84f-SketchLine_85f-SketchLine_86r")])
+Sketch_4 = model.addSketch(Part_1_doc, model.selection("FACE", "Translation_1_2"))
+SketchCircle_1 = Sketch_4.addCircle(96.50000000003769, 5.5, 1.65)
+SketchProjection_6 = Sketch_4.addProjection(model.selection("EDGE", "Translation_1_2/Translated_Edge_1"), False)
+SketchLine_92 = SketchProjection_6.createdFeature()
+SketchLine_92.setName("SketchLine_93")
+SketchLine_92.result().setName("SketchLine_93")
+SketchConstraintDistance_14 = Sketch_4.setDistance(SketchCircle_1.center(), SketchLine_92.result(), 53, True)
+SketchProjection_7 = Sketch_4.addProjection(model.selection("EDGE", "Extrusion_1_2/To_Edge_1"), False)
+SketchLine_93 = SketchProjection_7.createdFeature()
+SketchLine_93.setName("SketchLine_94")
+SketchLine_93.result().setName("SketchLine_94")
+SketchProjection_8 = Sketch_4.addProjection(model.selection("EDGE", "PartSet/OX"), False)
+SketchLine_94 = SketchProjection_8.createdFeature()
+SketchLine_94.setName("SketchLine_95")
+SketchLine_94.result().setName("SketchLine_95")
+SketchConstraintDistance_15 = Sketch_4.setDistance(SketchCircle_1.center(), SketchLine_94.result(), 5.5, True)
+SketchConstraintRadius_5 = Sketch_4.setRadius(SketchCircle_1.results()[1], "3.3/2")
+SketchPoint_11 = Sketch_4.addPoint(29.50000000003768, 5.5)
+SketchLine_95 = Sketch_4.addLine(29.50000000003768, 5.5, 96.50000000003769, 5.5)
+SketchLine_95.setName("SketchLine_96")
+SketchLine_95.result().setName("SketchLine_96")
+SketchLine_95.setAuxiliary(True)
+SketchConstraintCoincidence_64 = Sketch_4.setCoincident(SketchPoint_11.coordinates(), SketchLine_95.startPoint())
+SketchConstraintCoincidence_64.setName("SketchConstraintCoincidence_74")
+SketchConstraintCoincidence_65 = Sketch_4.setCoincident(SketchCircle_1.center(), SketchLine_95.endPoint())
+SketchConstraintCoincidence_65.setName("SketchConstraintCoincidence_75")
+SketchConstraintHorizontal_11 = Sketch_4.setHorizontal(SketchLine_95.result())
+SketchConstraintLength_8 = Sketch_4.setLength(SketchLine_95.result(), 67)
+SketchMultiTranslation_6 = Sketch_4.addTranslation([SketchCircle_1.results()[1]], SketchLine_95.endPoint(), SketchLine_95.startPoint(), 4)
+[SketchCircle_2, SketchCircle_3, SketchCircle_4] = SketchMultiTranslation_6.translated()
+model.do()
+Face_2_objects = [model.selection("EDGE", "Sketch_4/Edge-SketchCircle_4_2"), model.selection("EDGE", "Sketch_4/Edge-SketchCircle_3_2"), model.selection("WIRE", "Sketch_4/Wire-SketchCircle_2_2f"), model.selection("EDGE", "Sketch_4/Edge-SketchCircle_1_2")]
+Face_2 = model.addFace(Part_1_doc, Face_2_objects)
+Partition_1_objects = [model.selection("FACE", "Extrusion_1_1"), model.selection("FACE", "Extrusion_1_2"), model.selection("FACE", "Translation_1_1"), model.selection("FACE", "Translation_1_2"), model.selection("FACE", "Face_1_1"), model.selection("FACE", "Face_2_1"), model.selection("FACE", "Face_2_2"), model.selection("FACE", "Face_2_3"), model.selection("FACE", "Face_2_4")]
+Partition_1 = model.addPartition(Part_1_doc, Partition_1_objects)
+Remove_SubShapes_1_objects_2 = [model.selection("FACE", "Face_2_1/Face_2_1"), model.selection("FACE", "Face_2_2/Face_2_2"), model.selection("FACE", "Face_2_3/Face_2_3"), model.selection("FACE", "Face_2_4/Face_2_4")]
+Remove_SubShapes_1 = model.addRemoveSubShapes(Part_1_doc, model.selection("COMPOUND", "Partition_1_1"))
+Remove_SubShapes_1.setSubShapesToRemove(Remove_SubShapes_1_objects_2)
+model.do()
+# check that naming after remove sub-shapes feature applying is correct
+model.testHaveNamingSubshapes(Remove_SubShapes_1, model, Part_1_doc)
+model.end()
diff --git a/src/FeaturesPlugin/Test/Test2514.py b/src/FeaturesPlugin/Test/Test2514.py
new file mode 100644 (file)
index 0000000..a4b592e
--- /dev/null
@@ -0,0 +1,324 @@
+## 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<mailto:webmaster.salome@opencascade.com>
+##
+
+# -*- coding: utf-8 -*-
+
+from SketchAPI import *
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOZ"))
+SketchLine_1 = Sketch_1.addLine(15, 17, 15, -3)
+SketchLine_2 = Sketch_1.addLine(15, -3, 0, -3)
+SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint())
+SketchProjection_1 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OZ"), False)
+SketchLine_3 = SketchProjection_1.createdFeature()
+SketchLine_3.setName("SketchLine_4")
+SketchLine_3.result().setName("SketchLine_4")
+SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_1.result())
+SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_2.result())
+SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.result())
+SketchConstraintCoincidence_2.setName("SketchConstraintCoincidence_4")
+SketchArc_1 = Sketch_1.addArc(0, -8.980762113533162, 0, 21.01923788646684, 15, 17, True)
+SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_3.result(), SketchArc_1.center())
+SketchConstraintCoincidence_3.setName("SketchConstraintCoincidence_5")
+SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_2.result(), 15)
+SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_1.result(), 20)
+SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchArc_1.endPoint(), SketchLine_1.startPoint())
+SketchConstraintCoincidence_4.setName("SketchConstraintCoincidence_7")
+SketchConstraintRadius_1 = Sketch_1.setRadius(SketchArc_1.results()[1], 30)
+SketchProjection_2 = Sketch_1.addProjection(model.selection("EDGE", "PartSet/OX"), False)
+SketchLine_4 = SketchProjection_2.createdFeature()
+SketchLine_4.setName("SketchLine_5")
+SketchLine_4.result().setName("SketchLine_5")
+SketchConstraintDistance_1 = Sketch_1.setDistance(SketchLine_2.startPoint(), SketchLine_4.result(), 3, True)
+SketchLine_5 = Sketch_1.addLine(15, 0, 16, 0)
+SketchLine_5.setName("SketchLine_6")
+SketchLine_5.result().setName("SketchLine_6")
+SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_5.startPoint(), SketchLine_1.result())
+SketchConstraintCoincidence_5.setName("SketchConstraintCoincidence_8")
+SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_4.result())
+SketchConstraintCoincidence_6.setName("SketchConstraintCoincidence_9")
+SketchLine_6 = Sketch_1.addLine(16, 0, 16, -3)
+SketchLine_6.setName("SketchLine_7")
+SketchLine_6.result().setName("SketchLine_7")
+SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint())
+SketchConstraintCoincidence_7.setName("SketchConstraintCoincidence_10")
+SketchLine_7 = Sketch_1.addLine(16, -3, 15, -3)
+SketchLine_7.setName("SketchLine_8")
+SketchLine_7.result().setName("SketchLine_8")
+SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint())
+SketchConstraintCoincidence_8.setName("SketchConstraintCoincidence_11")
+SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_7.endPoint())
+SketchConstraintCoincidence_9.setName("SketchConstraintCoincidence_12")
+SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_6.result())
+SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchLine_5.startPoint(), SketchLine_4.result())
+SketchConstraintCoincidence_10.setName("SketchConstraintCoincidence_13")
+SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchLine_7.startPoint(), SketchLine_2.result())
+SketchConstraintCoincidence_11.setName("SketchConstraintCoincidence_14")
+SketchConstraintLength_3 = Sketch_1.setLength(SketchLine_7.result(), 1)
+SketchLine_8 = Sketch_1.addLine(15, 0, 0, 0)
+SketchLine_8.setName("SketchLine_9")
+SketchLine_8.result().setName("SketchLine_9")
+SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchLine_5.startPoint(), SketchLine_8.startPoint())
+SketchConstraintCoincidence_12.setName("SketchConstraintCoincidence_15")
+SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchAPI_Line(SketchLine_3).startPoint(), SketchLine_8.endPoint())
+SketchConstraintCoincidence_13.setName("SketchConstraintCoincidence_16")
+SketchConstraintCoincidence_14 = Sketch_1.setCoincident(SketchArc_1.startPoint(), SketchLine_3.result())
+SketchConstraintCoincidence_14.setName("SketchConstraintCoincidence_17")
+model.do()
+Edge_1_objects = [model.selection("EDGE", "Sketch_1/Edge-SketchArc_1_2"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_1"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_6"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_7"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_8"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_2"), model.selection("EDGE", "Sketch_1/Edge-SketchLine_9")]
+Edge_1 = model.addEdge(Part_1_doc, Edge_1_objects)
+Revolution_1_objects = [model.selection("EDGE", "Edge_1_1"), model.selection("EDGE", "Edge_1_2"), model.selection("EDGE", "Edge_1_3"), model.selection("EDGE", "Edge_1_4"), model.selection("EDGE", "Edge_1_5"), model.selection("EDGE", "Edge_1_6"), model.selection("EDGE", "Edge_1_7")]
+Revolution_1 = model.addRevolution(Part_1_doc, Revolution_1_objects, model.selection("EDGE", "PartSet/OZ"), 360, 0)
+Sketch_2 = model.addSketch(Part_1_doc, model.standardPlane("XOZ"))
+SketchProjection_3 = Sketch_2.addProjection(model.selection("VERTEX", "Sketch_1/Vertex-SketchLine_2e"), False)
+SketchPoint_1 = SketchProjection_3.createdFeature()
+SketchProjection_4 = Sketch_2.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_2"), False)
+SketchLine_9 = SketchProjection_4.createdFeature()
+SketchLine_9.setName("SketchLine_11")
+SketchLine_9.result().setName("SketchLine_11")
+SketchLine_10 = Sketch_2.addLine(1.5, -3, -1.5, -3)
+SketchLine_10.setName("SketchLine_10")
+SketchLine_10.result().setName("SketchLine_10")
+SketchConstraintCoincidence_15 = Sketch_2.setCoincident(SketchLine_10.startPoint(), SketchLine_9.result())
+SketchConstraintCoincidence_15.setName("SketchConstraintCoincidence_18")
+SketchLine_11 = Sketch_2.addLine(-1.5, -3, -1, -5)
+SketchLine_11.setName("SketchLine_12")
+SketchLine_11.result().setName("SketchLine_12")
+SketchConstraintCoincidence_16 = Sketch_2.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint())
+SketchConstraintCoincidence_16.setName("SketchConstraintCoincidence_19")
+SketchLine_12 = Sketch_2.addLine(-1, -5, 1, -5)
+SketchLine_12.setName("SketchLine_13")
+SketchLine_12.result().setName("SketchLine_13")
+SketchConstraintCoincidence_17 = Sketch_2.setCoincident(SketchLine_11.endPoint(), SketchLine_12.startPoint())
+SketchConstraintCoincidence_17.setName("SketchConstraintCoincidence_20")
+SketchLine_13 = Sketch_2.addLine(1, -5, 1.5, -3)
+SketchLine_13.setName("SketchLine_14")
+SketchLine_13.result().setName("SketchLine_14")
+SketchConstraintCoincidence_18 = Sketch_2.setCoincident(SketchLine_12.endPoint(), SketchLine_13.startPoint())
+SketchConstraintCoincidence_18.setName("SketchConstraintCoincidence_21")
+SketchConstraintCoincidence_19 = Sketch_2.setCoincident(SketchLine_10.startPoint(), SketchLine_13.endPoint())
+SketchConstraintCoincidence_19.setName("SketchConstraintCoincidence_22")
+SketchConstraintHorizontal_2 = Sketch_2.setHorizontal(SketchLine_12.result())
+SketchProjection_5 = Sketch_2.addProjection(model.selection("EDGE", "Sketch_1/Edge-SketchLine_2"), False)
+SketchLine_14 = SketchProjection_5.createdFeature()
+SketchLine_14.setName("SketchLine_15")
+SketchLine_14.result().setName("SketchLine_15")
+SketchConstraintCoincidence_20 = Sketch_2.setCoincident(SketchLine_11.startPoint(), SketchLine_14.result())
+SketchConstraintCoincidence_20.setName("SketchConstraintCoincidence_23")
+SketchPoint_2 = Sketch_2.addPoint(-5.903605550615992e-026, -5)
+SketchConstraintCoincidence_21 = Sketch_2.setCoincident(SketchPoint_2.coordinates(), SketchLine_12.result())
+SketchConstraintCoincidence_21.setName("SketchConstraintCoincidence_24")
+SketchConstraintMiddle_1 = Sketch_2.setMiddlePoint(SketchPoint_2.coordinates(), SketchLine_12.result())
+SketchProjection_6 = Sketch_2.addProjection(model.selection("EDGE", "PartSet/OZ"), False)
+SketchLine_15 = SketchProjection_6.createdFeature()
+SketchLine_15.setName("SketchLine_16")
+SketchLine_15.result().setName("SketchLine_16")
+SketchConstraintCoincidence_22 = Sketch_2.setCoincident(SketchPoint_2.coordinates(), SketchLine_15.result())
+SketchConstraintCoincidence_22.setName("SketchConstraintCoincidence_25")
+SketchConstraintDistance_2 = Sketch_2.setDistance(SketchLine_11.endPoint(), SketchLine_10.result(), 2, True)
+SketchConstraintLength_4 = Sketch_2.setLength(SketchLine_10.result(), 3)
+SketchConstraintMiddle_2 = Sketch_2.setMiddlePoint(SketchAPI_Line(SketchLine_9).endPoint(), SketchLine_10.result())
+SketchConstraintLength_5 = Sketch_2.setLength(SketchLine_12.result(), 2)
+model.do()
+Edge_2_objects = [model.selection("EDGE", "Sketch_2/Edge-SketchLine_12"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_13"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_14"), model.selection("EDGE", "Sketch_2/Edge-SketchLine_10")]
+Edge_2 = model.addEdge(Part_1_doc, Edge_2_objects)
+Extrusion_1_objects = [model.selection("EDGE", "Edge_2_1"), model.selection("EDGE", "Edge_2_2"), model.selection("EDGE", "Edge_2_3"), model.selection("EDGE", "Edge_2_4")]
+Extrusion_1 = model.addExtrusion(Part_1_doc, Extrusion_1_objects, model.selection("EDGE", "PartSet/OY"), 3, 3)
+Sketch_3 = model.addSketch(Part_1_doc, model.selection("FACE", "Revolution_1_6"))
+SketchLine_16 = Sketch_3.addLine(-15, 0, -10, 2.951677693621839e-024)
+SketchLine_16.setName("SketchLine_17")
+SketchLine_16.result().setName("SketchLine_17")
+SketchProjection_7 = Sketch_3.addProjection(model.selection("EDGE", "Revolution_1_6/Generated_Edge_1"), False)
+SketchCircle_1 = SketchProjection_7.createdFeature()
+SketchConstraintCoincidence_23 = Sketch_3.setCoincident(SketchLine_16.startPoint(), SketchCircle_1.results()[1])
+SketchConstraintCoincidence_23.setName("SketchConstraintCoincidence_26")
+SketchLine_17 = Sketch_3.addLine(-10, 2.951677693621839e-024, -10, -3)
+SketchLine_17.setName("SketchLine_18")
+SketchLine_17.result().setName("SketchLine_18")
+SketchConstraintCoincidence_24 = Sketch_3.setCoincident(SketchLine_16.endPoint(), SketchLine_17.startPoint())
+SketchConstraintCoincidence_24.setName("SketchConstraintCoincidence_27")
+SketchLine_18 = Sketch_3.addLine(-10, -3, -14.69693845669907, -3)
+SketchLine_18.setName("SketchLine_19")
+SketchLine_18.result().setName("SketchLine_19")
+SketchConstraintCoincidence_25 = Sketch_3.setCoincident(SketchLine_17.endPoint(), SketchLine_18.startPoint())
+SketchConstraintCoincidence_25.setName("SketchConstraintCoincidence_28")
+SketchConstraintCoincidence_26 = Sketch_3.setCoincident(SketchLine_18.endPoint(), SketchCircle_1.results()[1])
+SketchConstraintCoincidence_26.setName("SketchConstraintCoincidence_29")
+SketchConstraintVertical_3 = Sketch_3.setVertical(SketchLine_17.result())
+SketchConstraintCoincidence_27 = Sketch_3.setCoincident(SketchLine_16.result(), SketchAPI_Circle(SketchCircle_1).center())
+SketchConstraintCoincidence_27.setName("SketchConstraintCoincidence_30")
+SketchConstraintParallel_1 = Sketch_3.setParallel(SketchLine_16.result(), SketchLine_18.result())
+SketchConstraintLength_6 = Sketch_3.setLength(SketchLine_16.result(), 5)
+SketchConstraintLength_7 = Sketch_3.setLength(SketchLine_17.result(), 3)
+SketchConstraintMirror_1 = Sketch_3.addMirror(SketchLine_16.result(), [SketchLine_17.result(), SketchLine_18.result()])
+[SketchLine_19, SketchLine_20] = SketchConstraintMirror_1.mirrored()
+SketchLine_20.setName("SketchLine_21")
+SketchLine_20.result().setName("SketchLine_21")
+SketchLine_19.setName("SketchLine_20")
+SketchLine_19.result().setName("SketchLine_20")
+SketchLine_21 = Sketch_3.addLine(-1.5, -2, 2, -2)
+SketchLine_21.setName("SketchLine_22")
+SketchLine_21.result().setName("SketchLine_22")
+SketchLine_22 = Sketch_3.addLine(2, -2, 2, 2)
+SketchLine_22.setName("SketchLine_23")
+SketchLine_22.result().setName("SketchLine_23")
+SketchConstraintCoincidence_28 = Sketch_3.setCoincident(SketchLine_21.endPoint(), SketchLine_22.startPoint())
+SketchConstraintCoincidence_28.setName("SketchConstraintCoincidence_31")
+SketchLine_23 = Sketch_3.addLine(2, 2, -1.5, 2)
+SketchLine_23.setName("SketchLine_24")
+SketchLine_23.result().setName("SketchLine_24")
+SketchConstraintCoincidence_29 = Sketch_3.setCoincident(SketchLine_22.endPoint(), SketchLine_23.startPoint())
+SketchConstraintCoincidence_29.setName("SketchConstraintCoincidence_32")
+SketchProjection_8 = Sketch_3.addProjection(model.selection("EDGE", "PartSet/OX"), False)
+SketchLine_24 = SketchProjection_8.createdFeature()
+SketchLine_24.setName("SketchLine_25")
+SketchLine_24.result().setName("SketchLine_25")
+SketchConstraintCoincidence_30 = Sketch_3.setCoincident(SketchLine_16.startPoint(), SketchLine_24.result())
+SketchConstraintCoincidence_30.setName("SketchConstraintCoincidence_33")
+SketchConstraintHorizontal_3 = Sketch_3.setHorizontal(SketchLine_23.result())
+SketchConstraintHorizontal_4 = Sketch_3.setHorizontal(SketchLine_21.result())
+SketchConstraintVertical_4 = Sketch_3.setVertical(SketchLine_22.result())
+SketchArc_2 = Sketch_3.addArc(0, 0, -1.5, -2, -1.5, 2, True)
+SketchConstraintCoincidence_31 = Sketch_3.setCoincident(SketchAPI_Circle(SketchCircle_1).center(), SketchArc_2.center())
+SketchConstraintCoincidence_31.setName("SketchConstraintCoincidence_34")
+SketchConstraintCoincidence_32 = Sketch_3.setCoincident(SketchArc_2.startPoint(), SketchLine_21.startPoint())
+SketchConstraintCoincidence_32.setName("SketchConstraintCoincidence_35")
+SketchConstraintCoincidence_33 = Sketch_3.setCoincident(SketchArc_2.endPoint(), SketchLine_23.endPoint())
+SketchConstraintCoincidence_33.setName("SketchConstraintCoincidence_36")
+SketchPoint_3 = Sketch_3.addPoint(2, 0)
+SketchConstraintCoincidence_34 = Sketch_3.setCoincident(SketchPoint_3.coordinates(), SketchLine_22.result())
+SketchConstraintCoincidence_34.setName("SketchConstraintCoincidence_37")
+SketchConstraintCoincidence_35 = Sketch_3.setCoincident(SketchPoint_3.coordinates(), SketchLine_24.result())
+SketchConstraintCoincidence_35.setName("SketchConstraintCoincidence_38")
+SketchConstraintMiddle_3 = Sketch_3.setMiddlePoint(SketchPoint_3.coordinates(), SketchLine_22.result())
+SketchLine_25 = Sketch_3.addLine(-1.5, -2, -1.5, 2)
+SketchLine_25.setName("SketchLine_26")
+SketchLine_25.result().setName("SketchLine_26")
+SketchLine_25.setAuxiliary(True)
+SketchConstraintCoincidence_36 = Sketch_3.setCoincident(SketchLine_21.startPoint(), SketchLine_25.startPoint())
+SketchConstraintCoincidence_36.setName("SketchConstraintCoincidence_39")
+SketchConstraintCoincidence_37 = Sketch_3.setCoincident(SketchLine_23.endPoint(), SketchLine_25.endPoint())
+SketchConstraintCoincidence_37.setName("SketchConstraintCoincidence_40")
+SketchProjection_9 = Sketch_3.addProjection(model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_12s-SketchLine_10e"), False)
+SketchPoint_4 = SketchProjection_9.createdFeature()
+SketchConstraintCoincidence_38 = Sketch_3.setCoincident(SketchAPI_Point(SketchPoint_4).coordinates(), SketchLine_25.result())
+SketchConstraintCoincidence_38.setName("SketchConstraintCoincidence_41")
+SketchConstraintLength_8 = Sketch_3.setLength(SketchLine_25.result(), 4)
+SketchProjection_10 = Sketch_3.addProjection(model.selection("VERTEX", "Sketch_2/Vertex-SketchLine_10s-SketchLine_14e"), False)
+SketchPoint_5 = SketchProjection_10.createdFeature()
+SketchConstraintDistance_3 = Sketch_3.setDistance(SketchAPI_Point(SketchPoint_5).coordinates(), SketchLine_22.result(), 0.5, True)
+SketchLine_26 = Sketch_3.addLine(-7.5, -7.382311001750988e-022, -7.5, -3)
+SketchLine_26.setName("SketchLine_27")
+SketchLine_26.result().setName("SketchLine_27")
+SketchConstraintVertical_5 = Sketch_3.setVertical(SketchLine_26.result())
+SketchConstraintCoincidence_39 = Sketch_3.setCoincident(SketchLine_26.startPoint(), SketchLine_16.result())
+SketchConstraintCoincidence_39.setName("SketchConstraintCoincidence_42")
+SketchConstraintCoincidence_40 = Sketch_3.setCoincident(SketchLine_26.endPoint(), SketchLine_18.result())
+SketchConstraintCoincidence_40.setName("SketchConstraintCoincidence_43")
+SketchLine_27 = Sketch_3.addLine(-7.5, -7.382311001750988e-022, -2.500000000000019, -5.187200122832181e-016)
+SketchLine_27.setName("SketchLine_28")
+SketchLine_27.result().setName("SketchLine_28")
+SketchConstraintCoincidence_41 = Sketch_3.setCoincident(SketchLine_26.startPoint(), SketchLine_27.startPoint())
+SketchConstraintCoincidence_41.setName("SketchConstraintCoincidence_44")
+SketchConstraintCoincidence_42 = Sketch_3.setCoincident(SketchLine_27.endPoint(), SketchArc_2.results()[1])
+SketchConstraintCoincidence_42.setName("SketchConstraintCoincidence_45")
+SketchConstraintHorizontal_5 = Sketch_3.setHorizontal(SketchLine_27.result())
+SketchConstraintDistance_4 = Sketch_3.setDistance(SketchLine_17.startPoint(), SketchLine_26.result(), 2.5, True)
+SketchLine_28 = Sketch_3.addLine(2, 0, 11, 0)
+SketchLine_28.setName("SketchLine_29")
+SketchLine_28.result().setName("SketchLine_29")
+SketchConstraintCoincidence_43 = Sketch_3.setCoincident(SketchPoint_3.coordinates(), SketchLine_28.startPoint())
+SketchConstraintCoincidence_43.setName("SketchConstraintCoincidence_46")
+SketchConstraintCoincidence_44 = Sketch_3.setCoincident(SketchLine_28.endPoint(), SketchLine_24.result())
+SketchConstraintCoincidence_44.setName("SketchConstraintCoincidence_47")
+SketchLine_29 = Sketch_3.addLine(15, 0, 14, 0)
+SketchLine_29.setName("SketchLine_30")
+SketchLine_29.result().setName("SketchLine_30")
+SketchProjection_11 = Sketch_3.addProjection(model.selection("VERTEX", "Revolution_1_6/Generated_Edge_1"), False)
+SketchPoint_6 = SketchProjection_11.createdFeature()
+SketchConstraintCoincidence_45 = Sketch_3.setCoincident(SketchLine_29.startPoint(), SketchPoint_6.result())
+SketchConstraintCoincidence_45.setName("SketchConstraintCoincidence_48")
+SketchConstraintCoincidence_46 = Sketch_3.setCoincident(SketchLine_29.endPoint(), SketchLine_24.result())
+SketchConstraintCoincidence_46.setName("SketchConstraintCoincidence_49")
+SketchConstraintDistance_5 = Sketch_3.setDistance(SketchLine_28.endPoint(), SketchLine_29.endPoint(), 3, True)
+SketchConstraintLength_9 = Sketch_3.setLength(SketchLine_29.result(), 1)
+SketchLine_30 = Sketch_3.addLine(11, 0, 11, -2.000000000000004)
+SketchLine_30.setName("SketchLine_31")
+SketchLine_30.result().setName("SketchLine_31")
+SketchConstraintCoincidence_47 = Sketch_3.setCoincident(SketchLine_28.endPoint(), SketchLine_30.startPoint())
+SketchConstraintCoincidence_47.setName("SketchConstraintCoincidence_50")
+SketchLine_31 = Sketch_3.addLine(9.500000000000002, 2.627360613063856e-019, 9.5, -2.000000000000004)
+SketchLine_31.setName("SketchLine_32")
+SketchLine_31.result().setName("SketchLine_32")
+SketchConstraintCoincidence_48 = Sketch_3.setCoincident(SketchLine_31.startPoint(), SketchLine_28.result())
+SketchConstraintCoincidence_48.setName("SketchConstraintCoincidence_51")
+SketchLine_32 = Sketch_3.addLine(8, -1.882265929199326e-020, 8, -2.000000000000004)
+SketchLine_32.setName("SketchLine_33")
+SketchLine_32.result().setName("SketchLine_33")
+SketchConstraintCoincidence_49 = Sketch_3.setCoincident(SketchLine_32.startPoint(), SketchLine_28.result())
+SketchConstraintCoincidence_49.setName("SketchConstraintCoincidence_52")
+SketchLine_33 = Sketch_3.addLine(5, -3.396138881322731e-022, 5, -2.000000000000004)
+SketchLine_33.setName("SketchLine_34")
+SketchLine_33.result().setName("SketchLine_34")
+SketchConstraintCoincidence_50 = Sketch_3.setCoincident(SketchLine_33.startPoint(), SketchLine_28.result())
+SketchConstraintCoincidence_50.setName("SketchConstraintCoincidence_53")
+SketchLine_34 = Sketch_3.addLine(5, -2.000000000000004, 11, -2.000000000000004)
+SketchLine_34.setName("SketchLine_35")
+SketchLine_34.result().setName("SketchLine_35")
+SketchLine_34.setAuxiliary(True)
+SketchConstraintCoincidence_51 = Sketch_3.setCoincident(SketchLine_33.endPoint(), SketchLine_34.startPoint())
+SketchConstraintCoincidence_51.setName("SketchConstraintCoincidence_54")
+SketchConstraintCoincidence_52 = Sketch_3.setCoincident(SketchLine_30.endPoint(), SketchLine_34.endPoint())
+SketchConstraintCoincidence_52.setName("SketchConstraintCoincidence_55")
+SketchConstraintVertical_6 = Sketch_3.setVertical(SketchLine_33.result())
+SketchConstraintVertical_7 = Sketch_3.setVertical(SketchLine_32.result())
+SketchConstraintVertical_8 = Sketch_3.setVertical(SketchLine_31.result())
+SketchConstraintVertical_9 = Sketch_3.setVertical(SketchLine_30.result())
+SketchConstraintHorizontal_6 = Sketch_3.setHorizontal(SketchLine_34.result())
+SketchConstraintCoincidence_53 = Sketch_3.setCoincident(SketchLine_32.endPoint(), SketchLine_34.result())
+SketchConstraintCoincidence_53.setName("SketchConstraintCoincidence_56")
+SketchConstraintCoincidence_54 = Sketch_3.setCoincident(SketchLine_31.endPoint(), SketchLine_34.result())
+SketchConstraintCoincidence_54.setName("SketchConstraintCoincidence_57")
+SketchConstraintDistance_6 = Sketch_3.setDistance(SketchLine_21.endPoint(), SketchLine_33.result(), 3, True)
+SketchConstraintDistance_7 = Sketch_3.setDistance(SketchLine_33.endPoint(), SketchLine_32.result(), 3, True)
+SketchConstraintDistance_8 = Sketch_3.setDistance(SketchLine_32.endPoint(), SketchLine_31.result(), 1.5, True)
+SketchConstraintDistance_9 = Sketch_3.setDistance(SketchLine_31.endPoint(), SketchLine_30.result(), 1.5, True)
+SketchConstraintCoincidence_55 = Sketch_3.setCoincident(SketchLine_33.endPoint(), SketchLine_21.result())
+SketchConstraintCoincidence_55.setName("SketchConstraintCoincidence_58")
+SketchConstraintMirror_2_objects = [SketchLine_33.result(), SketchLine_32.result(), SketchLine_31.result(), SketchLine_30.result()]
+SketchConstraintMirror_2 = Sketch_3.addMirror(SketchLine_24.result(), SketchConstraintMirror_2_objects)
+[SketchLine_35, SketchLine_36, SketchLine_37, SketchLine_38] = SketchConstraintMirror_2.mirrored()
+SketchLine_38.setName("SketchLine_39")
+SketchLine_38.result().setName("SketchLine_39")
+SketchLine_37.setName("SketchLine_38")
+SketchLine_37.result().setName("SketchLine_38")
+SketchLine_36.setName("SketchLine_37")
+SketchLine_36.result().setName("SketchLine_37")
+SketchLine_35.setName("SketchLine_36")
+SketchLine_35.result().setName("SketchLine_36")
+model.end()
+
+assert(model.checkPythonDump())
diff --git a/src/FeaturesPlugin/Test/Test2520.py b/src/FeaturesPlugin/Test/Test2520.py
new file mode 100644 (file)
index 0000000..206998d
--- /dev/null
@@ -0,0 +1,91 @@
+## 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<mailto:webmaster.salome@opencascade.com>
+##
+
+# -*- coding: utf-8 -*-
+
+from SketchAPI import *
+
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Sketch_1 = model.addSketch(Part_1_doc, model.defaultPlane("XOY"))
+SketchLine_1 = Sketch_1.addLine(7.823413936076148e-032, 6, 18, 6)
+SketchLine_2 = Sketch_1.addLine(18, 6, 18, 10)
+SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint())
+SketchLine_3 = Sketch_1.addLine(18, 10, 63, 10)
+SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint())
+SketchLine_4 = Sketch_1.addLine(63, 10, 63, 8.999999999999995)
+SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.startPoint())
+SketchLine_5 = Sketch_1.addLine(63, 8.999999999999995, 66, 8.999999999999995)
+SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_5.startPoint())
+SketchLine_6 = Sketch_1.addLine(66, 8.999999999999995, 66, 18)
+SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchLine_5.endPoint(), SketchLine_6.startPoint())
+SketchLine_7 = Sketch_1.addLine(66, 18, 70, 18)
+SketchConstraintCoincidence_6 = Sketch_1.setCoincident(SketchLine_6.endPoint(), SketchLine_7.startPoint())
+SketchLine_8 = Sketch_1.addLine(70, 18, 70, 6.999999999999999)
+SketchConstraintCoincidence_7 = Sketch_1.setCoincident(SketchLine_7.endPoint(), SketchLine_8.startPoint())
+SketchLine_9 = Sketch_1.addLine(70, 6.999999999999999, 38, 6.999999999999999)
+SketchConstraintCoincidence_8 = Sketch_1.setCoincident(SketchLine_8.endPoint(), SketchLine_9.startPoint())
+SketchLine_10 = Sketch_1.addLine(38, 6.999999999999999, 34, 1.232595164407831e-032)
+SketchConstraintCoincidence_9 = Sketch_1.setCoincident(SketchLine_9.endPoint(), SketchLine_10.startPoint())
+SketchLine_11 = Sketch_1.addLine(34, 1.232595164407831e-032, 7.823413936076148e-032, 1.232595164407831e-032)
+SketchConstraintCoincidence_10 = Sketch_1.setCoincident(SketchLine_10.endPoint(), SketchLine_11.startPoint())
+SketchLine_12 = Sketch_1.addLine(7.823413936076148e-032, 1.232595164407831e-032, 7.823413936076148e-032, 6)
+SketchConstraintCoincidence_11 = Sketch_1.setCoincident(SketchLine_11.endPoint(), SketchLine_12.startPoint())
+SketchConstraintCoincidence_12 = Sketch_1.setCoincident(SketchLine_1.startPoint(), SketchLine_12.endPoint())
+SketchConstraintHorizontal_1 = Sketch_1.setHorizontal(SketchLine_11.result())
+SketchConstraintHorizontal_2 = Sketch_1.setHorizontal(SketchLine_1.result())
+SketchConstraintHorizontal_3 = Sketch_1.setHorizontal(SketchLine_3.result())
+SketchConstraintHorizontal_4 = Sketch_1.setHorizontal(SketchLine_9.result())
+SketchConstraintHorizontal_5 = Sketch_1.setHorizontal(SketchLine_5.result())
+SketchConstraintHorizontal_6 = Sketch_1.setHorizontal(SketchLine_7.result())
+SketchConstraintVertical_1 = Sketch_1.setVertical(SketchLine_6.result())
+SketchConstraintVertical_2 = Sketch_1.setVertical(SketchLine_4.result())
+SketchConstraintVertical_3 = Sketch_1.setVertical(SketchLine_2.result())
+SketchConstraintVertical_4 = Sketch_1.setVertical(SketchLine_12.result())
+SketchConstraintVertical_5 = Sketch_1.setVertical(SketchLine_8.result())
+SketchConstraintDistance_1 = Sketch_1.setDistance(SketchLine_12.startPoint(), SketchLine_8.result(), 70, True)
+SketchConstraintLength_1 = Sketch_1.setLength(SketchLine_1.result(), 18)
+SketchConstraintDistance_2 = Sketch_1.setDistance(SketchLine_4.startPoint(), SketchLine_5.result(), 1, True)
+SketchConstraintLength_2 = Sketch_1.setLength(SketchLine_5.result(), 3)
+SketchConstraintLength_3 = Sketch_1.setLength(SketchLine_7.result(), 4)
+SketchConstraintDistance_3 = Sketch_1.setDistance(SketchLine_7.endPoint(), SketchLine_11.result(), 18, True)
+SketchConstraintLength_4 = Sketch_1.setLength(SketchLine_12.result(), 6)
+SketchConstraintDistance_4 = Sketch_1.setDistance(SketchLine_12.startPoint(), SketchLine_3.result(), 10, True)
+SketchConstraintDistance_5 = Sketch_1.setDistance(SketchLine_11.startPoint(), SketchLine_8.result(), 36, True)
+SketchConstraintDistance_6 = Sketch_1.setDistance(SketchLine_11.startPoint(), SketchLine_9.result(), 7, True)
+SketchConstraintLength_5 = Sketch_1.setLength(SketchLine_9.result(), 32)
+SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False)
+SketchPoint_1 = SketchProjection_1.createdFeature()
+SketchConstraintCoincidence_13 = Sketch_1.setCoincident(SketchLine_12.startPoint(), SketchAPI_Point(SketchPoint_1).coordinates())
+SketchLine_13 = Sketch_1.addLine(0, 0, 70, 0)
+SketchLine_13.setAuxiliary(True)
+SketchConstraintCoincidence_14 = Sketch_1.setCoincident(SketchLine_13.startPoint(), SketchAPI_Point(SketchPoint_1).coordinates())
+SketchConstraintHorizontal_7 = Sketch_1.setHorizontal(SketchLine_13.result())
+SketchConstraintCoincidence_15 = Sketch_1.setCoincident(SketchLine_13.endPoint(), SketchLine_8.result())
+model.do()
+Revolution_1 = model.addRevolution(Part_1_doc, [model.selection("FACE", "Sketch_1/Face-SketchLine_1r-SketchLine_2r-SketchLine_3r-SketchLine_4r-SketchLine_5r-SketchLine_6r-SketchLine_7r-SketchLine_8r-SketchLine_9r-SketchLine_10r-SketchLine_11r-SketchLine_12r")], model.selection("EDGE", "Sketch_1/Edge-SketchLine_13"), 360, 0)
+model.do()
+# check that naming of the revolution is correct
+model.testHaveNamingSubshapes(Revolution_1, model, Part_1_doc)
+model.end()
index 6155c39237185d0a6d6becafcef6d7014be38c44..1a8ea5507f9518ca3810ac4bb6ba615e21bbfe6d 100755 (executable)
@@ -385,7 +385,9 @@ static void keepTopLevelShapes(ListOfShape& theShapes, const TopoDS_Shape& theRo
   ListOfShape::iterator anIt = theShapes.begin();
   while (anIt != theShapes.end()) {
     TopoDS_Shape aNewShape = (*anIt)->impl<TopoDS_Shape>();
-    if (theRoot.IsSame(aNewShape) || (theResultShape &&
+    bool aSkip = aNewShape.IsNull() ||
+      (aNewShape.ShapeType() == TopAbs_EDGE && BRep_Tool::Degenerated(TopoDS::Edge(aNewShape)));
+    if (aSkip || theRoot.IsSame(aNewShape) || (theResultShape &&
         (!theResultShape->isSubShape(*anIt, false) || theResultShape->isSame(*anIt)))) {
       ListOfShape::iterator aRemoveIt = anIt++;
       theShapes.erase(aRemoveIt);
index 737a63d25df6cfeab3d39769e870f5ad5be33e4f..a0c8a519b703a5ad4640a088b4e23d016fb1bf2e 100644 (file)
@@ -111,6 +111,21 @@ int Model_ResultConstruction::facesNum()
       }
     }
     myFacesUpToDate = true;
+
+    // update all the faces and sub-elements in the naming structure
+    DocumentPtr anEmptyExt;
+    bool aNotExt = false;
+    TDF_Label aDataLab = startLabel(anEmptyExt, aNotExt);
+    TDF_ChildIterator aSubsIter(aDataLab, Standard_False);
+    for(; aSubsIter.More(); aSubsIter.Next()) {
+      const TDF_Label aLab = aSubsIter.Value();
+      if (aLab.Tag() == 1) // skip the root shape label
+        continue;
+      Handle(TNaming_NamedShape) aNS;
+      if (aLab.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
+        update(aLab.Tag() - 1, anEmptyExt, aNotExt);
+      }
+    }
   }
   return int(myFaces.size());
 }
@@ -132,7 +147,7 @@ void Model_ResultConstruction::setInfinite(const bool theInfinite)
 
 void Model_ResultConstruction::setIsConcealed(const bool theValue)
 {
-  // do nothing: the construction element is never consealed
+  // do nothing: the construction element is never concealed
 }
 
 static const int kSTART_VERTEX_DELTA = 1000000;
@@ -650,7 +665,7 @@ bool Model_ResultConstruction::update(const int theIndex,
     Handle(TDF_Reference) aRef;
     if (aLab.FindAttribute(TDF_Reference::GetID(), aRef)) {
       int aFaceIndex = aRef->Get().Tag();
-      // don't check selection ,since face may disappear, but the shape stays correct
+      // don't check selection since face may disappear, but the shape stays correct
       Model_ResultConstruction::update(aFaceIndex, theExtDoc, theModified);
     }
     // getting a type of selected shape
index 992e9dd26d1636192c32c5d6e7ea6911beca5dbc..08d373d5d39d8522300b2c708d1c5d579367ca33 100644 (file)
@@ -66,7 +66,7 @@ ModuleBase_ParamSpinBox::ModuleBase_ParamSpinBox(QWidget* theParent, int thePrec
   myValidator = new QDoubleValidator(this);
   myValidator->setLocale(locale());
   myValidator->setRange(myMinimum, myMaximum);
-  myValidator->setDecimals(3);
+  myValidator->setDecimals(myPrecision);
 }
 
 void ModuleBase_ParamSpinBox::setCompletionList(QStringList& theList)
index 696bf0cd79bf4ad1e3e812587502566017bf46e7..09a10ca3cfa888e3afbea8df5c6df3a4e4ba46ee 100644 (file)
@@ -51,7 +51,7 @@ public:
    \param theParent a parent object
    \param thePrecision a precision of values display
    */
-  ModuleBase_ParamSpinBox( QWidget* theParent = 0, int thePrecision = -12 );
+  ModuleBase_ParamSpinBox( QWidget* theParent = 0, int thePrecision = 12 );
 
   /// Set list of completion strings
   void setCompletionList(QStringList&);
index 720a0ea9c763a169456ffc8677395a8e3a22c595..1781e96ae3fb8d8807883b5c3b0cfbdd5fefc5ee 100755 (executable)
@@ -141,7 +141,12 @@ void PartSet_OperationPrs::Compute(
         setWidth(aDrawer, aWidth);
       }
     }
-    StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+    try {
+      StdPrs_WFShape::Add(thePresentation, aShape, aDrawer);
+    }
+    catch (...) {
+      return;
+    }
   }
   Set(aComp);
   if (!aReadyToDisplay) {
index ff7ce4dddedba4ee5d7a50b337c0b9d754370673..89a120d10c05823bf2b0c41461610e8f6e0484e0 100644 (file)
@@ -226,15 +226,19 @@ def testHaveNamingByType(theFeature, theModel, thePartDoc, theSubshapeType) :
     shapeExplorer = GeomAPI_ShapeExplorer(shape, theSubshapeType)
     # Create list, and store selections in it
     while shapeExplorer.more():
+      current = shapeExplorer.current()
+      if current.isEdge() and GeomAPI.GeomAPI_Edge(current).isDegenerated(): # skip degenerative edges because they are not selected
+        shapeExplorer.next()
+        continue
       aDuplicate = False
       for alreadyThere in shapesList:
-        if alreadyThere.isSame(shapeExplorer.current()):
+        if alreadyThere.isSame(current):
           aDuplicate = True
       if aDuplicate:
         shapeExplorer.next()
         continue
-      shapesList.append(shapeExplorer.current())
-      selection = theModel.selection(aResult, shapeExplorer.current()) # First argument should be result/sub-result, second is sub-shape on this result/sub-result
+      shapesList.append(current)
+      selection = theModel.selection(aResult, current) # First argument should be result/sub-result, second is sub-shape on this result/sub-result
       selectionList.append(selection)
       shapeExplorer.next()
   # Create group with this selection list
index 20524c9030f8fa31d56b65aa199c8ec559f6b905..d764e275396b0d26d473e15d812fed3d7d85c6dd 100644 (file)
@@ -694,9 +694,9 @@ void SHAPERGUI::createPreferences()
 
   int sensitivityGroup = pref->addItem(tr("Selection sensitivity"), viewTab);
   pref->setItemProperty("columns", 2, sensitivityGroup);
-  pref->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::Double,
+  pref->addItem(tr("Vertex"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin,
                 ModuleBase_Preferences::VIEWER_SECTION, "point-selection-sensitivity");
-  pref->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::Double,
+  pref->addItem(tr("Edge"), sensitivityGroup, SUIT_PreferenceMgr::DblSpin,
                 ModuleBase_Preferences::VIEWER_SECTION, "edge-selection-sensitivity");
   pref->retrieve();
 }