-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Assembly: Implement Bill Of Materials (#14198)
* Assembly: Implementation of BOM * Assembly: BOM: make it possible for BOM to be made without an assembly.
- Loading branch information
1 parent
60a0e70
commit 3fa0b68
Showing
31 changed files
with
2,355 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
// SPDX-License-Identifier: LGPL-2.1-or-later | ||
/**************************************************************************** | ||
* * | ||
* Copyright (c) 2023 Ondsel <development@ondsel.com> * | ||
* * | ||
* This file is part of FreeCAD. * | ||
* * | ||
* FreeCAD is free software: you can redistribute it and/or modify it * | ||
* under the terms of the GNU Lesser General Public License as * | ||
* published by the Free Software Foundation, either version 2.1 of the * | ||
* License, or (at your option) any later version. * | ||
* * | ||
* FreeCAD is distributed in the hope that it will be useful, but * | ||
* WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * | ||
* Lesser General Public License for more details. * | ||
* * | ||
* You should have received a copy of the GNU Lesser General Public * | ||
* License along with FreeCAD. If not, see * | ||
* <https://www.gnu.org/licenses/>. * | ||
* * | ||
***************************************************************************/ | ||
|
||
#include "PreCompiled.h" | ||
#ifndef _PreComp_ | ||
#endif | ||
|
||
#include <App/Application.h> | ||
#include <App/Document.h> | ||
#include <App/FeaturePythonPyImp.h> | ||
#include <App/PropertyPythonObject.h> | ||
#include <Base/Console.h> | ||
#include <Base/Tools.h> | ||
|
||
#include "BomGroup.h" | ||
#include "BomGroupPy.h" | ||
|
||
using namespace Assembly; | ||
|
||
|
||
PROPERTY_SOURCE(Assembly::BomGroup, App::DocumentObjectGroup) | ||
Check warning on line 41 in src/Mod/Assembly/App/BomGroup.cpp GitHub Actions / Lint / Lint
|
||
|
||
BomGroup::BomGroup() | ||
{} | ||
|
||
BomGroup::~BomGroup() = default; | ||
|
||
PyObject* BomGroup::getPyObject() | ||
{ | ||
if (PythonObject.is(Py::_None())) { | ||
// ref counter is set to 1 | ||
PythonObject = Py::Object(new BomGroupPy(this), true); | ||
} | ||
return Py::new_reference_to(PythonObject); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
// SPDX-License-Identifier: LGPL-2.1-or-later | ||
/**************************************************************************** | ||
* * | ||
* Copyright (c) 2023 Ondsel <development@ondsel.com> * | ||
* * | ||
* This file is part of FreeCAD. * | ||
* * | ||
* FreeCAD is free software: you can redistribute it and/or modify it * | ||
* under the terms of the GNU Lesser General Public License as * | ||
* published by the Free Software Foundation, either version 2.1 of the * | ||
* License, or (at your option) any later version. * | ||
* * | ||
* FreeCAD is distributed in the hope that it will be useful, but * | ||
* WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * | ||
* Lesser General Public License for more details. * | ||
* * | ||
* You should have received a copy of the GNU Lesser General Public * | ||
* License along with FreeCAD. If not, see * | ||
* <https://www.gnu.org/licenses/>. * | ||
* * | ||
***************************************************************************/ | ||
|
||
|
||
#ifndef ASSEMBLY_BomGroup_H | ||
#define ASSEMBLY_BomGroup_H | ||
|
||
#include <Mod/Assembly/AssemblyGlobal.h> | ||
|
||
#include <App/DocumentObjectGroup.h> | ||
#include <App/PropertyLinks.h> | ||
|
||
|
||
namespace Assembly | ||
{ | ||
|
||
class AssemblyExport BomGroup: public App::DocumentObjectGroup | ||
Check warning on line 37 in src/Mod/Assembly/App/BomGroup.h GitHub Actions / Lint / Lint
|
||
{ | ||
PROPERTY_HEADER_WITH_OVERRIDE(Assembly::BomGroup); | ||
|
||
public: | ||
BomGroup(); | ||
~BomGroup() override; | ||
|
||
PyObject* getPyObject() override; | ||
|
||
/// returns the type name of the ViewProvider | ||
const char* getViewProviderName() const override | ||
{ | ||
return "AssemblyGui::ViewProviderBomGroup"; | ||
} | ||
}; | ||
|
||
|
||
} // namespace Assembly | ||
|
||
|
||
#endif // ASSEMBLY_BomGroup_H |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<GenerateModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="generateMetaModel_Module.xsd"> | ||
<PythonExport | ||
Father="DocumentObjectGroupPy" | ||
Name="BomGroupPy" | ||
Twin="BomGroup" | ||
TwinPointer="BomGroup" | ||
Include="Mod/Assembly/App/BomGroup.h" | ||
Namespace="Assembly" | ||
FatherInclude="App/DocumentObjectGroupPy.h" | ||
FatherNamespace="App"> | ||
<Documentation> | ||
<Author Licence="LGPL" Name="Ondsel" EMail="development@ondsel.com" /> | ||
<UserDocu>This class is a group subclass for boms.</UserDocu> | ||
</Documentation> | ||
|
||
<CustomAttributes /> | ||
</PythonExport> | ||
</GenerateModel> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/*************************************************************************** | ||
* Copyright (c) 2014 Jürgen Riegel <juergen.riegel@web.de> * | ||
* * | ||
* This file is part of the FreeCAD CAx development system. * | ||
* * | ||
* This library is free software; you can redistribute it and/or * | ||
* modify it under the terms of the GNU Library General Public * | ||
* License as published by the Free Software Foundation; either * | ||
* version 2 of the License, or (at your option) any later version. * | ||
* * | ||
* This library is distributed in the hope that it will be useful, * | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of * | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * | ||
* GNU Library General Public License for more details. * | ||
* * | ||
* You should have received a copy of the GNU Library General Public * | ||
* License along with this library; see the file COPYING.LIB. If not, * | ||
* write to the Free Software Foundation, Inc., 59 Temple Place, * | ||
* Suite 330, Boston, MA 02111-1307, USA * | ||
* * | ||
***************************************************************************/ | ||
|
||
|
||
#include "PreCompiled.h" | ||
|
||
// inclusion of the generated files (generated out of BomGroup.xml) | ||
#include "BomGroupPy.h" | ||
#include "BomGroupPy.cpp" | ||
|
||
using namespace Assembly; | ||
|
||
// returns a string which represents the object e.g. when printed in python | ||
std::string BomGroupPy::representation() const | ||
{ | ||
return {"<Bom Group>"}; | ||
} | ||
|
||
PyObject* BomGroupPy::getCustomAttributes(const char* /*attr*/) const | ||
{ | ||
return nullptr; | ||
} | ||
|
||
int BomGroupPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) | ||
{ | ||
return 0; | ||
} |
Oops, something went wrong.
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this broke gui tests on ubuntu 20.04, @PaddleStroke please check
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here some details:
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @wwmayer for the details. However I have a hard time understanding this report. Do you know what is the allow-list ? It sounds like it is failing to load Assembly because of the dependency on spreadsheet.
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AFAIK the allow list comes from the addon manager test cases and probably has nothing to do with the failing test.
But maybe @chennes knows more.
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's right -- the "Assertion error" you see at the bottom is actually the test passing -- an error was raised, and caught. So it's not part of the "real" output above it.
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anyone has a ubuntu 20.04 at hand?
If so can you test if you can activate the assembly workbench ? Perhaps that will give more details about the problem than the failing test
3fa0b68
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Finally found the issue : #14812