From fec33ea37fbbd369bda3da328abf6171d08a6c42 Mon Sep 17 00:00:00 2001 From: azv Date: Wed, 16 May 2018 12:33:36 +0300 Subject: [PATCH] Issue #2481: Application error when create fillet Improve searching and grouping of coincident points. --- src/SketchPlugin/CMakeLists.txt | 1 + src/SketchPlugin/SketchPlugin_Tools.cpp | 13 +++--- src/SketchPlugin/Test/Test2481.py | 60 +++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 src/SketchPlugin/Test/Test2481.py diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 789bb9508..2e5f42bc7 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -237,6 +237,7 @@ ADD_UNIT_TESTS(TestSketchPointLine.py Test2440.py Test2157.py Test2157_2.py + Test2481.py ) if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE}) diff --git a/src/SketchPlugin/SketchPlugin_Tools.cpp b/src/SketchPlugin/SketchPlugin_Tools.cpp index fb6401e11..6fc020ddb 100644 --- a/src/SketchPlugin/SketchPlugin_Tools.cpp +++ b/src/SketchPlugin/SketchPlugin_Tools.cpp @@ -191,11 +191,14 @@ public: std::list< std::set >::iterator aFound1 = find(thePoint1); std::list< std::set >::iterator aFound2 = find(thePoint2); if (aFound1 == myCoincidentPoints.end()) { - std::set aNewSet; - aNewSet.insert(thePoint1); - if (thePoint2) - aNewSet.insert(thePoint2); - myCoincidentPoints.push_back(aNewSet); + if (aFound2 == myCoincidentPoints.end()) { + std::set aNewSet; + aNewSet.insert(thePoint1); + if (thePoint2) + aNewSet.insert(thePoint2); + myCoincidentPoints.push_back(aNewSet); + } else + aFound2->insert(thePoint1); } else if (aFound2 == myCoincidentPoints.end()) { if (thePoint2) aFound1->insert(thePoint2); diff --git a/src/SketchPlugin/Test/Test2481.py b/src/SketchPlugin/Test/Test2481.py new file mode 100644 index 000000000..83483375a --- /dev/null +++ b/src/SketchPlugin/Test/Test2481.py @@ -0,0 +1,60 @@ +## Copyright (C) 2018-20xx 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 +## + +""" + Test2481.py + Test case for issue #2481 "Application error when create fillet" +""" + +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(70, 0, 0, 0) +SketchLine_2 = Sketch_1.addLine(0, 0, 0, 45) +SketchLine_3 = Sketch_1.addLine(0, 45, 70, 45) +SketchLine_4 = Sketch_1.addLine(70, 45, 70, 0) +SketchConstraintCoincidence_1 = Sketch_1.setCoincident(SketchLine_4.endPoint(), SketchLine_1.startPoint()) +SketchConstraintCoincidence_2 = Sketch_1.setCoincident(SketchLine_1.endPoint(), SketchLine_2.startPoint()) +SketchConstraintCoincidence_3 = Sketch_1.setCoincident(SketchLine_2.endPoint(), SketchLine_3.startPoint()) +SketchConstraintCoincidence_4 = Sketch_1.setCoincident(SketchLine_3.endPoint(), SketchLine_4.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()) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchConstraintCoincidence_5 = Sketch_1.setCoincident(SketchAPI_Point(SketchPoint_1).coordinates(), SketchLine_2.startPoint()) +model.do() + +SketchFillet_1 = Sketch_1.setFillet(SketchAPI_Point(SketchPoint_1).coordinates()) +model.do() + +assert(Sketch_1.feature().error() == "") +assert(Sketch_1.solverError().value() == "") + +model.end() + +assert(model.checkPythonDump()) -- 2.39.2