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

Assembly: Fix joints not being deleted when subassembly is deleted.

Browse Source
This commit is contained in:
PaddleStroke
2024-11-18 15:11:52 +01:00
committed by Yorik van Havre
parent 8945260a7e
commit 99b2f23214
1 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,6 +60,7 @@
#include <Gui/View3DInventorViewer.h>
#include <Gui/ViewParams.h>
#include <Mod/Assembly/App/AssemblyLink.h>
#include <Mod/Assembly/App/AssemblyObject.h>
#include <Mod/Assembly/App/AssemblyUtils.h>
#include <Mod/Assembly/App/JointGroup.h>
@@ -1066,36 +1067,63 @@ bool ViewProviderAssembly::onDelete(const std::vector<std::string>& subNames)
return ViewProviderPart::onDelete(subNames);
}
bool ViewProviderAssembly::canDelete(App::DocumentObject* obj) const
bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const
{
bool res = ViewProviderPart::canDelete(obj);
bool res = ViewProviderPart::canDelete(objBeingDeleted);
if (res) {
// If a component is deleted, then we delete the joints as well.
auto* assemblyPart = static_cast<AssemblyObject*>(getObject());
std::vector<App::DocumentObject*> objToDel;
std::vector<App::DocumentObject*> objsBeingDeleted;
objsBeingDeleted.push_back(objBeingDeleted);
// List its joints
std::vector<App::DocumentObject*> joints = assemblyPart->getJointsOfObj(obj);
for (auto* joint : joints) {
objToDel.push_back(joint);
auto addSubComponents =
std::function<void(AssemblyLink*, std::vector<App::DocumentObject*>&)> {};
addSubComponents = [&](AssemblyLink* asmLink, std::vector<App::DocumentObject*>& objs) {
std::vector<App::DocumentObject*> assemblyLinkGroup = asmLink->Group.getValues();
for (auto* obj : assemblyLinkGroup) {
auto* subAsmLink = dynamic_cast<AssemblyLink*>(obj);
auto* link = dynamic_cast<App::Link*>(obj);
if (subAsmLink || link) {
if (std::find(objs.begin(), objs.end(), obj) == objs.end()) {
objs.push_back(obj);
if (subAsmLink && !asmLink->isRigid()) {
addSubComponents(subAsmLink, objs);
}
}
}
}
};
auto* asmLink = dynamic_cast<Assembly::AssemblyLink*>(objBeingDeleted);
if (asmLink && !asmLink->isRigid()) {
addSubComponents(asmLink, objsBeingDeleted);
}
joints = assemblyPart->getJointsOfPart(obj);
for (auto* joint : joints) {
if (std::find(objToDel.begin(), objToDel.end(), joint) == objToDel.end()) {
for (auto* obj : objsBeingDeleted) {
// List its joints
std::vector<App::DocumentObject*> joints = assemblyPart->getJointsOfObj(obj);
for (auto* joint : joints) {
objToDel.push_back(joint);
}
}
// List its grounded joints
std::vector<App::DocumentObject*> inList = obj->getInList();
for (auto* parent : inList) {
if (!parent) {
continue;
joints = assemblyPart->getJointsOfPart(obj);
for (auto* joint : joints) {
if (std::find(objToDel.begin(), objToDel.end(), joint) == objToDel.end()) {
objToDel.push_back(joint);
}
}
if (dynamic_cast<App::PropertyLink*>(parent->getPropertyByName("ObjectToGround"))) {
objToDel.push_back(parent);
// List its grounded joints
std::vector<App::DocumentObject*> inList = obj->getInList();
for (auto* parent : inList) {
if (!parent) {
continue;
}
if (dynamic_cast<App::PropertyLink*>(parent->getPropertyByName("ObjectToGround"))) {
objToDel.push_back(parent);
}
}
}