From 7d409212586f8203f76fb49a2dd8e49227dd407d Mon Sep 17 00:00:00 2001 From: azv Date: Thu, 28 Dec 2017 14:31:57 +0300 Subject: [PATCH] Issue #2393: avoid "conflicting constraints" message when making angular copy of projected feature in clear sketch --- src/SketchPlugin/CMakeLists.txt | 1 + src/SketchPlugin/Test/Test2393.py | 57 +++++++++++++++++++ .../PlaneGCSSolver/PlaneGCSSolver_Solver.cpp | 3 +- 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 src/SketchPlugin/Test/Test2393.py diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index 837481e7c..1391e252a 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -230,6 +230,7 @@ ADD_UNIT_TESTS(TestSketchPointLine.py Test2287.py Test2341.py Test2390.py + Test2393.py ) if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE}) diff --git a/src/SketchPlugin/Test/Test2393.py b/src/SketchPlugin/Test/Test2393.py new file mode 100644 index 000000000..0fc461049 --- /dev/null +++ b/src/SketchPlugin/Test/Test2393.py @@ -0,0 +1,57 @@ +## Copyright (C) 2017-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 +## + +""" + Test2393.py + Test case for issue #2393 "Constraint conflict when doing an angular copy of a projected edge" +""" + + +from SketchAPI import * + +from salome.shaper import model + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 10, 10, 10) +Plane_4 = model.addPlane(Part_1_doc, model.selection("FACE", "Box_1_1/Top"), 10, False) + +Sketch_1 = model.addSketch(Part_1_doc, model.selection("FACE", "Plane_1")) +SketchProjection_1 = Sketch_1.addProjection(model.selection("VERTEX", "PartSet/Origin"), False) +SketchPoint_1 = SketchProjection_1.createdFeature() +SketchProjection_2 = Sketch_1.addProjection(model.selection("EDGE", "Box_1_1/Front&Box_1_1/Top"), True) +SketchLine_1 = SketchProjection_2.createdFeature() +SketchMultiRotation_1 = Sketch_1.addRotation([SketchLine_1.result()], SketchAPI_Point(SketchPoint_1).coordinates(), 90, 3) +[SketchLine_1, SketchLine_2, SketchLine_3] = SketchMultiRotation_1.rotated() +model.do() + +model.checkSketch(Sketch_1, 0) + +SketchLine_2 = SketchAPI_Line(SketchLine_2) +Sketch_1.move(SketchLine_2.startPoint(), SketchLine_2.startPoint().x() + 1, SketchLine_2.startPoint().y() + 1) +model.do() + +model.checkSketch(Sketch_1, 0) + +model.end() + +assert(model.checkPythonDump()) \ No newline at end of file diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp index b8d0dfe00..aaf98ef90 100644 --- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp +++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp @@ -131,7 +131,7 @@ PlaneGCSSolver_Solver::SolveStatus PlaneGCSSolver_Solver::solve() } if (myParameters.empty()) - return STATUS_INCONSISTENT; + return myConstraints.empty() ? STATUS_OK : STATUS_INCONSISTENT; GCS::SolveStatus aResult = GCS::Success; Events_LongOp::start(this); @@ -250,6 +250,7 @@ void PlaneGCSSolver_Solver::removeFictiveConstraint() if (myFictiveConstraint) { myEquationSystem->removeConstraint(myFictiveConstraint); myParameters.pop_back(); + --myDOF; GCS::VEC_pD aParams = myFictiveConstraint->params(); for (GCS::VEC_pD::iterator anIt = aParams.begin(); anIt != aParams.end(); ++ anIt) -- 2.39.2