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

Assembly: Make sure that when a components is deleted its joints are as well.

Browse Source
This commit is contained in:
PaddleStroke
2024-08-06 18:17:57 +02:00
committed by Chris Hennes
parent 1824322369
commit 8fdbeeced6
2 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Assembly/App/AssemblyObject.cpp
View File

@@ -575,7 +575,7 @@ std::vector<App::DocumentObject*> AssemblyObject::getJointsOfObj(App::DocumentOb
App::DocumentObject* obj1 = getObjFromRef(joint, "Reference1");
App::DocumentObject* obj2 = getObjFromRef(joint, "Reference2");
if (obj == obj1 || obj == obj2) {
jointsOf.push_back(obj);
jointsOf.push_back(joint);
}
}

39
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@@ -980,22 +980,41 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* obj) const
bool res = ViewProviderPart::canDelete(obj);
if (res) {
// If a component is deleted, then we delete the joints as well.
for (auto parent : obj->getInList()) {
auto* assemblyPart = static_cast<AssemblyObject*>(getObject());
std::vector<App::DocumentObject*> objToDel;
// List its joints
std::vector<App::DocumentObject*> joints = assemblyPart->getJointsOfObj(obj);
for (auto* joint : joints) {
objToDel.push_back(joint);
}
joints = assemblyPart->getJointsOfPart(obj);
for (auto* joint : joints) {
if (std::find(objToDel.begin(), objToDel.end(), joint) == objToDel.end()) {
objToDel.push_back(joint);
}
}
// List its grounded joints
std::vector<App::DocumentObject*> inList = obj->getInList();
for (auto* parent : inList) {
if (!parent) {
continue;
}
auto* prop =
dynamic_cast<App::PropertyBool*>(parent->getPropertyByName("EnableLimits"));
auto* prop2 =
dynamic_cast<App::PropertyLink*>(parent->getPropertyByName("ObjectToGround"));
if (prop || prop2) {
Gui::Command::doCommand(Gui::Command::Doc,
"App.getDocument(\"%s\").removeObject(\"%s\")",
parent->getDocument()->getName(),
parent->getNameInDocument());
if (dynamic_cast<App::PropertyLink*>(parent->getPropertyByName("ObjectToGround"))) {
objToDel.push_back(parent);
}
}
// Deletes them.
for (auto* joint : objToDel) {
Gui::Command::doCommand(Gui::Command::Doc,
"App.getDocument(\"%s\").removeObject(\"%s\")",
joint->getDocument()->getName(),
joint->getNameInDocument());
}
}
return res;