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

Made PropertyFloatList accept ints too - fixes #2444

Browse Source
This commit is contained in:
Yorik van Havre 2016-02-09 16:01:10 -02:00
parent 42c42fd064
commit 0e8974a370
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/App/PropertyStandard.cpp
View File

@ -1142,13 +1142,20 @@ void PropertyFloatList::setPyObject(PyObject *value)
for (Py_ssize_t i=0; i<nSize;++i) {
PyObject* item = PyList_GetItem(value, i);
if (!PyFloat_Check(item)) {
if (PyFloat_Check(item)) {
values[i] = PyFloat_AsDouble(item);
#if PYTHON_VERSION_MAJOR >= 3
} else if (PyLong_Check(item)) {
values[i] = static_cast<double>(PyLong_AsLong(item));
#else
} else if (PyInt_Check(item)) {
values[i] = static_cast<double>(PyInt_AsLong(item));
#endif
} else {
std::string error = std::string("type in list must be float, not ");
error += item->ob_type->tp_name;
throw Base::TypeError(error);
}
values[i] = PyFloat_AsDouble(item);
}
setValues(values);