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

Toponaming/Part: move in remaining ifdef methods and the new TopoShapePy methods

Browse Source
This commit is contained in:
Zheng, Lei
2024-03-27 11:13:50 -04:00
committed by bgbsww
parent f0581fd768
commit f00784f00e
6 changed files with 438 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Mod/Part/App/TopoShapeCompSolidPyImp.cpp
View File

@@ -29,11 +29,13 @@
#endif
#include "OCCError.h"
#include "PartPyCXX.h"
// inclusion of the generated files (generated out of TopoShapeCompSolidPy.xml)
#include "TopoShapeCompSolidPy.h"
#include "TopoShapeCompSolidPy.cpp"
#include "TopoShapeSolidPy.h"
#include "TopoShapeOpCode.h"
using namespace Part;
@@ -61,10 +63,16 @@ int TopoShapeCompSolidPy::PyInit(PyObject* args, PyObject* /*kwd*/)
}
PyErr_Clear();
PyObject *pcObj;
if (!PyArg_ParseTuple(args, "O", &pcObj))
PyObject* pcObj;
if (!PyArg_ParseTuple(args, "O", &pcObj)) {
return -1;
}
#ifdef FC_USE_TNP_FIX
try {
getTopoShapePtr()->makeElementBoolean(Part::OpCodes::Compsolid, getPyShapes(pcObj));
}
_PY_CATCH_OCC(return (-1))
#else
BRep_Builder builder;
TopoDS_CompSolid Comp;
builder.MakeCompSolid(Comp);
@@ -73,10 +81,11 @@ int TopoShapeCompSolidPy::PyInit(PyObject* args, PyObject* /*kwd*/)
Py::Sequence list(pcObj);
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
if (PyObject_TypeCheck((*it).ptr(), &(Part::TopoShapeSolidPy::Type))) {
const TopoDS_Shape& sh = static_cast<TopoShapePy*>((*it).ptr())->
getTopoShapePtr()->getShape();
if (!sh.IsNull())
const TopoDS_Shape& sh =
static_cast<TopoShapePy*>((*it).ptr())->getTopoShapePtr()->getShape();
if (!sh.IsNull()) {
builder.Add(Comp, sh);
}
}
}
}
@@ -87,35 +96,46 @@ int TopoShapeCompSolidPy::PyInit(PyObject* args, PyObject* /*kwd*/)
}
getTopoShapePtr()->setShape(Comp);
#endif
return 0;
}
PyObject* TopoShapeCompSolidPy::add(PyObject *args)
PyObject* TopoShapeCompSolidPy::add(PyObject* args)
{
PyObject *obj;
if (!PyArg_ParseTuple(args, "O!", &(Part::TopoShapeSolidPy::Type), &obj))
PyObject* obj;
if (!PyArg_ParseTuple(args, "O!", &(Part::TopoShapeSolidPy::Type), &obj)) {
return nullptr;
}
BRep_Builder builder;
TopoDS_Shape comp = getTopoShapePtr()->getShape();
auto shapes = getPyShapes(obj);
try {
const TopoDS_Shape& sh = static_cast<TopoShapePy*>(obj)->
getTopoShapePtr()->getShape();
if (!sh.IsNull())
builder.Add(comp, sh);
else
Standard_Failure::Raise("Cannot empty shape to compound solid");
for (auto& ts : shapes) {
if (!ts.isNull()) {
builder.Add(comp, ts.getShape());
}
else {
Standard_Failure::Raise("Cannot empty shape to compound solid");
}
}
#ifdef FC_USE_TNP_FIX
auto& self = *getTopoShapePtr();
shapes.push_back(self);
TopoShape tmp(self.Tag, self.Hasher, comp);
tmp.mapSubElement(shapes);
self = tmp;
#else
getTopoShapePtr()->setShape(comp);
#endif
Py_Return;
}
catch (Standard_Failure& e) {
PyErr_SetString(PartExceptionOCCError, e.GetMessageString());
return nullptr;
}
getTopoShapePtr()->setShape(comp);
Py_Return;
}
PyObject *TopoShapeCompSolidPy::getCustomAttributes(const char* /*attr*/) const