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

[Sketcher] Refactor SketchObject:validateExternalLinks()

Browse Source
This commit is contained in:
Ajinkya Dahale
2024-06-29 15:52:21 +05:30
parent 9c87e26280
commit ca97889e47
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -8112,7 +8112,6 @@ void SketchObject::validateExternalLinks()
const std::string SubElement = SubElements[i];
TopoDS_Shape refSubShape;
bool removeBadLink = false;
try {
if (Obj->isDerivedFrom<Part::Datum>()) {
const Part::Datum* datum = static_cast<const Part::Datum*>(Obj);
@@ -8126,38 +8125,36 @@ void SketchObject::validateExternalLinks()
const Part::TopoShape& refShape = refObj->Shape.getShape();
refSubShape = refShape.getSubShape(SubElement.c_str());
}
continue; // no bad link needs to be removed
}
catch (Base::IndexError& indexError) {
removeBadLink = true;
Base::Console().warning(
this->getFullLabel(), (indexError.getMessage() + "\n").c_str());
}
catch (Base::ValueError& valueError) {
removeBadLink = true;
Base::Console().warning(
this->getFullLabel(), (valueError.getMessage() + "\n").c_str());
}
catch (Standard_Failure&) {
removeBadLink = true;
}
if (removeBadLink) {
rebuild = true;
Objects.erase(Objects.begin() + i);
SubElements.erase(SubElements.begin() + i);
const std::vector<Constraint*>& constraints = Constraints.getValues();
std::vector<Constraint*> newConstraints(0);
int GeoId = GeoEnum::RefExt - i;
for (const auto& constr : constraints) {
auto newConstr = getConstraintAfterDeletingGeo(constr, GeoId);
if (newConstr) {
newConstraints.push_back(newConstr.release());
}
rebuild = true;
Objects.erase(Objects.begin() + i);
SubElements.erase(SubElements.begin() + i);
const std::vector<Constraint*>& constraints = Constraints.getValues();
std::vector<Constraint*> newConstraints;
newConstraints.reserve(constraints.size());
int GeoId = GeoEnum::RefExt - i;
for (const auto& constr : constraints) {
auto newConstr = getConstraintAfterDeletingGeo(constr, GeoId);
if (newConstr) {
newConstraints.push_back(newConstr.release());
}
Constraints.setValues(std::move(newConstraints));
i--;// we deleted an item, so the next one took its place
}
Constraints.setValues(std::move(newConstraints));
i--;// we deleted an item, so the next one took its place
}
if (rebuild) {