kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Retrieve 1-based list of malformed constraints from solver

Browse Source
This commit is contained in:
Abdullah Tahiri
2021-01-04 08:59:18 +01:00
committed by abdullahtahiriyo
parent 150e50c700
commit 2bd2041bfe
4 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Sketcher/App/Sketch.cpp
View File

@@ -76,7 +76,6 @@ Sketch::Sketch()
, RecalculateInitialSolutionWhileMovingPoint(false)
, GCSsys(), ConstraintsCounter(0)
, isInitMove(false), isFine(true), moveStep(0)
, malformedConstraints(false)
, defaultSolver(GCS::DogLeg)
, defaultSolverRedundant(GCS::DogLeg)
, debugMode(GCS::Minimal)
@@ -127,7 +126,8 @@ void Sketch::clear(void)
isInitMove = false;
ConstraintsCounter = 0;
Conflicting.clear();
malformedConstraints = false;
Redundant.clear();
MalformedConstraints.clear();
}
bool Sketch::analyseBlockedGeometry( const std::vector<Part::Geometry *> &internalGeoList,
@@ -1913,8 +1913,9 @@ int Sketch::addConstraints(const std::vector<Constraint *> &ConstraintList)
rtn = addConstraint (*it);
if(rtn == -1) {
Base::Console().Error("Sketcher constraint number %d is malformed!\n",cid);
malformedConstraints = true;
int humanconstraintid = cid + 1;
Base::Console().Error("Sketcher constraint number %d is malformed!\n",humanconstraintid);
MalformedConstraints.push_back(humanconstraintid);
}
}
@@ -1932,8 +1933,9 @@ int Sketch::addConstraints(const std::vector<Constraint *> &ConstraintList,
rtn = addConstraint (*it);
if(rtn == -1) {
Base::Console().Error("Sketcher constraint number %d is malformed!\n",cid);
malformedConstraints = true;
int humanconstraintid = cid + 1;
Base::Console().Error("Sketcher constraint number %d is malformed!\n",humanconstraintid);
MalformedConstraints.push_back(humanconstraintid);
}
}
else {