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

Implement inject-code to functions using QChar in QFontMetrics and

Browse source 
QFontMetricsF

Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Marcelo Lira <marcelo.lira@openbossa.org>
This commit is contained in:
Renato Filho 2010-06-15 13:34:42 -03:00
commit 4cca85f525
2 changed files with 58 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

48
PySide/QtGui/typesystem_gui_common.xml
View file

@ -1,5 +1,16 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<typesystem package="PySide.QtGui"> <typesystem package="PySide.QtGui">
<template name="QFontCharFix">
int size = PyString_GET_SIZE(%PYARG_1);
if (size == 1) {
char *str = PyString_AS_STRING(%PYARG_1);
QChar ch(str[0]);
%PYARG_0 = %CONVERTTOPYTHON[%RETURN_TYPE](%CPPSELF.%FUNCTION_NAME(ch));
} else {
PyErr_SetString(PyExc_TypeError, "String must have only one character");
}
</template>
<function signature="qAlpha(uint)" /> <function signature="qAlpha(uint)" />
<function signature="qBlue(uint)" /> <function signature="qBlue(uint)" />
<function signature="qGray(int,int,int)" /> <function signature="qGray(int,int,int)" />
@ -1057,6 +1068,24 @@
</value-type> </value-type>
<value-type name="QFontMetricsF" > <value-type name="QFontMetricsF" >
<modify-function signature="boundingRect(QChar)const" rename="boundingRectChar">
<modify-argument index="1">
<replace-type modified-type="PyString"/>
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="QFontCharFix"/>
</inject-code>
</modify-function>
<modify-function signature="width(QChar)const" rename="widthChar">
<modify-argument index="1">
<replace-type modified-type="PyString"/>
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="QFontCharFix"/>
</inject-code>
</modify-function>
<modify-function signature="boundingRect(QRectF,int,QString,int,int*)const"> <modify-function signature="boundingRect(QRectF,int,QString,int,int*)const">
<modify-argument index="5"> <modify-argument index="5">
<replace-type modified-type="PyObject"/> <replace-type modified-type="PyObject"/>
@ -1118,6 +1147,25 @@
</value-type> </value-type>
<value-type name="QTextOption::Tab"/> <value-type name="QTextOption::Tab"/>
<value-type name="QFontMetrics" > <value-type name="QFontMetrics" >
<modify-function signature="boundingRect(QChar)const" rename="boundingRectChar">
<modify-argument index="1">
<replace-type modified-type="PyString"/>
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="QFontCharFix"/>
</inject-code>
</modify-function>
<modify-function signature="width(QChar)const" rename="widthChar">
<modify-argument index="1">
<replace-type modified-type="PyString"/>
</modify-argument>
<inject-code class="target" position="beginning">
<insert-template name="QFontCharFix"/>
</inject-code>
</modify-function>
<modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const"> <modify-function signature="boundingRect(int,int,int,int,int,QString,int,int*)const">
<modify-argument index="8"> <modify-argument index="8">
<replace-type modified-type="PyObject"/> <replace-type modified-type="PyObject"/>

10
tests/QtGui/qfontmetrics_test.py
View file

@ -185,5 +185,15 @@ class FSizeTest(QFontMetricsFTest):
'PySide by INdT', 20, ['aaaa', 'ase']) 'PySide by INdT', 20, ['aaaa', 'ase'])
class QCharTest(QFontMetricsFTest):
def testBoundingRect(self):
retCh = self.metrics.boundingRectChar('a')
self.assertEqual(type(retCh), QRectF)
def testWith(self):
retCh = self.metrics.widthChar('a')
self.assert_(retCh > 0)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()