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

Assembly: BOM tool: Do not list Groups.

Browse Source
This commit is contained in:
PaddleStroke
2024-07-22 12:21:59 +02:00
parent 4b0c72ccad
commit 0273391211
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Mod/Assembly/App/BomObject.cpp
View File

@@ -46,9 +46,6 @@
#include "AssemblyObject.h"
#include "BomGroup.h"
#include "JointGroup.h"
#include "ViewGroup.h"
#include "BomObject.h"
#include "BomObjectPy.h"
@@ -188,8 +185,8 @@ void BomObject::addObjectChildrenToBom(std::vector<App::DocumentObject*> objs,
}
}
if (child->isDerivedFrom<BomGroup>() || child->isDerivedFrom<JointGroup>()
|| child->isDerivedFrom<ViewGroup>()) {
if (!child->isDerivedFrom<AssemblyObject>() && !child->isDerivedFrom<App::Part>()
&& !(child->isDerivedFrom<Part::Feature>() && !onlyParts.getValue())) {
continue;
}
@@ -213,21 +210,15 @@ void BomObject::addObjectChildrenToBom(std::vector<App::DocumentObject*> objs,
}
}
if (child->isDerivedFrom<App::DocumentObjectGroup>()
|| child->isDerivedFrom<AssemblyObject>() || child->isDerivedFrom<App::Part>()
|| (child->isDerivedFrom<Part::Feature>() && !onlyParts.getValue())) {
std::string sub_index = index + std::to_string(sub_i);
++sub_i;
std::string sub_index = index + std::to_string(sub_i);
++sub_i;
addObjectToBom(child, row, sub_index);
++row;
addObjectToBom(child, row, sub_index);
++row;
if (child->isDerivedFrom<App::DocumentObjectGroup>()
|| (child->isDerivedFrom<AssemblyObject>() && detailSubAssemblies.getValue())
|| (child->isDerivedFrom<App::Part>() && detailParts.getValue())) {
addObjectChildrenToBom(child->getOutList(), row, sub_index);
}
if ((child->isDerivedFrom<AssemblyObject>() && detailSubAssemblies.getValue())
|| (child->isDerivedFrom<App::Part>() && detailParts.getValue())) {
addObjectChildrenToBom(child->getOutList(), row, sub_index);
}
}
}