Fixed type mismatch issues on Linux

Author: PierreRaybaut

CHANGELOG.md

@@ -1,5 +1,9 @@
 # PythonQwt Releases
 
+## Version 0.10.2
+
+- Fixed type mismatch issues on Linux
+
 ## Version 0.10.1
 
 - Added support for PyQt6.

qwt/__init__.py

@@ -8,11 +8,11 @@
 PythonQwt
 =========
 
-The ``PythonQwt`` package is a 2D-data plotting library using Qt graphical 
-user interfaces for the Python programming language. It is compatible with 
+The ``PythonQwt`` package is a 2D-data plotting library using Qt graphical
+user interfaces for the Python programming language. It is compatible with
 ``PyQt4``, ``PyQt5``, ``PyQt6`` and ``PySide6``.
 
-It consists of a single Python package named `qwt` which is a pure Python 
+It consists of a single Python package named `qwt` which is a pure Python
 implementation of Qwt C++ library with some limitations.
 
 .. image:: /../qwt/tests/data/testlauncher.png
@@ -26,7 +26,7 @@
 .. _GitHubPage: http://pierreraybaut.github.io/PythonQwt
 .. _GitHub: https://github.com/PierreRaybaut/PythonQwt
 """
-__version__ = "0.10.1"
+__version__ = "0.10.2"
 QWT_VERSION_STR = "6.1.5"
 
 import warnings

qwt/plot_marker.py

@@ -15,7 +15,6 @@
 
 from qwt.plot import QwtPlot, QwtPlotItem
 from qwt.text import QwtText
-from qwt.painter import QwtPainter
 from qwt.graphic import QwtGraphic
 from qwt.symbol import QwtSymbol
 from qwt.qthelpers import qcolor_from_str
@@ -239,7 +238,7 @@ def draw(self, painter, xMap, yMap, canvasRect):
         )
         self.drawLines(painter, canvasRect, pos)
         if self.__data.symbol and self.__data.symbol.style() != QwtSymbol.NoSymbol:
-            sz = self.__data.symbol.size()
+            sz = self.__data.symbol.size().toSize()
             clipRect = QRectF(
                 canvasRect.adjusted(-sz.width(), -sz.height(), sz.width(), sz.height())
             )

qwt/scale_widget.py

@@ -423,7 +423,7 @@ def draw(self, painter):
         ):
             self.drawColorBar(painter, self.colorBarRect(self.contentsRect()))
 
-        r = self.contentsRect()
+        r = QRectF(self.contentsRect())
         if self.__data.scaleDraw.orientation() == Qt.Horizontal:
             r.setLeft(r.left() + self.__data.borderDist[0])
             r.setWidth(r.width() - self.__data.borderDist[1])