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

Fix bug #606

Browse source 
Add toTuple() function to these all classes:
    - QPoint/QPointF/QSize/QSizeF/QVector2D/QVector3D/QVector4D
    - QLine/QLineF/QColor

Signed-off-by: Paulo Alcantara <paulo.alcantara@openbossa.org>

Reviewer: Lauro Moura <lauro.neto@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Paulo Alcantara 2011-05-10 15:36:03 -03:00 • committed by Renato Filho
commit a8b02e046b
2 changed files with 124 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

58
PySide/QtCore/typesystem_core.xml
View file

@ -455,6 +455,15 @@
} }
}; };
</inject-code> </inject-code>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="iiii" />
<replace from="%TT_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
</insert-template>
</inject-code>
</add-function>
</value-type> </value-type>
<value-type name="QLineF"> <value-type name="QLineF">
<enum-type name="IntersectType" /> <enum-type name="IntersectType" />
@ -475,6 +484,15 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="dddd" />
<replace from="%TT_ARGS" to="%CPPSELF.x1(), %CPPSELF.y1(), %CPPSELF.x2(), %CPPSELF.y2()" />
</insert-template>
</inject-code>
</add-function>
<modify-function signature="intersect(QLineF, QPointF*)const"> <modify-function signature="intersect(QLineF, QPointF*)const">
<modify-argument index="2"> <modify-argument index="2">
<remove-argument /> <remove-argument />
@ -677,6 +695,16 @@
} }
}; };
</inject-code> </inject-code>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="ii" />
<replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
</insert-template>
</inject-code>
</add-function>
<!--### Functions removed because they return references to Python imutable objects --> <!--### Functions removed because they return references to Python imutable objects -->
<modify-function signature="rx()" remove="all"/> <modify-function signature="rx()" remove="all"/>
<modify-function signature="ry()" remove="all"/> <modify-function signature="ry()" remove="all"/>
@ -700,6 +728,16 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="dd" />
<replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
</insert-template>
</inject-code>
</add-function>
<!--### Functions removed because they return references to Python imutable objects --> <!--### Functions removed because they return references to Python imutable objects -->
<modify-function signature="rx()" remove="all"/> <modify-function signature="rx()" remove="all"/>
<modify-function signature="ry()" remove="all"/> <modify-function signature="ry()" remove="all"/>
@ -866,6 +904,16 @@
} }
}; };
</inject-code> </inject-code>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="ii" />
<replace from="%TT_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
</insert-template>
</inject-code>
</add-function>
<!--### Functions removed because they return references to Python imutable objects --> <!--### Functions removed because they return references to Python imutable objects -->
<modify-function signature="rheight()" remove="all"/> <modify-function signature="rheight()" remove="all"/>
<modify-function signature="rwidth()" remove="all"/> <modify-function signature="rwidth()" remove="all"/>
@ -889,6 +937,16 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="dd" />
<replace from="%TT_ARGS" to="%CPPSELF.width(), %CPPSELF.height()" />
</insert-template>
</inject-code>
</add-function>
<!--### Functions removed because they return references to Python imutable objects --> <!--### Functions removed because they return references to Python imutable objects -->
<modify-function signature="rheight()" remove="all" /> <modify-function signature="rheight()" remove="all" />
<modify-function signature="rwidth()" remove="all" /> <modify-function signature="rwidth()" remove="all" />

66
PySide/QtGui/typesystem_gui_common.xml
View file

@ -1158,6 +1158,43 @@
} }
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
switch(%CPPSELF.spec()) {
case QColor::Rgb:
{
int r, g, b, a;
%CPPSELF.getRgb(&amp;r, &amp;g, &amp;b, &amp;a);
%PYARG_0 = Py_BuildValue("iiii", r, g, b, a);
break;
}
case QColor::Hsv:
{
int h, s, v, a;
%CPPSELF.getHsv(&amp;h, &amp;s, &amp;v, &amp;a);
%PYARG_0 = Py_BuildValue("iiii", h, s, v, a);
break;
}
case QColor::Cmyk:
{
int c, m, y, k, a;
%CPPSELF.getCmyk(&amp;c, &amp;m, &amp;y, &amp;k, &amp;a);
%PYARG_0 = Py_BuildValue("iiiii", c, m, y, k, a);
break;
}
case QColor::Hsl:
{
int h, s, l, a;
%CPPSELF.getHsv(&amp;h, &amp;s, &amp;l, &amp;a);
%PYARG_0 = Py_BuildValue("iiii", h, s, l, a);
break;
}
default:
%PYARG_0 = 0;
}
</inject-code>
</add-function>
<!-- ### "QColor(QColor::Spec)" is an internal method. --> <!-- ### "QColor(QColor::Spec)" is an internal method. -->
<modify-function signature="QColor(QColor::Spec)" remove="all"/> <modify-function signature="QColor(QColor::Spec)" remove="all"/>
<!-- ### Constructor removed because we already have an overload using QString. --> <!-- ### Constructor removed because we already have an overload using QString. -->
@ -6533,6 +6570,16 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="dd" />
<replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y()" />
</insert-template>
</inject-code>
</add-function>
</value-type> </value-type>
<value-type name="QVector3D" since="4.6"> <value-type name="QVector3D" since="4.6">
<extra-includes> <extra-includes>
@ -6555,6 +6602,16 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="ddd" />
<replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z()" />
</insert-template>
</inject-code>
</add-function>
</value-type> </value-type>
<value-type name="QVector4D" since="4.6"> <value-type name="QVector4D" since="4.6">
<extra-includes> <extra-includes>
@ -6577,6 +6634,15 @@
</insert-template> </insert-template>
</inject-code> </inject-code>
</add-function> </add-function>
<add-function signature="toTuple" return-type="PyObject*">
<inject-code class="target" position="beginning">
<insert-template name="to_tuple">
<replace from="%TT_FORMAT" to="dddd" />
<replace from="%TT_ARGS" to="%CPPSELF.x(), %CPPSELF.y(), %CPPSELF.z(), %CPPSELF.w()" />
</insert-template>
</inject-code>
</add-function>
</value-type> </value-type>
<suppress-warning text="template baseclass 'QGenericMatrix&lt;qreal&gt;' of '*' is not known"/> <suppress-warning text="template baseclass 'QGenericMatrix&lt;qreal&gt;' of '*' is not known"/>