GIT_REPOSITORIES/LPP/PythonQt Commit - r64:3ef1598f6c5e

added automatic conversion to QColor,QPen,QCursor and QBrush from enums and colors...

florianlink -

r64:3ef1598f6c5e

parent child

Context file:

r64:3ef1598f6c5e

Collapse all files

src/PythonQtClassInfo.cpp +8 -4

               return resultPtr;
             }
-            PyObject* PythonQtClassInfo::findEnumWrapper(const QByteArray& name, PythonQtClassInfo* localScope, bool& isLocalEnum)
+            PyObject* PythonQtClassInfo::findEnumWrapper(const QByteArray& name, PythonQtClassInfo* localScope, bool* isLocalEnum)
             {
-              isLocalEnum = true;
+              if (isLocalEnum) {
+                *isLocalEnum = true;
+              }
               int scopePos = name.lastIndexOf("::");
               if (scopePos != -1) {
-                isLocalEnum = false;
+                if (isLocalEnum) {
-                // slit into scope and enum name
+                  *isLocalEnum = false;
+                }
+                // split into scope and enum name
                 QByteArray enumScope = name.mid(0,scopePos);
                 QByteArray enumName = name.mid(scopePos+2);
                 PythonQtClassInfo* info = PythonQt::priv()->getClassInfo(enumScope);

src/PythonQtClassInfo.h +1 -1

               void* castDownIfPossible(void* ptr, PythonQtClassInfo** resultClassInfo);
               //! returns if the localScope has an enum of that type name or if the enum contains a :: scope, if that class contails the enum
-              static PyObject* findEnumWrapper(const QByteArray& name, PythonQtClassInfo* localScope, bool& isLocalEnum);
+              static PyObject* findEnumWrapper(const QByteArray& name, PythonQtClassInfo* localScope, bool* isLocalEnum = NULL);
             private:
               void createEnumWrappers();

src/PythonQtConversion.cpp +83 -1

@@ -254,10 +254,92 return Py_None;
254	return object;	254	return object;
255	}	255	}
256		256
257	void* PythonQtConv::~~Convert~~PythonToQt(~~cons~~t ~~PythonQtMethodInfo~~::~~ParameterInfo~~& ~~info~~, PyObject* obj, ~~bool~~ ~~strict~~, ~~PythonQtClassInfo~~* ~~/classInfo/~~, void* alreadyAllocatedCPPObject)	257	void* PythonQtConv::handlePythonToQtAutoConversion(int typeId, PyObject* obj, void* alreadyAllocatedCPPObject)
		258	{
		259	void* ptr = alreadyAllocatedCPPObject;
		260
		261	static int penId = QMetaType::type("QPen");
		262	static int brushId = QMetaType::type("QBrush");
		263	static int cursorId = QMetaType::type("QCursor");
		264	static int colorId = QMetaType::type("QColor");
		265	static PyObject* qtGlobalColorEnum = PythonQtClassInfo::findEnumWrapper("Qt::GlobalColor", NULL);
		266	if (typeId == cursorId) {
		267	static PyObject* qtCursorShapeEnum = PythonQtClassInfo::findEnumWrapper("Qt::CursorShape", NULL);
		268	if ((PyObject*)obj->ob_type == qtCursorShapeEnum) {
		269	Qt::CursorShape val = (Qt::CursorShape)PyInt_AS_LONG(obj);
		270	if (!ptr) {
		271	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QCursor(), ptr);
		272	ptr = (void)((QVariant)ptr)->constData();
		273	}
		274	((QCursor)ptr) = QCursor(val);
		275	return ptr;
		276	}
		277	} else if (typeId == penId) {
		278	// brushes can be created from QColor and from Qt::GlobalColor (and from brushes, but that's the default)
		279	static PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
		280	if ((PyObject*)obj->ob_type == qtGlobalColorEnum) {
		281	Qt::GlobalColor val = (Qt::GlobalColor)PyInt_AS_LONG(obj);
		282	if (!ptr) {
		283	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QPen(), ptr);
		284	ptr = (void)((QVariant)ptr)->constData();
		285	}
		286	((QPen)ptr) = QPen(QColor(val));
		287	return ptr;
		288	} else if ((PyObject*)obj->ob_type == qtColorClass) {
		289	if (!ptr) {
		290	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QPen(), ptr);
		291	ptr = (void)((QVariant)ptr)->constData();
		292	}
		293	((QPen)ptr) = QPen(((QColor)((PythonQtInstanceWrapper*)obj)->_wrappedPtr));
		294	return ptr;
		295	}
		296	} else if (typeId == brushId) {
		297	// brushes can be created from QColor and from Qt::GlobalColor (and from brushes, but that's the default)
		298	static PyObject* qtColorClass = PythonQt::priv()->getClassInfo("QColor")->pythonQtClassWrapper();
		299	if ((PyObject*)obj->ob_type == qtGlobalColorEnum) {
		300	Qt::GlobalColor val = (Qt::GlobalColor)PyInt_AS_LONG(obj);
		301	if (!ptr) {
		302	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QBrush(), ptr);
		303	ptr = (void)((QVariant)ptr)->constData();
		304	}
		305	((QBrush)ptr) = QBrush(QColor(val));
		306	return ptr;
		307	} else if ((PyObject*)obj->ob_type == qtColorClass) {
		308	if (!ptr) {
		309	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QBrush(), ptr);
		310	ptr = (void)((QVariant)ptr)->constData();
		311	}
		312	((QBrush)ptr) = QBrush(((QColor)((PythonQtInstanceWrapper*)obj)->_wrappedPtr));
		313	return ptr;
		314	}
		315	} else if (typeId == colorId) {
		316	// colors can be created from Qt::GlobalColor (and from colors, but that's the default)
		317	if ((PyObject*)obj->ob_type == qtGlobalColorEnum) {
		318	Qt::GlobalColor val = (Qt::GlobalColor)PyInt_AS_LONG(obj);
		319	if (!ptr) {
		320	PythonQtValueStorage_ADD_VALUE(global_variantStorage, QVariant, QColor(), ptr);
		321	ptr = (void)((QVariant)ptr)->constData();
		322	}
		323	((QColor)ptr) = QColor(val);
		324	return ptr;
		325	}
		326	}
		327	return NULL;
		328	}
		329
		330	void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& info, PyObject* obj, bool strict, PythonQtClassInfo* /classInfo/, void* alreadyAllocatedCPPObject)
258	{	331	{
259	bool ok = false;	332	bool ok = false;
260	void* ptr = NULL;	333	void* ptr = NULL;
		334
		335	// autoconversion of QPen/QBrush/QCursor/QColor from different type
		336	if (!info.isPointer && !strict) {
		337	ptr = handlePythonToQtAutoConversion(info.typeId, obj, alreadyAllocatedCPPObject);
		338	if (ptr) {
		339	return ptr;
		340	}
		341	}
		342
261	if (PyObject_TypeCheck(obj, &PythonQtInstanceWrapper_Type) && info.typeId != PythonQtMethodInfo::Variant) {	343	if (PyObject_TypeCheck(obj, &PythonQtInstanceWrapper_Type) && info.typeId != PythonQtMethodInfo::Variant) {
262	// if we have a Qt wrapper object and if we do not need a QVariant, we do the following:	344	// if we have a Qt wrapper object and if we do not need a QVariant, we do the following:
263	// (the Variant case is handled below in a switch)	345	// (the Variant case is handled below in a switch)

src/PythonQtConversion.h +3 0

             protected:
               static QHash<int, PythonQtConvertMetaTypeToPythonCB*> _metaTypeToPythonConverters;
               static QHash<int, PythonQtConvertPythonToMetaTypeCB*> _pythonToMetaTypeConverters;
+              //! handle automatic conversion of some special types (QColor, QBrush, ...)
+              static void* handlePythonToQtAutoConversion(int typeId, PyObject* obj, void* alreadyAllocatedCPPObject);
               //! converts the list of pointers of given type to Python
               static PyObject* ConvertQListOfPointerTypeToPythonList(QList<void*>* list, const QByteArray& type);

src/PythonQtMethodInfo.cpp +1 -1

                 if (type.typeId == PythonQtMethodInfo::Unknown || type.typeId >= QMetaType::User) {
                   bool isLocalEnum;
                   // TODOXXX: make use of this flag!
-                  type.enumWrapper = PythonQtClassInfo::findEnumWrapper(type.name, classInfo, isLocalEnum);
+                  type.enumWrapper = PythonQtClassInfo::findEnumWrapper(type.name, classInfo, &isLocalEnum);
                 }
               } else {
                 type.typeId = QMetaType::Void;

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