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

PartDesign: show error on SubShapeBinder CopyOnChange failure

Browse Source 
The failure is not obivous as it would have been occurred in a
hidden temporary document.
This commit is contained in:
Zheng, Lei
2021-10-17 21:52:33 +08:00
committed by Chris Hennes
parent f6c2688319
commit d286a54fc1
2 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -537,8 +537,8 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
copied = _CopiedObjs.front().getObject();
bool recomputeCopy = false;
if(!copied) {
int copyerror = 0;
if(!copied || !copied->isValid()) {
recomputeCopy = true;
clearCopiedObjects();
@@ -549,29 +549,43 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
for(auto it=objs.rbegin(); it!=objs.rend(); ++it)
_CopiedObjs.emplace_back(*it);
copied = objs.back();
// IMPORTANT! must make a recomputation first before any
// further change so that we can generate the correct
// geometry element map.
if (!copied->recomputeFeature(true))
copyerror = 1;
}
}
if(copied) {
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 (!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(recomputeCopy)
copied->recomputeFeature(true);
obj = copied;
_CopiedLink.setValue(copied,l.getSubValues(false));
if (copyerror) {
FC_THROWM(Base::RuntimeError,
(copyerror == 1 ? "Initial copy failed." : "Copy on change failed.")
<< " Please check report view for more details.\n"
"You can show temporary document to reveal the failed objects using\n"
"tree view context menu.");
}
}
}
@@ -733,7 +747,11 @@ void SubShapeBinder::slotRecomputedObject(const App::DocumentObject& Obj) {
if(Context.getValue() == &Obj
&& !this->testStatus(App::ObjectStatus::Recompute2))
{
update();
try {
update();
} catch (Base::Exception &e) {
e.ReportException();
}
}
}

6
src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp
View File

@@ -367,7 +367,11 @@ void ViewProviderSubShapeBinder::updatePlacement(bool transaction) {
if(!transaction) {
if(relative)
self->Context.setValue(parent,parentSub.c_str());
self->update(PartDesign::SubShapeBinder::UpdateForced);
try {
self->update(PartDesign::SubShapeBinder::UpdateForced);
} catch (Base::Exception &e) {
e.ReportException();
}
return;
}