jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed QColor reduce function.

Browse source 
Fixes bug #989.

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Renato Filho 2011-08-31 16:57:28 -03:00 • committed by Hugo Parente Lima
commit 2487a08062
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
PySide/QtGui/typesystem_gui_common.xml
View file

@ -1165,42 +1165,43 @@
<insert-template name="qcolor_repr" /> <insert-template name="qcolor_repr" />
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="__setstate__(PyObject*)" return-type="PyObject">
<inject-code>
Shiboken::AutoDecRef func(PyObject_GetAttr(%PYSELF, PyTuple_GET_ITEM(%1, 0)));
PyObject* args = PyTuple_GET_ITEM(%1, 1);
%PYARG_0 = PyObject_Call(func, args, NULL);
</inject-code>
</add-function>
<add-function signature="__reduce__" return-type="PyObject"> <add-function signature="__reduce__" return-type="PyObject">
<inject-code class="target" position="beginning"> <inject-code class="target" position="beginning">
PyObject *createFunction = 0;
switch(%CPPSELF.spec()) { switch(%CPPSELF.spec()) {
case QColor::Rgb: case QColor::Rgb:
{ {
qreal r, g, b, a; qreal r, g, b, a;
createFunction = PyObject_GetAttrString(%PYSELF, "fromRgbF");
%CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a); %CPPSELF.getRgbF(&amp;r, &amp;g, &amp;b, &amp;a);
%PYARG_0 = Py_BuildValue("(N(ffff))", createFunction, r, g, b, a); %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setRgbF", (float)r, (float)g, (float)b, (float)a);
break; break;
} }
case QColor::Hsv: case QColor::Hsv:
{ {
qreal h, s, v, a; qreal h, s, v, a;
createFunction = PyObject_GetAttrString(%PYSELF, "fromHsvF");
%CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a); %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;v, &amp;a);
%PYARG_0 = Py_BuildValue("(N(ffff))", createFunction, h, s, v, a); %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHsvF", (float)h, (float)s, (float)v, (float)a);
break; break;
} }
case QColor::Cmyk: case QColor::Cmyk:
{ {
qreal c, m, y, k, a; qreal c, m, y, k, a;
createFunction = PyObject_GetAttrString(%PYSELF, "fromCmykF");
%CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a); %CPPSELF.getCmykF(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
%PYARG_0 = Py_BuildValue("(N(fffff))", createFunction, c, m, y, k, a); %PYARG_0 = Py_BuildValue("(ON(s(fffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setCmykF", (float)c, (float)m, (float)y, (float)k, (float)a);
break; break;
} }
#if QT_VERSION >= 0x040600 #if QT_VERSION >= 0x040600
case QColor::Hsl: case QColor::Hsl:
{ {
qreal h, s, l, a; qreal h, s, l, a;
createFunction = PyObject_GetAttrString(%PYSELF, "fromHslF");
%CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a); %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
%PYARG_0 = Py_BuildValue("(N(ffff))", createFunction, h, s, l, a); %PYARG_0 = Py_BuildValue("(ON(s(ffff)))", Py_TYPE(%PYSELF), PyTuple_New(0), "setHslF", (float)h, (float)s, (float)l, (float)a);
break; break;
} }
#endif #endif