suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0001690: sketch.getPoint crashes FreeCAD if the point does not exist

Browse Source
This commit is contained in:
wmayer 2014-08-16 14:41:30 +02:00
parent 92cb03bca1
commit 8808b82371
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mod/Sketcher/App/SketchObjectPyImp.cpp
View File

@ -357,7 +357,18 @@ PyObject* SketchObjectPy::getPoint(PyObject *args)
if (!PyArg_ParseTuple(args, "ii", &GeoId, &PointType)) if (!PyArg_ParseTuple(args, "ii", &GeoId, &PointType))
return 0; return 0;
return new Base::VectorPy(new Base::Vector3d(this->getSketchObjectPtr()->getPoint(GeoId,(Sketcher::PointPos)PointType))); if (PointType < 0 || PointType > 3) {
PyErr_SetString(PyExc_ValueError, "Invalid point type");
return 0;
}
SketchObject* obj = this->getSketchObjectPtr();
if (GeoId > obj->getHighestCurveIndex() || -GeoId > obj->getExternalGeometryCount()) {
PyErr_SetString(PyExc_ValueError, "Invalid geometry Id");
return 0;
}
return new Base::VectorPy(new Base::Vector3d(obj->getPoint(GeoId,(Sketcher::PointPos)PointType)));
} }
PyObject* SketchObjectPy::getAxis(PyObject *args) PyObject* SketchObjectPy::getAxis(PyObject *args)