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

[Sketcher] Refactor SketchObject::validateExpression()

Browse Source
This commit is contained in:
Ajinkya Dahale
2024-08-28 19:41:01 +05:30
parent cd9e418549
commit 0d1bf450e9
1 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10037,33 +10037,39 @@ std::string SketchObject::validateExpression(const App::ObjectIdentifier& path,
auto deps = expr->getDeps();
auto it = deps.find(this);
if (it != deps.end()) {
auto it2 = it->second.find("Constraints");
if (it2 != it->second.end()) {
for (auto& oid : it2->second) {
const Constraint* constraint = Constraints.getConstraint(oid);
if (!constraint->isDriving)
return "Reference constraint from this sketch cannot be used in this "
"expression.";
}
}
geoMap.clear();
const auto &vals = getInternalGeometry();
for(long i=0;i<(long)vals.size();++i) {
auto geo = vals[i];
auto gf = GeometryFacade::getFacade(geo);
if(!gf->getId())
gf->setId(++geoLastId);
else if(gf->getId() > geoLastId)
geoLastId = gf->getId();
while(!geoMap.insert(std::make_pair(gf->getId(),i)).second) {
FC_WARN("duplicate geometry id " << gf->getId() << " -> " << geoLastId+1);
gf->setId(++geoLastId);
}
}
updateGeoHistory();
if (it == deps.end()) {
return "";
}
auto it2 = it->second.find("Constraints");
if (it2 != it->second.end()) {
for (auto& oid : it2->second) {
const Constraint* constraint = Constraints.getConstraint(oid);
if (!constraint->isDriving)
return "Reference constraint from this sketch cannot be used in this "
"expression.";
}
}
geoMap.clear();
const auto &vals = getInternalGeometry();
for(long i=0; i<(long)vals.size(); ++i) {
auto geo = vals[i];
auto gf = GeometryFacade::getFacade(geo);
if(!gf->getId()) {
gf->setId(++geoLastId);
}
else if(gf->getId() > geoLastId) {
geoLastId = gf->getId();
}
while(!geoMap.insert(std::make_pair(gf->getId(),i)).second) {
FC_WARN("duplicate geometry id " << gf->getId() << " -> " << geoLastId+1);
gf->setId(++geoLastId);
}
}
updateGeoHistory();
return "";
}