Issue #2393: avoid "conflicting constraints" message when making angular copy of...

diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt
index 837481e7ca2ad1b47f17e866ffad696e94bbf5da..1391e252af2ec1648c3c28ec40e872610f83874d 100644 (file)
--- 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 (file)
index 0000000..0fc4610
--- /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<mailto: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 b8d0dfe00d2a0c9e33c18545128b085786564401..aaf98ef90338ecbba27928e511662b187a6efaa7 100644 (file)
--- 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)