Expression: fix python object evaluation

FreeCAD · Aug 17, 2019 · e0799e2 · e0799e2
1 parent 9b33513
commit e0799e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/App/Expression.cpp b/src/App/Expression.cpp
@@ -2350,6 +2350,13 @@ Expression* PyObjectExpression::_copy() const
     return new PyObjectExpression(owner,pyObj,false);
 }
 
+boost::any PyObjectExpression::getValueAsAny() const {
+    if(!pyObj || pyObj == Py_None)
+        return boost::any();
+    Base::PyGILStateLocker lock;
+    return App::any(pyObjectWrap(pyObj));
+}
+
 //
 // StringExpression class
 //

diff --git a/src/App/Expression.h b/src/App/Expression.h
@@ -529,6 +529,7 @@ class AppExport PyObjectExpression : public Expression {
     void setPyObject(PyObject *pyobj, bool owned=false);
 
     virtual std::string toString(bool) const;
+    virtual boost::any getValueAsAny() const;
 
     virtual Expression * eval() const { return copy(); }
     virtual Expression * simplify() const { return copy(); }