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

Merge pull request #15332 from aclex/apply_copy_on_change_calculations

Browse Source 
Apply result of calculations with copy on change properties
This commit is contained in:
Chris Hennes
2024-12-08 15:17:44 -05:00
committed by GitHub
parent 1bb7d2ea3f 66e1c0154d
commit 76bc4b1182
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -605,21 +605,34 @@ 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);
// lambda for copying values of copy-on-change properties
const auto copyPropertyValues = [this, &recomputeCopy, &props, copied](const bool to_support) {
for (auto prop : props) {
if (!App::LinkBaseExtension::isCopyOnChangeProperty(this, *prop))
continue;
// we only copy read-only and output properties from support to binder
if (!to_support && !(prop->testStatus(App::Property::Output) && prop->testStatus(App::Property::ReadOnly)))
continue;
auto p = copied->getPropertyByName(prop->getName());
if (p && p->getContainer() == copied
&& p->getTypeId() == prop->getTypeId()
&& !p->isSame(*prop))
{
recomputeCopy = true;
auto* const from = to_support ? prop : p;
auto* const to = to_support ? 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));