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

Merge pull request #14790 from Ondsel-Development/asm_bom_2

Browse Source 
Assembly: BOM follow up
This commit is contained in:
Chris Hennes
2024-07-01 10:47:14 -05:00
committed by GitHub
parent 084bf8c6b4 d8d2cbcc62
commit 4bd9fa3ca3
4 changed files with 198 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Mod/Assembly/Gui/Resources/panels/TaskAssemblyCreateBom.ui
View File

@@ -14,13 +14,13 @@
<string>Create Bill Of Materials</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<item row="0" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="CheckBox_detailSubAssemblies">
<property name="toolTip">
<string>If checked, Sub assemblies sub-components will be added to the bill of materials.</string>
<string>If checked, Sub assemblies children will be added to the bill of materials.</string>
</property>
<property name="text">
<string>Detail sub-assemblies</string>
<string>Sub-assemblies children</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -33,13 +33,13 @@
</property>
</widget>
</item>
<item row="1" column="0">
<item row="1" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="CheckBox_detailParts">
<property name="toolTip">
<string>If checked, Parts sub-components will be added to the bill of materials.</string>
<string>If checked, Parts children will be added to the bill of materials.</string>
</property>
<property name="text">
<string>Detail parts</string>
<string>Parts children</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -52,10 +52,10 @@
</property>
</widget>
</item>
<item row="2" column="0">
<item row="2" column="0" colspan="2">
<widget class="Gui::PrefCheckBox" name="CheckBox_onlyParts">
<property name="toolTip">
<string>If checked, only Part containers will be added to the bill of materials. Solids like PartDesign Bodies will be ignored.</string>
<string>If checked, only Part containers and sub-assemblies will be added to the bill of materials. Solids like PartDesign Bodies, fasteners or Part workbench primitives will be ignored.</string>
</property>
<property name="text">
<string>Only parts</string>
@@ -71,11 +71,8 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="3" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_1">
<property name="toolTip">
<string>Columns of the bill of materials</string>
</property>
<property name="title">
<string>Columns</string>
</property>
@@ -100,6 +97,26 @@
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QToolButton" name="helpButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Help</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="Icons/resource.qrc">
<normaloff>:/icons/help-browser.svg</normaloff>:/icons/help-browser.svg</iconset>
</property>
</widget>
</item>
</layout>
</widget>
<customwidgets>

34
src/Mod/Assembly/Gui/ViewProviderBom.cpp
View File

@@ -32,6 +32,7 @@
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Command.h>
#include <Base/Interpreter.h>
@@ -53,33 +54,16 @@ QIcon ViewProviderBom::getIcon() const
bool ViewProviderBom::doubleClicked()
{
try {
// Ensure the Python interpreter is initialized
if (!Py_IsInitialized()) {
Py_Initialize();
}
std::string obj_name = getObject()->getNameInDocument();
std::string doc_name = getObject()->getDocument()->getName();
// Acquire the GIL (Global Interpreter Lock)
PyGILState_STATE gstate;
gstate = PyGILState_Ensure();
std::string obj_name = getObject()->getNameInDocument();
std::string doc_name = getObject()->getDocument()->getName();
std::string pythonCommand = "import CommandCreateBom\n"
"obj = App.getDocument('"
+ doc_name + "').getObject('" + obj_name
+ "')\n"
"Gui.Control.showDialog(CommandCreateBom.TaskAssemblyCreateBom(obj))";
// Call the Python function
std::string pythonCommand = "import CommandCreateBom\n"
"obj = App.getDocument('"
+ doc_name + "').getObject('" + obj_name
+ "')\n"
"Gui.Control.showDialog(CommandCreateBom.TaskAssemblyCreateBom(obj))";
PyRun_SimpleString(pythonCommand.c_str());
// Release the GIL
PyGILState_Release(gstate);
}
catch (...) {
PyErr_Print();
}
Gui::Command::runCommand(Gui::Command::App, pythonCommand.c_str());
return true;
}