From: azv <azv@opencascade.com>
Date: Tue, 7 Jun 2016 05:29:53 +0000 (+0300)
Subject: Additional check redundant constraints in PlaneGCS to show the "Conflicting constrain... 
X-Git-Tag: V_2.4.0~140
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ccc0161508d69be20d6a2114b4ce4d401bd5636f;p=modules%2Fshaper.git

Additional check redundant constraints in PlaneGCS to show the "Conflicting constraints" message
---

diff --git a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp
index b7c7591af..9aa18c592 100644
--- a/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp
+++ b/src/SketchSolver/PlaneGCSSolver/PlaneGCSSolver_Solver.cpp
@@ -72,6 +72,13 @@ SketchSolver_SolveStatus PlaneGCSSolver_Solver::solve()
   // solve equations
   if (aResult == GCS::Success)
     aResult = (GCS::SolveStatus)myEquationSystem.solve(myParameters);
+  if (aResult == GCS::Success) {
+    // additionally check redundant constraints
+    GCS::VEC_I aRedundantID;
+    myEquationSystem.getRedundant(aRedundantID);
+    if (!aRedundantID.empty())
+      aResult = GCS::Failed;
+  }
   Events_LongOp::end(this);
 
   SketchSolver_SolveStatus aStatus;