From ef68b1c020d02ee0825dcbb88a81259373c03bd8 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Sun, 25 Dec 2022 19:43:49 -0500 Subject: [PATCH] [Gui]overload toQGraphicsItem, toQGraphicsObject for PyObject --- src/Gui/PythonWrapper.cpp | 11 +++++++++++ src/Gui/PythonWrapper.h | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Gui/PythonWrapper.cpp b/src/Gui/PythonWrapper.cpp index 7beb9f8f54..5339c1f64c 100644 --- a/src/Gui/PythonWrapper.cpp +++ b/src/Gui/PythonWrapper.cpp @@ -563,6 +563,11 @@ QGraphicsItem* PythonWrapper::toQGraphicsItem(PyObject* pyPtr) return nullptr; } +QGraphicsItem* PythonWrapper::toQGraphicsItem(const Py::Object& pyobject) +{ + return toQGraphicsItem(pyobject.ptr()); +} + QGraphicsObject* PythonWrapper::toQGraphicsObject(PyObject* pyPtr) { #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE) @@ -576,6 +581,12 @@ QGraphicsObject* PythonWrapper::toQGraphicsObject(PyObject* pyPtr) return nullptr; } +QGraphicsObject* PythonWrapper::toQGraphicsObject(const Py::Object& pyobject) +{ +return toQGraphicsObject(pyobject.ptr()); +} + + Py::Object PythonWrapper::fromQIcon(const QIcon* icon) { #if defined (HAVE_SHIBOKEN) && defined(HAVE_PYSIDE) diff --git a/src/Gui/PythonWrapper.h b/src/Gui/PythonWrapper.h index 8815068d8a..c31f30e471 100644 --- a/src/Gui/PythonWrapper.h +++ b/src/Gui/PythonWrapper.h @@ -53,10 +53,11 @@ public: bool toCString(const Py::Object&, std::string&); QObject* toQObject(const Py::Object&); QGraphicsItem* toQGraphicsItem(PyObject* ptr); + QGraphicsItem* toQGraphicsItem(const Py::Object& pyObject); QGraphicsObject* toQGraphicsObject(PyObject* pyPtr); + QGraphicsObject* toQGraphicsObject(const Py::Object& pyObject); Py::Object fromQPrinter(QPrinter*); - Py::Object fromQObject(QObject*, const char* className=nullptr); Py::Object fromQWidget(QWidget*, const char* className=nullptr); const char* getWrapperName(QObject*) const;