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

Use OCCT Handle macro for Handle_ classes

Browse Source 
This is the result of running OCCT's upgrade script provided
with OCCT 7.0. See
https://www.opencascade.com/content/freecad-occt710-and-windows-rtti-data-missing#comment-form
and
https://www.forum.freecadweb.org/viewtopic.php?f=4&t=21405&start=120#p169019
for why this is necessary for OCCT >= 7.1
This commit is contained in:
Peter Lama
2017-04-17 20:33:29 -04:00
committed by wmayer
parent 4564e4f4a4
commit fa4bebf2e0
141 changed files with 2198 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/Mod/Part/App/TopoShapePyImp.cpp
View File

@@ -146,7 +146,7 @@ int TopoShapePy::PyInit(PyObject* args, PyObject*)
}
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return -1;
}
@@ -470,7 +470,7 @@ PyObject* TopoShapePy::dumpToString(PyObject *args)
return NULL;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -496,7 +496,7 @@ PyObject* TopoShapePy::exportBrepToString(PyObject *args)
return NULL;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -583,7 +583,7 @@ PyObject* TopoShapePy::importBrepFromString(PyObject *args)
return NULL;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -624,7 +624,7 @@ PyObject* TopoShapePy::exportStl(PyObject *args)
return 0;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -668,7 +668,7 @@ PyObject* TopoShapePy::extrude(PyObject *args)
return 0;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -734,7 +734,7 @@ PyObject* TopoShapePy::revolve(PyObject *args)
return 0;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -769,7 +769,7 @@ PyObject* TopoShapePy::fuse(PyObject *args)
return new TopoShapePy(new TopoShape(fusShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -799,7 +799,7 @@ PyObject* TopoShapePy::fuse(PyObject *args)
return new TopoShapePy(new TopoShape(multiFusedShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -836,7 +836,7 @@ PyObject* TopoShapePy::multiFuse(PyObject *args)
return new TopoShapePy(new TopoShape(multiFusedShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -859,7 +859,7 @@ PyObject* TopoShapePy::oldFuse(PyObject *args)
return new TopoShapePy(new TopoShape(fusShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -880,7 +880,7 @@ PyObject* TopoShapePy::common(PyObject *args)
return new TopoShapePy(new TopoShape(comShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -910,7 +910,7 @@ PyObject* TopoShapePy::common(PyObject *args)
return new TopoShapePy(new TopoShape(multiCommonShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -935,7 +935,7 @@ PyObject* TopoShapePy::section(PyObject *args)
return new TopoShapePy(new TopoShape(secShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -965,7 +965,7 @@ PyObject* TopoShapePy::section(PyObject *args)
return new TopoShapePy(new TopoShape(multiSectionShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -997,7 +997,7 @@ PyObject* TopoShapePy::slice(PyObject *args)
return Py::new_reference_to(wire);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1024,7 +1024,7 @@ PyObject* TopoShapePy::slices(PyObject *args)
return new TopoShapeCompoundPy(new TopoShape(slice));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1045,7 +1045,7 @@ PyObject* TopoShapePy::cut(PyObject *args)
return new TopoShapePy(new TopoShape(cutShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1075,7 +1075,7 @@ PyObject* TopoShapePy::cut(PyObject *args)
return new TopoShapePy(new TopoShape(multiCutShape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1127,7 +1127,7 @@ PyObject* TopoShapePy::generalFuse(PyObject *args)
return Py::new_reference_to(ret);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1147,7 +1147,7 @@ PyObject* TopoShapePy::sewShape(PyObject *args)
Py_Return;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1211,7 +1211,7 @@ PyObject* TopoShapePy::childShapes(PyObject *args)
return Py::new_reference_to(list);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1230,7 +1230,7 @@ PyObject* TopoShapePy::removeInternalWires(PyObject *args)
return ret;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1252,7 +1252,7 @@ PyObject* TopoShapePy::mirror(PyObject *args)
return new TopoShapePy(new TopoShape(shape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1270,7 +1270,7 @@ PyObject* TopoShapePy::transformGeometry(PyObject *args)
return new TopoShapePy(new TopoShape(shape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1289,7 +1289,7 @@ PyObject* TopoShapePy::transformShape(PyObject *args)
Py_Return;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1383,7 +1383,7 @@ PyObject* TopoShapePy::scale(PyObject *args)
Py_Return;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1411,7 +1411,7 @@ PyObject* TopoShapePy::makeFillet(PyObject *args)
return new TopoShapePy(new TopoShape(mkFillet.Shape()));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1437,7 +1437,7 @@ PyObject* TopoShapePy::makeFillet(PyObject *args)
return new TopoShapePy(new TopoShape(mkFillet.Shape()));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1476,7 +1476,7 @@ PyObject* TopoShapePy::makeChamfer(PyObject *args)
return new TopoShapePy(new TopoShape(mkChamfer.Shape()));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1507,7 +1507,7 @@ PyObject* TopoShapePy::makeChamfer(PyObject *args)
return new TopoShapePy(new TopoShape(mkChamfer.Shape()));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1549,7 +1549,7 @@ PyObject* TopoShapePy::makeThickness(PyObject *args)
return new TopoShapeSolidPy(new TopoShape(shape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1579,7 +1579,7 @@ PyObject* TopoShapePy::makeOffsetShape(PyObject *args, PyObject *keywds)
return new TopoShapePy(new TopoShape(shape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1767,7 +1767,7 @@ PyObject* TopoShapePy::tessellate(PyObject *args)
return Py::new_reference_to(tuple);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1818,7 +1818,7 @@ PyObject* TopoShapePy::makeParallelProjection(PyObject *args)
return new TopoShapePy(new TopoShape(projected));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -1840,7 +1840,7 @@ PyObject* TopoShapePy::makePerspectiveProjection(PyObject *args)
return new TopoShapePy(new TopoShape(projected));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -1901,7 +1901,7 @@ PyObject* TopoShapePy::toNurbs(PyObject *args)
return new TopoShapePy(new TopoShape(nurbs));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1927,7 +1927,7 @@ PyObject* TopoShapePy::isInside(PyObject *args)
return Py_BuildValue("O", (test ? Py_True : Py_False));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1948,7 +1948,7 @@ PyObject* TopoShapePy::removeSplitter(PyObject *args)
return new TopoShapePy(new TopoShape(shape));
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -1982,7 +1982,7 @@ PyObject* TopoShapePy::getElement(PyObject *args)
}
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}
@@ -2027,7 +2027,7 @@ PyObject* TopoShapePy::getTolerance(PyObject *args)
return PyFloat_FromDouble(tolerance);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2077,7 +2077,7 @@ PyObject* TopoShapePy::overTolerance(PyObject *args)
return Py::new_reference_to(tuple);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2128,7 +2128,7 @@ PyObject* TopoShapePy::inTolerance(PyObject *args)
return Py::new_reference_to(tuple);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2149,7 +2149,7 @@ PyObject* TopoShapePy::globalTolerance(PyObject *args)
return PyFloat_FromDouble(tolerance);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2189,7 +2189,7 @@ PyObject* TopoShapePy::fixTolerance(PyObject *args)
Py_Return;
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2230,7 +2230,7 @@ PyObject* TopoShapePy::limitTolerance(PyObject *args)
return PyBool_FromLong(ok ? 1 : 0);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return NULL;
}
@@ -2838,7 +2838,7 @@ PyObject *TopoShapePy::getCustomAttributes(const char* attr) const
}
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Handle(Standard_Failure) e = Standard_Failure::Caught();
PyErr_SetString(PartExceptionOCCError, e->GetMessageString());
return 0;
}