Fixed #79: TypeError: unexpected type 'QSize'

Author: PierreRaybaut

CHANGELOG.md

@@ -1,5 +1,9 @@
 # PythonQwt Releases
 
+## Version 0.10.4
+
+- [Issue #79](https://github.com/PlotPyStack/PythonQwt/issues/79) - TypeError: unexpected type 'QSize' (thanks to @luc-j-bourhis)
+
 ## Version 0.10.3
 
 - Moved project to the [PlotPyStack](https://github.com/PlotPyStack) organization.

qwt/__init__.py

@@ -27,7 +27,7 @@
 .. _GitHub: https://github.com/PlotPyStack/PythonQwt
 """
 
-__version__ = "0.10.3"
+__version__ = "0.10.4"
 QWT_VERSION_STR = "6.1.5"
 
 import warnings

qwt/plot_marker.py

@@ -316,7 +316,7 @@ def drawLabel(self, painter, canvasRect, pos):
                 alignPos.setX(canvasRect.center().x())
         else:
             if self.__data.symbol and self.__data.symbol.style() != QwtSymbol.NoSymbol:
-                symbolOff = self.__data.symbol.size() + QSizeF(1, 1)
+                symbolOff = QSizeF(self.__data.symbol.size()) + QSizeF(1, 1)
                 symbolOff /= 2
         pw2 = self.__data.pen.widthF() / 2.0
         if pw2 == 0.0:

qwt/symbol.py

@@ -1208,9 +1208,9 @@ def boundingRect(self):
             pinPointTranslation = True
         elif self.__data.style == QwtSymbol.Pixmap:
             if self.__data.size.isEmpty():
-                rect.setSize(self.__data.pixmap.pixmap.size())
+                rect.setSize(QSizeF(self.__data.pixmap.pixmap.size()))
             else:
-                rect.setSize(self.__data.size)
+                rect.setSize(QSizeF(self.__data.size))
             pinPointTranslation = True
         elif self.__data.style == QwtSymbol.Graphic:
             rect = qwtScaleBoundingRect(self.__data.graphic.graphic, self.__data.size)
@@ -1227,7 +1227,7 @@ def boundingRect(self):
                 rect = transform.mapRect(rect)
             pinPointTranslation = True
         else:
-            rect.setSize(self.__data.size)
+            rect.setSize(QSizeF(self.__data.size))
             rect.moveCenter(QPointF(0.0, 0.0))
         if pinPointTranslation:
             pinPoint = QPointF(0.0, 0.0)