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

handle C++ exception in Python interface

Browse Source
This commit is contained in:
wmayer
2019-01-03 12:19:37 +01:00
parent 895a920b19
commit fc27c9986b
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Path/App/CommandPyImp.cpp
View File

@@ -69,8 +69,15 @@ int CommandPy::PyInit(PyObject* args, PyObject* kwd)
if ( PyArg_ParseTupleAndKeywords(args, kwd, "|sO!", kwlist, &name, &PyDict_Type, &parameters) ) {
std::string sname(name);
boost::to_upper(sname);
if (!sname.empty())
getCommandPtr()->setFromGCode(name);
try {
if (!sname.empty())
getCommandPtr()->setFromGCode(name);
}
catch (const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return -1;
}
PyObject *key, *value;
Py_ssize_t pos = 0;
while (parameters && PyDict_Next(parameters, &pos, &key, &value)) {
@@ -114,8 +121,14 @@ int CommandPy::PyInit(PyObject* args, PyObject* kwd)
if ( PyArg_ParseTupleAndKeywords(args, kwd, "|sO!", kwlist, &name, &(Base::PlacementPy::Type), &parameters) ) {
std::string sname(name);
boost::to_upper(sname);
if (!sname.empty())
getCommandPtr()->setFromGCode(name);
try {
if (!sname.empty())
getCommandPtr()->setFromGCode(name);
}
catch (const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return -1;
}
Base::PlacementPy *p = static_cast<Base::PlacementPy*>(parameters);
getCommandPtr()->setFromPlacement( *p->getPlacementPtr() );
return 0;
@@ -210,7 +223,14 @@ PyObject* CommandPy::setFromGCode(PyObject *args)
char *pstr=0;
if (PyArg_ParseTuple(args, "s", &pstr)) {
std::string gcode(pstr);
getCommandPtr()->setFromGCode(gcode);
try {
getCommandPtr()->setFromGCode(gcode);
}
catch (const Base::Exception& e) {
PyErr_SetString(PyExc_ValueError, e.what());
return nullptr;
}
Py_INCREF(Py_None);
return Py_None;
}