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 makeMissingPointOnPoint
This commit is contained in:
wmayer
2024-05-28 13:40:38 +02:00
parent 8abbed295e
commit 7f00aad6aa
3 changed files with 75 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,55 +482,79 @@ void SketchAnalysis::analyseMissingPointOnPointCoincident(double angleprecision)
}
}
void SketchAnalysis::makeMissingPointOnPointCoincident(bool onebyone)
Sketcher::Constraint* SketchAnalysis::create(const ConstraintIds& id)
{
auto c = new Sketcher::Constraint();
c->Type = id.Type;
c->First = id.First;
c->Second = id.Second;
c->FirstPos = id.FirstPos;
c->SecondPos = id.SecondPos;
return c;
}
void SketchAnalysis::solveSketch(const char* errorText)
{
int status {};
int dofs {};
solvesketch(status, dofs, true);
if (status == -2) { // redundant constraints
sketch->autoRemoveRedundants(false);
solvesketch(status, dofs, false);
}
if (status) {
THROWMT(Base::RuntimeError, errorText);
}
}
void SketchAnalysis::makeConstraints(std::vector<ConstraintIds>& ids)
{
int status, dofs;
std::vector<Sketcher::Constraint*> constr;
for (const auto& it : vertexConstraints) {
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 "
"coincident constraints."));
}
}
else {
constr.push_back(c);
}
constr.reserve(ids.size());
for (const auto& it : ids) {
auto c = create(it);
constr.push_back(c);
}
if (!onebyone) {
sketch->addConstraints(constr);
}
vertexConstraints.clear();
sketch->addConstraints(constr);
ids.clear();
for (auto it : constr) {
delete it;
}
}
void SketchAnalysis::makeConstraintsOneByOne(std::vector<ConstraintIds>& ids, const char* errorText)
{
for (const auto& it : ids) {
auto c = create(it);
// addConstraint() creates a clone
sketch->addConstraint(c);
delete c;
solveSketch(errorText);
}
ids.clear();
}
void SketchAnalysis::makeMissingPointOnPointCoincident()
{
makeConstraints(vertexConstraints);
}
void SketchAnalysis::makeMissingPointOnPointCoincidentOneByOne()
{
makeConstraintsOneByOne(vertexConstraints,
QT_TRANSLATE_NOOP("Exceptions",
"Autoconstrain error: Unsolvable sketch while "
"applying coincident constraints."));
}
int SketchAnalysis::detectMissingVerticalHorizontalConstraints(double angleprecision)
{
const std::vector<Part::Geometry*>& geom = sketch->getInternalGeometry();