PythonQwt 0.14.3__tar.gz → 0.14.4__tar.gz

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

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

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

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

{pythonqwt-0.14.3 → pythonqwt-0.14.4}/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.3"
+__version__ = "0.14.4"
 QWT_VERSION_STR = "6.1.5"
 
 

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

@@ -1391,7 +1391,7 @@ class QwtPlot(QFrame):
             :py:meth:`QwtPlotItem.getCanvasMarginHint()`
         """
         maps = [self.canvasMap(axisId) for axisId in self.AXES]
-        self.drawItems(painter, self.__data.canvas.contentsRect(), maps)
+        self.drawItems(painter, QRectF(self.__data.canvas.contentsRect()), maps)
 
     def drawItems(self, painter, canvasRect, maps):
         """

{pythonqwt-0.14.3 → pythonqwt-0.14.4}/qwt/scale_engine.py

@@ -198,7 +198,7 @@ class QwtScaleEngine(object):
         self.__data = QwtScaleEngine_PrivateData()
         self.setBase(base)
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relativeMargin=0.0):
         """
         Align and divide an interval
 
@@ -206,7 +206,7 @@ class QwtScaleEngine(object):
         :param float x1: First limit of the interval (In/Out)
         :param float x2: Second limit of the interval (In/Out)
         :param float stepSize: Step size
-        :param float relative_margin: Margin as a fraction of the interval width
+        :param float relativeMargin: Margin as a fraction of the interval width
         :return: tuple (x1, x2, stepSize)
         """
         pass
@@ -474,7 +474,7 @@ class QwtLinearScaleEngine(QwtScaleEngine):
     def __init__(self, base=10):
         super(QwtLinearScaleEngine, self).__init__(base)
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relativeMargin=0.0):
         """
         Align and divide an interval
 
@@ -482,7 +482,7 @@ class QwtLinearScaleEngine(QwtScaleEngine):
         :param float x1: First limit of the interval (In/Out)
         :param float x2: Second limit of the interval (In/Out)
         :param float stepSize: Step size
-        :param float relative_margin: Margin as a fraction of the interval width
+        :param float relativeMargin: Margin as a fraction of the interval width
         :return: tuple (x1, x2, stepSize)
 
         .. seealso::
@@ -490,8 +490,8 @@ class QwtLinearScaleEngine(QwtScaleEngine):
             :py:meth:`setAttribute()`
         """
         # Apply the relative margin (fraction of the interval width) in linear space:
-        if relative_margin > 0.0:
-            margin = (x2 - x1) * relative_margin
+        if relativeMargin > 0.0:
+            margin = (x2 - x1) * relativeMargin
             x1 -= margin
             x2 += margin
 
@@ -648,7 +648,7 @@ class QwtLogScaleEngine(QwtScaleEngine):
         super(QwtLogScaleEngine, self).__init__(base)
         self.setTransformation(QwtLogTransform())
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relativeMargin=0.0):
         """
         Align and divide an interval
 
@@ -656,7 +656,7 @@ class QwtLogScaleEngine(QwtScaleEngine):
         :param float x1: First limit of the interval (In/Out)
         :param float x2: Second limit of the interval (In/Out)
         :param float stepSize: Step size
-        :param float relative_margin: Margin as a fraction of the interval width
+        :param float relativeMargin: Margin as a fraction of the interval width
         :return: tuple (x1, x2, stepSize)
 
         .. seealso::
@@ -669,10 +669,10 @@ class QwtLogScaleEngine(QwtScaleEngine):
 
         # Apply the relative margin (fraction of the interval width) in logarithmic
         # space, and convert back to linear space.
-        if relative_margin is not None:
+        if relativeMargin is not None:
             x1 = min(max([x1, LOG_MIN]), LOG_MAX)
             x2 = min(max([x2, LOG_MIN]), LOG_MAX)
-            log_margin = math.log(x2 / x1, logBase) * relative_margin
+            log_margin = math.log(x2 / x1, logBase) * relativeMargin
             x1 /= math.pow(logBase, log_margin)
             x2 *= math.pow(logBase, log_margin)
 

{pythonqwt-0.14.3 → pythonqwt-0.14.4}/qwt/tests/test_cpudemo.py

@@ -11,7 +11,7 @@ SHOW = True  # Show test in GUI-based test launcher
 import os
 
 import numpy as np
-from qtpy.QtCore import QRect, Qt, QTime
+from qtpy.QtCore import QRectF, Qt, QTime
 from qtpy.QtGui import QBrush, QColor
 from qtpy.QtWidgets import QLabel, QVBoxLayout, QWidget
 
@@ -225,7 +225,7 @@ class CpuPieMarker(QwtPlotMarker):
 
     def draw(self, painter, xMap, yMap, rect):
         margin = 5
-        pieRect = QRect()
+        pieRect = QRectF()
         pieRect.setX(rect.x() + margin)
         pieRect.setY(rect.y() + margin)
         pieRect.setHeight(int(yMap.transform(80.0)))
@@ -263,7 +263,7 @@ class Background(QwtPlotItem):
 
     def draw(self, painter, xMap, yMap, rect):
         c = QColor(Qt.white)
-        r = QRect(rect)
+        r = QRectF(rect)
 
         for i in range(100, 0, -10):
             r.setBottom(int(yMap.transform(i - 10)))