GIT_REPOSITORIES/LPP/PythonQt Commit - r167:2184742f9ca8

added initial version of foreign wrappers, needs testing...

florianlink -

r167:2184742f9ca8

parent child

Context file:

r167:2184742f9ca8

Collapse all files

src/PythonQt.cpp +26 -2

                   return (PyObject*)wrap;
                 }
+                // not a known QObject, try to wrap via foreign wrapper factories
+                PyObject* foreignWrapper = NULL;
+                for (int i=0; i<_foreignWrapperFactories.size(); i++) {
+                  foreignWrapper = _foreignWrapperFactories.at(i)->wrap(name, ptr);
+                  if (foreignWrapper) {
+                    return foreignWrapper;
+                  }
+                }
                 // not a known QObject, so try our wrapper factory:
                 QObject* wrapper = NULL;
                 for (int i=0; i<_cppWrapperFactories.size(); i++) {
                   info->setMetaObject(wrapper->metaObject());
                 }
-                // TODO XXX: delegate wrapping via CB here (pass name and ptr)
                 wrap = createNewPythonQtInstanceWrapper(wrapper, info, ptr);
                 //          mlabDebugConst("MLABPython","new c++ wrapper added " << wrap->_wrappedPtr << " " << wrap->_obj->className() << " " << wrap->classInfo()->wrappedClassName().latin1());
               } else {
               _p->_cppWrapperFactories.append(factory);
             }
+            void PythonQt::addWrapperFactory( PythonQtForeignWrapperFactory* factory )
+            {
+              _p->_foreignWrapperFactories.append(factory);
+            }
             //---------------------------------------------------------------------------------------------------
             PythonQtPrivate::PythonQtPrivate()
             {
               }
               return result;
             }
+            void* PythonQtPrivate::unwrapForeignWrapper( const QByteArray& classname, PyObject* obj )
+            {
+              void* foreignObject = NULL;
+              for (int i=0; i<_foreignWrapperFactories.size(); i++) {
+                foreignObject = _foreignWrapperFactories.at(i)->unwrap(classname, obj);
+                if (foreignObject) {
+                  return foreignObject;
+                }
+              }
+              return NULL;
+            }
  No newline at end of file

src/PythonQt.h +9 0

             class PythonQtSignalReceiver;
             class PythonQtImportFileInterface;
             class PythonQtCppWrapperFactory;
+            class PythonQtForeignWrapperFactory;
             class PythonQtQFileImporter;
             typedef void  PythonQtQObjectWrappedCB(QObject* object);
               //! add the given factory to PythonQt (ownership stays with caller)
               void addWrapperFactory(PythonQtCppWrapperFactory* factory);
+              //! add the given factory to PythonQt (ownership stays with caller)
+              void addWrapperFactory(PythonQtForeignWrapperFactory* factory);
               //@}
               //---------------------------------------------------------------------------
               //! remove the wrapper ptr again
               void removeWrapperPointer(void* obj);
+              //! try to unwrap the given object to a C++ pointer using the foreign wrapper factories
+              void* unwrapForeignWrapper(const QByteArray& classname, PyObject* obj);
               //! add parent class relation
               bool addParentClass(const char* typeName, const char* parentTypeName, int upcastingOffset);
               //! the cpp object wrapper factories
               QList<PythonQtCppWrapperFactory*> _cppWrapperFactories;
+              QList<PythonQtForeignWrapperFactory*> _foreignWrapperFactories;
               QHash<QByteArray, PyObject*> _packages;
               PythonQtClassInfo* _currentClassInfoForClassWrapperCreation;

src/PythonQtConversion.cpp +13 -10

@@ -386,19 +386,22 void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
386	} else if (info.name == "PyObject") {	386	} else if (info.name == "PyObject") {
387	// handle low level PyObject directly	387	// handle low level PyObject directly
388	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, obj, ptr);	388	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, obj, ptr);
389	}	389	} else if (obj == Py_None) {
390	// TODO XXX: pass obj and name and add when it returns a pointer
391	else if (obj == Py_None) {
392	// None is treated as a NULL ptr	390	// None is treated as a NULL ptr
393	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, NULL, ptr);	391	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, NULL, ptr);
394	} else {	392	} else {
395	// if we are not strict, we try if we are passed a 0 integer	393	void* foreignWrapper = PythonQt::priv()->unwrapForeignWrapper(info.name, obj);
396	if (!~~strict~~) {	394	if (foreignWrapper) {
397	bool ok;	395	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, foreignWrapper, ptr);
398	int value = PyObjGetInt(obj, true, ok);	396	} else {
399	if (ok && value==0) {	397	// if we are not strict, we try if we are passed a 0 integer
400	// TODOXXX is this wise? or should it be expected from the programmer to use None?	398	if (!strict) {
401	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, NULL, ptr);	399	bool ok;
		400	int value = PyObjGetInt(obj, true, ok);
		401	if (ok && value==0) {
		402	// TODOXXX is this wise? or should it be expected from the programmer to use None?
		403	PythonQtValueStorage_ADD_VALUE_IF_NEEDED(alreadyAllocatedCPPObject,global_ptrStorage, void*, NULL, ptr);
		404	}
402	}	405	}
403	}	406	}
404	}	407	}

src/PythonQtCppWrapperFactory.h +19 -1

@@ -54,7 +54,25 public:
54	virtual ~PythonQtCppWrapperFactory() {};	54	virtual ~PythonQtCppWrapperFactory() {};
55		55
56	//! create a wrapper for the given object	56	//! create a wrapper for the given object
57	virtual QObject* create(const QByteArray& name, void *ptr) = 0;	57	virtual QObject* create(const QByteArray& classname, void *ptr) = 0;
		58
		59	};
		60
		61	//! Factory interface for C++ classes that can be mapped directly from/to
		62	//! Python with other means than PythonQt/QObjects.
		63	class PYTHONQT_EXPORT PythonQtForeignWrapperFactory
		64	{
		65	public:
		66	PythonQtForeignWrapperFactory() {};
		67	virtual ~PythonQtForeignWrapperFactory() {};
		68
		69	//! create a Python object (with new reference count), wrapping the given \p ptr as class of type \p classname
		70	//! Return NULL (and not Py_None) if the object could not be wrapped.
		71	virtual PyObject* wrap(const QByteArray& classname, void *ptr) = 0;
		72
		73	//! unwrap the given object to a C++ object of type \p classname if possible
		74	//! Return NULL otherwise.
		75	virtual void* unwrap(const QByteArray& classname, PyObject* object) = 0;
58		76
59	};	77	};
60		78

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages