PythonQwt 0.14.4__tar.gz → 0.14.6__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PythonQwt
-Version: 0.14.4
+Version: 0.14.6
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement
@@ -699,6 +699,7 @@ Requires-Dist: python-docs-theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-xvfb; extra == "test"
+Dynamic: license-file
 
 # PythonQwt: Qt plotting widgets for Python
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PythonQwt
-Version: 0.14.4
+Version: 0.14.6
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement
@@ -699,6 +699,7 @@ Requires-Dist: python-docs-theme; extra == "doc"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-xvfb; extra == "test"
+Dynamic: license-file
 
 # PythonQwt: Qt plotting widgets for Python
 

{pythonqwt-0.14.4 → pythonqwt-0.14.6}/pyproject.toml

@@ -69,6 +69,7 @@ target-version = "py39"                        # Assume Python 3.9.
 select = ["E", "F", "W", "I", "NPY201"]
 ignore = [
     "E203", # space before : (needed for how black formats slicing)
+    "E501", # line too long
 ]
 
 [tool.ruff.format]

{pythonqwt-0.14.4 → 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.4"
+__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.4 → pythonqwt-0.14.6}/qwt/graphic.py

@@ -139,20 +139,20 @@ class PathInfo(object):
             rect = transform.mapRect(self.__boundingRect)
         else:
             rect = transform.mapRect(self.__pointRect)
-            l = abs(self.__pointRect.left() - self.__boundingRect.left())
-            r = abs(self.__pointRect.right() - self.__boundingRect.right())
-            t = abs(self.__pointRect.top() - self.__boundingRect.top())
-            b = abs(self.__pointRect.bottom() - self.__boundingRect.bottom())
-            rect.adjust(-l, -t, r, b)
+            left_diff = abs(self.__pointRect.left() - self.__boundingRect.left())
+            right_diff = abs(self.__pointRect.right() - self.__boundingRect.right())
+            top_diff = abs(self.__pointRect.top() - self.__boundingRect.top())
+            bottom_diff = abs(self.__pointRect.bottom() - self.__boundingRect.bottom())
+            rect.adjust(-left_diff, -top_diff, right_diff, bottom_diff)
         return rect
 
     def scaleFactorX(self, pathRect, targetRect, scalePens):
         if pathRect.width() <= 0.0:
             return 0.0
         p0 = self.__pointRect.center()
-        l = abs(pathRect.left() - p0.x())
+        left_diff = abs(pathRect.left() - p0.x())
         r = abs(pathRect.right() - p0.x())
-        w = 2.0 * min([l, r]) * targetRect.width() / pathRect.width()
+        w = 2.0 * min([left_diff, r]) * targetRect.width() / pathRect.width()
         if scalePens and self.__scalablePen:
             sx = w / self.__boundingRect.width()
         else:

{pythonqwt-0.14.4 → pythonqwt-0.14.6}/qwt/painter.py

@@ -393,7 +393,7 @@ class QwtPainterClass(object):
         if widget.testAttribute(Qt.WA_StyledBackground):
             opt = QStyleOption()
             opt.initFrom(widget)
-            opt.rect = rect
+            opt.rect = rect.toRect()
             widget.style().drawPrimitive(QStyle.PE_Widget, opt, painter, widget)
         else:
             brush = widget.palette().brush(widget.backgroundRole())

{pythonqwt-0.14.4 → pythonqwt-0.14.6}/qwt/plot.py

@@ -1553,6 +1553,7 @@ class QwtPlot(QFrame):
         self.__data.layout.setLegendPosition(pos, ratio)
         if legend != self.__data.legend:
             if self.__data.legend and self.__data.legend.parent() is self:
+                self.__data.legend.setParent(None)
                 del self.__data.legend
             self.__data.legend = legend
             if self.__data.legend:

{pythonqwt-0.14.4 → 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.4 → pythonqwt-0.14.6}/qwt/plot_curve.py

@@ -16,6 +16,7 @@ QwtPlotCurve
 import math
 import os
 
+import numpy as np
 from qtpy.QtCore import QLineF, QPointF, QRectF, QSize, Qt
 from qtpy.QtGui import QBrush, QColor, QPainter, QPen, QPolygonF
 
@@ -40,8 +41,6 @@ if QT_API == "pyside6":
 
     import shiboken6 as shiboken
 
-import numpy as np
-
 
 def qwtUpdateLegendIconSize(curve):
     if curve.symbol() and curve.testLegendAttribute(QwtPlotCurve.LegendShowSymbol):

{pythonqwt-0.14.4 → 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.4 → 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):
         """