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

Sketch: Refactor SketchAnalysis

Browse Source 
Refactor makeMissingVerticalHorizontal
This commit is contained in:
wmayer
2024-05-28 14:08:44 +02:00
parent 5461d0d27f
commit d5c92fee98
3 changed files with 15 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/Mod/Sketcher/App/SketchAnalysis.cpp
View File

@@ -591,56 +591,17 @@ int SketchAnalysis::detectMissingVerticalHorizontalConstraints(double anglepreci
return verthorizConstraints.size();
}
void SketchAnalysis::makeMissingVerticalHorizontal(bool onebyone)
void SketchAnalysis::makeMissingVerticalHorizontal()
{
int status, dofs;
std::vector<Sketcher::Constraint*> constr;
makeConstraints(verthorizConstraints);
}
for (std::vector<Sketcher::ConstraintIds>::iterator it = verthorizConstraints.begin();
it != verthorizConstraints.end();
++it) {
Sketcher::Constraint* c = new Sketcher::Constraint();
c->Type = it->Type;
c->First = it->First;
c->Second = it->Second;
c->FirstPos = it->FirstPos;
c->SecondPos = it->SecondPos;
if (onebyone) {
// addConstraint() creates a clone
sketch->addConstraint(c);
delete c;
solvesketch(status, dofs, true);
if (status == -2) { // redundant constraints
sketch->autoRemoveRedundants(false);
solvesketch(status, dofs, false);
}
if (status) {
THROWMT(Base::RuntimeError,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while applying "
"vertical/horizontal constraints."));
}
}
else {
constr.push_back(c);
}
}
if (!onebyone) {
sketch->addConstraints(constr);
}
verthorizConstraints.clear();
for (std::vector<Sketcher::Constraint*>::iterator it = constr.begin(); it != constr.end();
++it) {
delete *it;
}
void SketchAnalysis::makeMissingVerticalHorizontalOneByOne()
{
makeConstraintsOneByOne(verthorizConstraints,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while "
"applying vertical/horizontal constraints."));
}
bool SketchAnalysis::checkVertical(Base::Vector3d dir, double angleprecision)