From 1e860356e70bbe2321eef33483e61531990df680 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 8 Oct 2013 12:54:20 +0200 Subject: [PATCH] + make float assignment more pythonic --- src/Mod/Mesh/App/MeshPyImp.cpp | 4 ++-- src/Tools/generateTemplates/templateClassPyExport.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Mod/Mesh/App/MeshPyImp.cpp b/src/Mod/Mesh/App/MeshPyImp.cpp index 158ef0d43..2df63d65d 100644 --- a/src/Mod/Mesh/App/MeshPyImp.cpp +++ b/src/Mod/Mesh/App/MeshPyImp.cpp @@ -1503,12 +1503,12 @@ Py::Int MeshPy::getCountFacets(void) const Py::Float MeshPy::getArea(void) const { - return Py::Float((long)getMeshObjectPtr()->getSurface()); + return Py::Float(getMeshObjectPtr()->getSurface()); } Py::Float MeshPy::getVolume(void) const { - return Py::Float((long)getMeshObjectPtr()->getVolume()); + return Py::Float(getMeshObjectPtr()->getVolume()); } PyObject *MeshPy::getCustomAttributes(const char* attr) const diff --git a/src/Tools/generateTemplates/templateClassPyExport.py b/src/Tools/generateTemplates/templateClassPyExport.py index f99e29df0..63359f40c 100644 --- a/src/Tools/generateTemplates/templateClassPyExport.py +++ b/src/Tools/generateTemplates/templateClassPyExport.py @@ -502,7 +502,11 @@ int @self.export.Name@::staticCallback_set@i.Name@ (PyObject *self, PyObject *va } try { ++ if (i.Parameter.Type == "Float"): + ((@self.export.Name@*)self)->set@i.Name@(Py::@i.Parameter.Type@(PyNumber_Float(value),true)); += else: ((@self.export.Name@*)self)->set@i.Name@(Py::@i.Parameter.Type@(value,false)); +- return 0; } catch (const Py::Exception&) { // The exception text is already set