PythonQwt 0.14.1__tar.gz → 0.14.3__tar.gz

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PythonQwt
-Version: 0.14.1
+Version: 0.14.3
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement
@@ -722,10 +722,12 @@ See documentation [online](https://pythonqwt.readthedocs.io/en/latest/) or [PDF]
 ## Sample
 
 ```python
-import qwt
 import numpy as np
+from qtpy import QtWidgets as QW
+
+import qwt
 
-app = qwt.qt.QtGui.QApplication([])
+app = QW.QApplication([])
 
 # Create plot widget
 plot = qwt.QwtPlot("Trigonometric functions")

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: PythonQwt
-Version: 0.14.1
+Version: 0.14.3
 Summary: Qt plotting widgets for Python
 Author-email: Pierre Raybaut <pierre.raybaut@gmail.com>
 License: PythonQwt License Agreement
@@ -722,10 +722,12 @@ See documentation [online](https://pythonqwt.readthedocs.io/en/latest/) or [PDF]
 ## Sample
 
 ```python
-import qwt
 import numpy as np
+from qtpy import QtWidgets as QW
+
+import qwt
 
-app = qwt.qt.QtGui.QApplication([])
+app = QW.QApplication([])
 
 # Create plot widget
 plot = qwt.QwtPlot("Trigonometric functions")

{pythonqwt-0.14.1 → pythonqwt-0.14.3}/PythonQwt.egg-info/SOURCES.txt

@@ -99,6 +99,7 @@ qwt/tests/test_loadtest.py
 qwt/tests/test_logcurve.py
 qwt/tests/test_mapdemo.py
 qwt/tests/test_multidemo.py
+qwt/tests/test_relativemargin.py
 qwt/tests/test_simple.py
 qwt/tests/test_stylesheet.py
 qwt/tests/test_symbols.py

{pythonqwt-0.14.1 → pythonqwt-0.14.3}/README.md

@@ -20,10 +20,12 @@ See documentation [online](https://pythonqwt.readthedocs.io/en/latest/) or [PDF]
 ## Sample
 
 ```python
-import qwt
 import numpy as np
+from qtpy import QtWidgets as QW
+
+import qwt
 
-app = qwt.qt.QtGui.QApplication([])
+app = QW.QApplication([])
 
 # Create plot widget
 plot = qwt.QwtPlot("Trigonometric functions")

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

{pythonqwt-0.14.1 → pythonqwt-0.14.3}/qwt/interval.py

@@ -396,18 +396,3 @@ class QwtInterval(object):
         if not self.isValid():
             return self
         return QwtInterval(min([value, self.__minValue]), max([value, self.__maxValue]))
-
-    def extend_fraction(self, value):
-        """
-        Extend the interval by a fraction of its width
-
-        :param float value: Fraction
-        :return: extended interval
-        """
-        if not self.isValid():
-            return self
-        return QwtInterval(
-            self.__minValue - value * self.width(),
-            self.__maxValue + value * self.width(),
-            self.__borderFlags,
-        )

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

@@ -588,7 +588,7 @@ class QwtPlot(QFrame):
     def axisMargin(self, axisId):
         """
         :param int axisId: Axis index
-        :return: Margin in % of the canvas size
+        :return: Relative margin of the axis, as a fraction of the full axis range
 
         .. seealso::
 
@@ -871,15 +871,17 @@ class QwtPlot(QFrame):
 
     def setAxisMargin(self, axisId, margin):
         """
-        Set the margin of the scale widget
+        Set the relative margin of the axis, as a fraction of the full axis range
 
         :param int axisId: Axis index
-        :param float margin: Margin in % of the canvas size
+        :param float margin: Relative margin (float between 0 and 1)
 
         .. seealso::
 
             :py:meth:`axisMargin()`
         """
+        if not isinstance(margin, float) or margin < 0.0 or margin > 1.0:
+            raise ValueError("margin must be a float between 0 and 1")
         if self.axisValid(axisId):
             d = self.__axisData[axisId]
             if margin != d.margin:
@@ -946,15 +948,13 @@ class QwtPlot(QFrame):
             minValue = d.minValue
             maxValue = d.maxValue
             stepSize = d.stepSize
-            if d.margin is not None:
-                intv_i = intv[axisId].extend_fraction(d.margin)
-            else:
-                intv_i = intv[axisId]
-            if d.doAutoScale and intv_i.isValid():
+            if d.doAutoScale and intv[axisId].isValid():
                 d.isValid = False
-                minValue = intv_i.minValue()
-                maxValue = intv_i.maxValue()
-                d.scaleEngine.autoScale(d.maxMajor, minValue, maxValue, stepSize)
+                minValue = intv[axisId].minValue()
+                maxValue = intv[axisId].maxValue()
+                minValue, maxValue, stepSize = d.scaleEngine.autoScale(
+                    d.maxMajor, minValue, maxValue, stepSize, d.margin
+                )
             if not d.isValid:
                 d.scaleDiv = d.scaleEngine.divideScale(
                     minValue, maxValue, d.maxMajor, d.maxMinor, stepSize
@@ -1560,9 +1560,9 @@ class QwtPlot(QFrame):
                 if self.__data.legend.parent() is not self:
                     self.__data.legend.setParent(self)
 
-                self.blockSignals(True)
+                self.legendDataChanged.disconnect(self.updateLegendItems)
                 self.updateLegend()
-                self.blockSignals(False)
+                self.legendDataChanged.connect(self.updateLegendItems)
 
                 lpos = self.__data.layout.legendPosition()
 
@@ -1706,7 +1706,6 @@ class QwtPlotItem_PrivateData(QObject):
         self.yAxis = QwtPlot.yLeft
         self.legendIconSize = QSize(8, 8)
         self.title = None  # QwtText
-        self.icon = None
 
 
 class QwtPlotItem(object):
@@ -1915,29 +1914,6 @@ class QwtPlotItem(object):
         """
         return self.__data.title
 
-    def setIcon(self, icon):
-        """
-        Set item icon
-
-        :param icon: Icon
-        :type icon: QIcon
-
-        .. seealso::
-
-            :py:meth:`icon()`
-        """
-        self.__data.icon = icon
-
-    def icon(self):
-        """
-        :return: Icon of the item
-
-        .. seealso::
-
-            :py:meth:`setIcon()`
-        """
-        return self.__data.icon
-
     def setItemAttribute(self, attribute, on=True):
         """
         Toggle an item attribute

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

@@ -37,8 +37,8 @@ from qwt.scale_div import QwtScaleDiv
 from qwt.transform import QwtLogTransform, QwtTransform
 
 DBL_MAX = sys.float_info.max
-LOG_MIN = 1.0e-100
-LOG_MAX = 1.0e100
+LOG_MIN = 1.0e-150
+LOG_MAX = 1.0e150
 
 
 def qwtLogInterval(base, interval):
@@ -198,7 +198,7 @@ class QwtScaleEngine(object):
         self.__data = QwtScaleEngine_PrivateData()
         self.setBase(base)
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
         """
         Align and divide an interval
 
@@ -206,6 +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
         :return: tuple (x1, x2, stepSize)
         """
         pass
@@ -473,7 +474,7 @@ class QwtLinearScaleEngine(QwtScaleEngine):
     def __init__(self, base=10):
         super(QwtLinearScaleEngine, self).__init__(base)
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
         """
         Align and divide an interval
 
@@ -481,12 +482,19 @@ 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
         :return: tuple (x1, x2, stepSize)
 
         .. seealso::
 
             :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
+            x1 -= margin
+            x2 += margin
+
         interval = QwtInterval(x1, x2)
         interval = interval.normalized()
         interval.setMinValue(interval.minValue() - self.lowerMargin())
@@ -640,7 +648,7 @@ class QwtLogScaleEngine(QwtScaleEngine):
         super(QwtLogScaleEngine, self).__init__(base)
         self.setTransformation(QwtLogTransform())
 
-    def autoScale(self, maxNumSteps, x1, x2, stepSize):
+    def autoScale(self, maxNumSteps, x1, x2, stepSize, relative_margin=0.0):
         """
         Align and divide an interval
 
@@ -648,6 +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
         :return: tuple (x1, x2, stepSize)
 
         .. seealso::
@@ -657,11 +666,20 @@ class QwtLogScaleEngine(QwtScaleEngine):
         if x1 > x2:
             x1, x2 = x2, x1
         logBase = self.base()
+
+        # Apply the relative margin (fraction of the interval width) in logarithmic
+        # space, and convert back to linear space.
+        if relative_margin 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
+            x1 /= math.pow(logBase, log_margin)
+            x2 *= math.pow(logBase, log_margin)
+
         interval = QwtInterval(
             x1 / math.pow(logBase, self.lowerMargin()),
             x2 * math.pow(logBase, self.upperMargin()),
         )
-        interval = interval.limited(LOG_MIN, LOG_MAX)
         if interval.maxValue() / interval.minValue() < logBase:
             linearScaler = QwtLinearScaleEngine()
             linearScaler.setAttributes(self.attributes())
@@ -674,10 +692,9 @@ class QwtLogScaleEngine(QwtScaleEngine):
             linearInterval = linearInterval.limited(LOG_MIN, LOG_MAX)
 
             if linearInterval.maxValue() / linearInterval.minValue() < logBase:
-                if stepSize < 0.0:
-                    stepSize = -math.log(abs(stepSize), logBase)
-                else:
-                    stepSize = math.log(stepSize, logBase)
+                # The min / max interval is too short to be represented as a log scale.
+                # Set the step to 0, so that a new step is calculated and a linear scale is used.
+                stepSize = 0.0
                 return x1, x2, stepSize
 
         logRef = 1.0

{pythonqwt-0.14.1 → pythonqwt-0.14.3}/qwt/tests/test_curvebenchmark1.py

@@ -142,6 +142,7 @@ class CurveBenchmark1(QMainWindow):
         self.text = BMText(self)
         self.tabs.addTab(self.text, "Contents")
         self.resize(*self.SIZE)
+        self.durations = []
 
         # Force window to show up and refresh (for test purpose only)
         self.show()
@@ -160,7 +161,9 @@ class CurveBenchmark1(QMainWindow):
         # Force widget to refresh (for test purpose only)
         QApplication.processEvents()
 
-        time_str = "Elapsed time: %d ms" % ((time.time() - t0) * 1000)
+        duration = (time.time() - t0) * 1000
+        self.durations.append(duration)
+        time_str = "Elapsed time: %d ms" % duration
         widget.text.setText(time_str)
         self.text.append("<br><i>%s:</i><br>%s" % (description, time_str))
         print("[%s] %s" % (utils.get_lib_versions(), time_str))

{pythonqwt-0.14.1 → pythonqwt-0.14.3}/qwt/tests/test_loadtest.py

@@ -10,6 +10,8 @@ SHOW = True  # Show test in GUI-based test launcher
 
 import time
 
+import numpy as np
+
 # Local imports
 from qwt.tests import test_curvebenchmark1 as cb
 from qwt.tests import utils
@@ -47,6 +49,9 @@ class LoadTest(cb.CurveBenchmark1):
                 symtext,
             )
             self.process_iteration(title, description, widget, t0)
+        print("")
+        time_str = "Average elapsed time: %d ms" % np.mean(self.durations)
+        print("[%s] %s" % (utils.get_lib_versions(), time_str))
 
 
 def test_loadtest():

pythonqwt-0.14.3/qwt/tests/test_relativemargin.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the PyQwt License
+# Copyright (C) 2003-2009 Gerard Vermeulen, for the original PyQwt example
+# Copyright (c) 2015 Pierre Raybaut, for the PyQt5/PySide port and further
+# developments (e.g. ported to PythonQwt API)
+# (see LICENSE file for more details)
+
+SHOW = True  # Show test in GUI-based test launcher
+
+from qtpy import QtWidgets as QW
+from qtpy.QtCore import Qt
+
+import qwt
+from qwt.tests import utils
+
+
+class RelativeMarginDemo(QW.QWidget):
+    def __init__(self, *args):
+        QW.QWidget.__init__(self, *args)
+        layout = QW.QGridLayout(self)
+        x = [1, 2, 3, 4]
+        y = [1, 500, 1000, 1500]
+        for i_row, log_scale in enumerate((False, True)):
+            for i_col, relative_margin in enumerate((0.0, None, 0.2)):
+                plot = qwt.QwtPlot(self)
+                qwt.QwtPlotGrid.make(
+                    plot, color=Qt.lightGray, width=0, style=Qt.DotLine
+                )
+                def_margin = plot.axisMargin(qwt.QwtPlot.yLeft)
+                scale_str = "lin/lin" if not log_scale else "log/lin"
+                if relative_margin is None:
+                    margin_str = f"default ({def_margin*100:.0f}%)"
+                else:
+                    margin_str = f"{relative_margin*100:.0f}%"
+                plot.setTitle(f"{scale_str}, margin: {margin_str}")
+                if relative_margin is not None:
+                    plot.setAxisMargin(qwt.QwtPlot.yLeft, relative_margin)
+                    plot.setAxisMargin(qwt.QwtPlot.xBottom, relative_margin)
+                color = "red" if i_row == 0 else "blue"
+                qwt.QwtPlotCurve.make(x, y, "", plot, linecolor=color)
+                layout.addWidget(plot, i_row, i_col)
+                if log_scale:
+                    engine = qwt.QwtLogScaleEngine()
+                    plot.setAxisScaleEngine(qwt.QwtPlot.yLeft, engine)
+
+
+def test_relative_margin():
+    """Test relative margin."""
+    utils.test_widget(RelativeMarginDemo, size=(400, 300), options=False)
+
+
+if __name__ == "__main__":
+    test_relative_margin()