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

Use lambda to prevent code duplication

Browse Source
This commit is contained in:
Alexey Chernov
2024-07-25 03:09:52 +03:00
committed by Chris Hennes
parent d35d3a025b
commit b66d413deb
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Mod/PartDesign/App/ShapeBinder.cpp
View File

@@ -605,22 +605,8 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
if (!copyerror) {
std::vector<App::Property*> props;
getPropertyList(props);
for (auto prop : props) {
if (!App::LinkBaseExtension::isCopyOnChangeProperty(this, *prop))
continue;
auto p = copied->getPropertyByName(prop->getName());
if (p && p->getContainer() == copied
&& p->getTypeId() == prop->getTypeId()
&& !p->isSame(*prop))
{
recomputeCopy = true;
std::unique_ptr<App::Property> pcopy(prop->Copy());
p->Paste(*pcopy);
}
}
if (recomputeCopy && !copied->recomputeFeature(true))
copyerror = 2;
if (!copyerror) {
// lambda for copying values of copy-on-change properties
const auto copyPropertyValues = [this, &recomputeCopy, &props, copied](const bool to_parent) {
for (auto prop : props) {
if (!App::LinkBaseExtension::isCopyOnChangeProperty(this, *prop))
continue;
@@ -629,11 +615,21 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
&& p->getTypeId() == prop->getTypeId()
&& !p->isSame(*prop))
{
std::unique_ptr<App::Property> pcopy(p->Copy());
prop->Paste(*pcopy);
recomputeCopy = true;
auto* const from = to_parent ? prop : p;
auto* const to = to_parent ? p : prop;
std::unique_ptr<App::Property> pcopy(from->Copy());
to->Paste(*pcopy);
}
}
}
};
copyPropertyValues(true);
if (recomputeCopy && !copied->recomputeFeature(true))
copyerror = 2;
if (!copyerror)
copyPropertyValues(false);
}
obj = copied;
_CopiedLink.setValue(copied, l.getSubValues(false));