PythonQwt 0.14.5__tar.gz → 0.14.6__tar.gz

{pythonqwt-0.14.5/PythonQwt.egg-info → pythonqwt-0.14.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PythonQwt
-Version: 0.14.5
+Version: 0.14.6
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement

{pythonqwt-0.14.5 → pythonqwt-0.14.6/PythonQwt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PythonQwt
-Version: 0.14.5
+Version: 0.14.6
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement

{pythonqwt-0.14.5 → pythonqwt-0.14.6}/qwt/__init__.py

@@ -55,7 +55,7 @@ from qwt.symbol import QwtSymbol as QSbl  # see deprecated section
 from qwt.text import QwtText  # noqa: F401
 from qwt.toqimage import array_to_qimage as toQImage  # noqa: F401
 
-__version__ = "0.14.5"
+__version__ = "0.14.6"
 QWT_VERSION_STR = "6.1.5"
 
 
@@ -132,28 +132,28 @@ class QwtSymbol(QSbl):
 class QwtPlotGrid(QPG):
     def majPen(self):
         warnings.warn(
-            "`majPen` has been removed in Qwt6: " "please use `majorPen` instead",
+            "`majPen` has been removed in Qwt6: please use `majorPen` instead",
             RuntimeWarning,
         )
         return self.majorPen()
 
     def minPen(self):
         warnings.warn(
-            "`minPen` has been removed in Qwt6: " "please use `minorPen` instead",
+            "`minPen` has been removed in Qwt6: please use `minorPen` instead",
             RuntimeWarning,
         )
         return self.minorPen()
 
     def setMajPen(self, *args):
         warnings.warn(
-            "`setMajPen` has been removed in Qwt6: " "please use `setMajorPen` instead",
+            "`setMajPen` has been removed in Qwt6: please use `setMajorPen` instead",
             RuntimeWarning,
         )
         return self.setMajorPen(*args)
 
     def setMinPen(self, *args):
         warnings.warn(
-            "`setMinPen` has been removed in Qwt6: " "please use `setMinorPen` instead",
+            "`setMinPen` has been removed in Qwt6: please use `setMinorPen` instead",
             RuntimeWarning,
         )
         return self.setMinorPen(*args)

{pythonqwt-0.14.5 → pythonqwt-0.14.6}/qwt/plot_canvas.py

@@ -13,7 +13,7 @@ QwtPlotCanvas
    :members:
 """
 
-import os
+from collections.abc import Sequence
 
 from qtpy.QtCore import QEvent, QObject, QPoint, QPointF, QRect, QRectF, QSize, Qt
 from qtpy.QtGui import (
@@ -34,8 +34,6 @@ from qtpy.QtWidgets import QFrame, QStyle, QStyleOption, QStyleOptionFrame
 from qwt.null_paintdevice import QwtNullPaintDevice
 from qwt.painter import QwtPainter
 
-QT_API = os.environ["QT_API"]
-
 
 class Border(object):
     def __init__(self):
@@ -71,17 +69,15 @@ class QwtStyleSheetRecorder(QwtNullPaintDevice):
             self.__origin = state.brushOrigin()
 
     def drawRects(self, rects, count):
-        if QT_API.startswith("pyside"):
-            # Pyside
-            if isinstance(rects, (QRect, QRectF)):
-                self.border.list = [rects]
-            else:
-                for i in range(count):
-                    self.border.rectList += [rects.getRect().index(i)]
+        if isinstance(rects, (QRect, QRectF)):
+            self.border.rectList = [QRectF(rects)]
+        elif isinstance(rects, Sequence):
+            self.border.rectList.extend(QRectF(rects[i]) for i in range(count))
         else:
-            # PyQt
-            for i in range(count):
-                self.border.rectList += [rects[i]]
+            raise TypeError(
+                "drawRects() expects a QRect, QRectF or a sequence of them, "
+                f"but got {type(rects).__name__}"
+            )
 
     def drawPath(self, path):
         rect = QRectF(QPointF(0.0, 0.0), self.__size)

{pythonqwt-0.14.5 → pythonqwt-0.14.6}/qwt/symbol.py

@@ -1104,8 +1104,7 @@ class QwtSymbol(object):
             painter.scale(ratio, ratio)
             isPinPointEnabled = self.__data.isPinPointEnabled
             self.__data.isPinPointEnabled = False
-            pos = QPointF()
-            self.renderSymbols(painter, pos, 1)
+            self.renderSymbols(painter, [QPointF()])
             self.__data.isPinPointEnabled = isPinPointEnabled
             painter.restore()
 

{pythonqwt-0.14.5 → pythonqwt-0.14.6}/qwt/transform.py

@@ -169,7 +169,8 @@ class QwtLogTransform(QwtTransform):
         :param float value: Value to be bounded
         :return: Value modified
         """
-        return np.clip(value, self.LogMin, self.LogMax)
+        bval = np.clip(np.asarray(value, dtype=np.float64), self.LogMin, self.LogMax)
+        return bval.item() if bval.ndim == 0 else bval
 
     def transform(self, value):
         """