Merge pull request #16 from joegnis/fix-qpoint-multi-div

Fixes multiplication and division operators in QPoint and QPointF

Author: bluebird75

PySide6-stubs/QtCore.pyi

@@ -2029,7 +2029,7 @@ class QDate(Shiboken.Object):
     def __init__(self) -> None: ...
     @overload
     def __init__(self, QDate: PySide6.QtCore.QDate) -> None: ...
-    @overload        
+    @overload
     def __init__(self, dt: datetime.datetime) -> None: ...
     @overload
     def __init__(self, d: datetime.date) -> None: ...
@@ -6163,19 +6163,12 @@ class QPoint(Shiboken.Object):
     @staticmethod
     def __copy__() -> None: ...
     def __iadd__(self, p: PySide6.QtCore.QPoint) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __imul__(self, factor: float) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __imul__(self, factor: float) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __imul__(self, factor: int) -> PySide6.QtCore.QPoint: ...
+    def __imul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPoint: ...
     def __isub__(self, p: PySide6.QtCore.QPoint) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __mul__(self, factor: float) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __mul__(self, factor: float) -> PySide6.QtCore.QPoint: ...
-    @overload
-    def __mul__(self, factor: int) -> PySide6.QtCore.QPoint: ...
+    def __mul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPoint: ...
+    def __rmul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPoint: ...
+    def __truediv__(self, division: Union[int, float]) -> PySide6.QtCore.QPoint: ...
+    def __itruediv__(self, division: Union[int, float]) -> PySide6.QtCore.QPoint: ...
     def __neg__(self) -> PySide6.QtCore.QPoint: ...
     def __pos__(self) -> PySide6.QtCore.QPoint: ...
     def __reduce__(self) -> object: ...
@@ -6209,9 +6202,12 @@ class QPointF(Shiboken.Object):
     @staticmethod
     def __copy__() -> None: ...
     def __iadd__(self, p: Union[PySide6.QtCore.QPointF, PySide6.QtCore.QPoint]) -> PySide6.QtCore.QPointF: ...
-    def __imul__(self, c: float) -> PySide6.QtCore.QPointF: ...
+    def __imul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPointF: ...
     def __isub__(self, p: Union[PySide6.QtCore.QPointF, PySide6.QtCore.QPoint]) -> PySide6.QtCore.QPointF: ...
-    def __mul__(self, c: float) -> PySide6.QtCore.QPointF: ...
+    def __mul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPointF: ...
+    def __rmul__(self, factor: Union[int, float]) -> PySide6.QtCore.QPointF: ...
+    def __truediv__(self, division: Union[int, float]) -> PySide6.QtCore.QPointF: ...
+    def __itruediv__(self, division: Union[int, float]) -> PySide6.QtCore.QPointF: ...
     def __neg__(self) -> PySide6.QtCore.QPointF: ...
     def __pos__(self) -> PySide6.QtCore.QPointF: ...
     def __reduce__(self) -> object: ...

tests/qpoint.py

@@ -0,0 +1,51 @@
+from PySide6.QtCore import QPoint, QPointF
+
+
+def multiplicationQPoint() -> None:
+    p1 = QPoint(1, 1)
+    p2 = QPoint(2, 2)
+    assert p2 == 2 * p1
+    assert p2 == p1 * 2
+    p3 = QPoint(p1)
+    p3 *= 2
+    assert p3 == p2
+    p3 *= 0.5
+    assert p3 == p1
+
+
+def divisionQPoint() -> None:
+    p1 = QPoint(2, 2)
+    assert p1 / 2 == QPoint(1, 1)
+    assert p1 / 0.5 == QPoint(4, 4)
+    p1 /= 2
+    assert p1 == QPoint(1, 1)
+    p1 /= 0.25
+    assert p1 == QPoint(4, 4)
+
+
+def multiplicationQPointF() -> None:
+    p1 = QPointF(1.5, 1.5)
+    p2 = QPointF(3, 3)
+    assert p2 == 2 * p1
+    assert p2 == p1 * 2
+    p3 = QPointF(p1)
+    p3 *= 2
+    assert p3 == p2
+    p3 *= 0.5
+    assert p3 == p1
+
+
+def divisionQPointF() -> None:
+    p1 = QPointF(2, 2)
+    assert p1 / 2 == QPointF(1, 1)
+    assert p1 / 0.5 == QPointF(4, 4)
+    p1 /= 2
+    assert p1 == QPointF(1, 1)
+    p1 /= 0.5
+    assert p1 == QPointF(2, 2)
+
+
+multiplicationQPoint()
+divisionQPoint()
+multiplicationQPointF()
+divisionQPointF()