diff options
Diffstat (limited to 'sources/pyside2')
-rw-r--r-- | sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml | 8 | ||||
-rw-r--r-- | sources/pyside2/PySide2/glue/qtgui.cpp | 5 | ||||
-rw-r--r-- | sources/pyside2/tests/QtGui/qmatrix_test.py | 2 |
3 files changed, 12 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 6818612cb..e7d1fc76d 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -732,6 +732,12 @@ <insert-template name="qmatrix_map"/> </inject-code> </modify-function> + <modify-function signature="map(const QPoint&)const"> + <modify-argument index="return"> + <replace-type modified-type="QPoint"/> + </modify-argument> + <inject-code file="../glue/qtgui.cpp" snippet="qmatrix-map-point" /> + </modify-function> <modify-function signature="inverted(bool*)const"> <modify-argument index="1"> <remove-argument/> @@ -3100,5 +3106,3 @@ <object-type name="QStyleHints"/> </typesystem> - - diff --git a/sources/pyside2/PySide2/glue/qtgui.cpp b/sources/pyside2/PySide2/glue/qtgui.cpp index 7f638e5cd..b308d7ff1 100644 --- a/sources/pyside2/PySide2/glue/qtgui.cpp +++ b/sources/pyside2/PySide2/glue/qtgui.cpp @@ -435,6 +435,11 @@ PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG1_TYPE](%1)); %END_ALLOW_THREADS // @snippet qpainter-drawpolygon +// @snippet qmatrix-map-point +QPoint p(%CPPSELF.%FUNCTION_NAME(%1)); +%PYARG_0 = %CONVERTTOPYTHON[QPoint](p); +// @snippet qmatrix-map-point + // @snippet qmatrix4x4 if (PySequence_Size(%PYARG_1) == 16) { float values[16]; diff --git a/sources/pyside2/tests/QtGui/qmatrix_test.py b/sources/pyside2/tests/QtGui/qmatrix_test.py index a917199c1..7cfe9ea60 100644 --- a/sources/pyside2/tests/QtGui/qmatrix_test.py +++ b/sources/pyside2/tests/QtGui/qmatrix_test.py @@ -42,7 +42,7 @@ class QMatrixTest(unittest.TestCase): def testMatrix(self): matrix = QMatrix(11, 12, 21, 22, 100, 200) point = QPoint(3, 3) - self.assertEqual(point * matrix, qpointTimesQMatrix(point, matrix)) + self.assertEqual(matrix.map(point), qpointTimesQMatrix(point, matrix)) def testMatrixWithWrongType(self): matrix = QMatrix(11, 12, 21, 22, 100, 200) |