PythonQwt 0.10.4__tar.gz → 0.10.6__tar.gz

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/CHANGELOG.md

@@ -1,5 +1,27 @@
 # PythonQwt Releases
 
+## Version 0.10.6
+
+- Qt6 support:
+  - Handled all occurences of deprecated ``QWidget.getContentsMargins`` method.
+  - Removed references to NonCosmeticDefaultPen
+  - Fixed `QApplication.desktop` `AttributeError`
+  - Fixed `QPrinter.HighResolution` `AttributeError` on Linux
+  - Fixed `QPrinter.setColorMode` `AttributeError` on PyQt6/Linux
+  - Fixed `QPrinter.setOrientation` deprecation issue
+  - Fixed `QPrinter.setPaperSize` deprecation issue
+- Improved unit tests:
+  - Ensure that tests are entirely executed before quitting (in unattended mode)
+  - Added more tests on `qwt.symbols`
+  - Added tests on `qwt.plot_renderer`
+- `qwt.plot_renderer`: fixed resolution type
+- `qwt.symbols`: fixed `QPointF` type mismatch
+- Removed CHM help file generation (obsolete)
+
+## Version 0.10.5
+
+- [Issue #81](https://github.com/PlotPyStack/PythonQwt/issues/81) - Signal disconnection issue with PySide 6.5.3
+
 ## Version 0.10.4
 
 - [Issue #80](https://github.com/PlotPyStack/PythonQwt/issues/80) - Print to PDF: AttributeError: 'NoneType' object has no attribute 'getContentsMargins'

{PythonQwt-0.10.4/PythonQwt.egg-info → PythonQwt-0.10.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonQwt
-Version: 0.10.4
+Version: 0.10.6
 Summary: Qt plotting widgets for Python
 Home-page: https://github.com/PlotPyStack/PythonQwt
 Author: Pierre Raybaut

{PythonQwt-0.10.4 → PythonQwt-0.10.6/PythonQwt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PythonQwt
-Version: 0.10.4
+Version: 0.10.6
 Summary: Qt plotting widgets for Python
 Home-page: https://github.com/PlotPyStack/PythonQwt
 Author: Pierre Raybaut

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/PythonQwt.egg-info/SOURCES.txt

@@ -98,10 +98,13 @@ qwt/tests/test_mapdemo.py
 qwt/tests/test_multidemo.py
 qwt/tests/test_simple.py
 qwt/tests/test_stylesheet.py
+qwt/tests/test_symbols.py
 qwt/tests/test_vertical.py
 qwt/tests/utils.py
 qwt/tests/data/PythonQwt.svg
+qwt/tests/data/basesymbol.png
 qwt/tests/data/bodedemo.png
+qwt/tests/data/builtinsymbol.png
 qwt/tests/data/cartesian.png
 qwt/tests/data/cpudemo.png
 qwt/tests/data/curvebenchmark1.png
@@ -111,12 +114,17 @@ qwt/tests/data/curvedemo2.png
 qwt/tests/data/data.png
 qwt/tests/data/errorbar.png
 qwt/tests/data/eventfilter.png
+qwt/tests/data/graphic.png
 qwt/tests/data/image.png
 qwt/tests/data/loadtest.png
 qwt/tests/data/logcurve.png
 qwt/tests/data/mapdemo.png
 qwt/tests/data/multidemo.png
+qwt/tests/data/path.png
+qwt/tests/data/pixmap.png
 qwt/tests/data/simple.png
 qwt/tests/data/stylesheet.png
+qwt/tests/data/svgdocument.png
+qwt/tests/data/symbol.svg
 qwt/tests/data/testlauncher.png
 qwt/tests/data/vertical.png

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/README.md

@@ -85,6 +85,15 @@ plot items needed by `guiqwt`): `QwtPlotItem` (base class), `QwtPlotItem`,
 See "Overview" section in [documentation](https://pythonqwt.readthedocs.io/en/latest/)
 for more details on API limitations when comparing to Qwt.
 
+## Roadmap
+
+The `qwt` package short-term roadmap is the following:
+
+- [ ] Drop support for PyQt4 and PySide2
+- [ ] Drop support for Python < 3.8
+- [ ] Replace `setup.py` by `pyproject.toml`, using `setuptools` (e.g. see `guidata`)
+- [ ] Add more unit tests: the ultimate goal is to reach 90% code coverage
+
 ## Dependencies
 
 ### Requirements

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/__init__.py

@@ -27,7 +27,7 @@ External resources:
 .. _GitHub: https://github.com/PlotPyStack/PythonQwt
 """
 
-__version__ = "0.10.4"
+__version__ = "0.10.6"
 QWT_VERSION_STR = "6.1.5"
 
 import warnings

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/dyngrid_layout.py

@@ -299,9 +299,11 @@ class QwtDynGridLayout(QLayout):
             return
         expandH = self.expandingDirections() & Qt.Horizontal
         expandV = self.expandingDirections() & Qt.Vertical
-        mleft, mtop, mright, mbottom = self.getContentsMargins()
+        margins = self.contentsMargins()
+        wmargins = margins.left() + margins.right()
+        hmargins = margins.top() + margins.bottom()
         if expandH:
-            xDelta = rect.width() - (mleft + mright) - (numColumns - 1) * self.spacing()
+            xDelta = rect.width() - wmargins - (numColumns - 1) * self.spacing()
             for col in range(numColumns):
                 xDelta -= colWidth[col]
             if xDelta > 0:
@@ -313,7 +315,7 @@ class QwtDynGridLayout(QLayout):
             numRows = self.itemCount() / numColumns
             if self.itemCount() % numColumns:
                 numRows += 1
-            yDelta = rect.height() - (mtop + mbottom) - (numRows - 1) * self.spacing()
+            yDelta = rect.height() - hmargins - (numRows - 1) * self.spacing()
             for row in range(numRows):
                 yDelta -= rowHeight[row]
             if yDelta > 0:

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/graphic.py

@@ -14,18 +14,19 @@ QwtGraphic
 """
 
 import math
-from qwt.null_paintdevice import QwtNullPaintDevice
-from qwt.painter_command import QwtPainterCommand
 
+from qtpy.QtCore import QPointF, QRect, QRectF, QSize, QSizeF, Qt
 from qtpy.QtGui import (
+    QImage,
+    QPaintEngine,
     QPainter,
     QPainterPathStroker,
-    QPaintEngine,
     QPixmap,
     QTransform,
-    QImage,
 )
-from qtpy.QtCore import Qt, QRectF, QSizeF, QSize, QPointF, QRect
+
+from qwt.null_paintdevice import QwtNullPaintDevice
+from qwt.painter_command import QwtPainterCommand
 
 
 def qwtHasScalablePen(painter):
@@ -33,10 +34,6 @@ def qwtHasScalablePen(painter):
     scalablePen = False
     if pen.style() != Qt.NoPen and pen.brush().style() != Qt.NoBrush:
         scalablePen = not pen.isCosmetic()
-        if not scalablePen and pen.widthF() == 0.0:
-            hints = painter.renderHints()
-            if hints & QPainter.NonCosmeticDefaultPen:
-                scalablePen = True
     return scalablePen
 
 
@@ -65,10 +62,6 @@ def qwtExecCommand(painter, cmd, renderHints, transform, initialTransform):
             and painter.transform().isScaling()
         ):
             isCosmetic = painter.pen().isCosmetic()
-            if isCosmetic and painter.pen().widthF() == 0.0:
-                hints = painter.renderHints()
-                if hints & QPainter.NonCosmeticDefaultPen:
-                    isCosmetic = False
             doMap = not isCosmetic
         if doMap:
             tr = painter.transform()

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/legend.py

@@ -308,7 +308,8 @@ class QwtLegendLabel(QwtTextLabel):
         spacing = max([spacing, 0])
         if spacing != self.__data.spacing:
             self.__data.spacing = spacing
-            margin = max(self.getContentsMargins())
+            mgn = self.contentsMargins()
+            margin = max([mgn.left(), mgn.top(), mgn.right(), mgn.bottom()])
             indent = margin + self.__data.spacing
             if self.__data.icon.width() > 0:
                 indent += self.__data.icon.width() + self.__data.spacing
@@ -912,12 +913,12 @@ class QwtLegend(QwtAbstractLegend):
         legendLayout = self.__data.view.contentsWidget.layout()
         if legendLayout is None:
             return
-        left, right, top, bottom = self.layout().getContentsMargins()
+        margins = self.layout().contentsMargins()
         layoutRect = QRect()
-        layoutRect.setLeft(math.ceil(rect.left()) + left)
-        layoutRect.setTop(math.ceil(rect.top()) + top)
-        layoutRect.setRight(math.ceil(rect.right()) - right)
-        layoutRect.setBottom(math.ceil(rect.bottom()) - bottom)
+        layoutRect.setLeft(math.ceil(rect.left()) + margins.left())
+        layoutRect.setTop(math.ceil(rect.top()) + margins.top())
+        layoutRect.setRight(math.ceil(rect.right()) - margins.right())
+        layoutRect.setBottom(math.ceil(rect.bottom()) - margins.bottom())
         numCols = legendLayout.columnsForWidth(layoutRect.width())
         itemRects = legendLayout.layoutItems(layoutRect, numCols)
         index = 0
@@ -949,7 +950,8 @@ class QwtLegend(QwtAbstractLegend):
         if label is not None:
             icon = label.data().icon()
             sz = icon.defaultSize()
-            margin = max(label.getContentsMargins())
+            mgn = label.contentsMargins()
+            margin = max([mgn.left(), mgn.top(), mgn.right(), mgn.bottom()])
             iconRect = QRectF(
                 rect.x() + margin,
                 rect.center().y() - 0.5 * sz.height(),

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/painter.py

@@ -13,24 +13,24 @@ QwtPainterClass
    :members:
 """
 
-from qwt.color_map import QwtColorMap
-from qwt.scale_map import QwtScaleMap
-
+from qtpy import QtCore as QC
+from qtpy.QtCore import QLineF, QPoint, QRect, QRectF, Qt
 from qtpy.QtGui import (
+    QBrush,
+    QColor,
+    QLinearGradient,
     QPaintEngine,
-    QPixmap,
     QPainter,
+    QPainterPath,
     QPalette,
     QPen,
-    QBrush,
+    QPixmap,
     QRegion,
-    QLinearGradient,
-    QPainterPath,
-    QColor,
 )
-from qtpy.QtWidgets import QFrame, QStyle, QStyleOptionFocusRect, QStyleOption
-from qtpy.QtCore import Qt, QRect, QPoint, QRectF, QLineF
-from qtpy import QtCore as QC
+from qtpy.QtWidgets import QFrame, QStyle, QStyleOption, QStyleOptionFocusRect
+
+from qwt.color_map import QwtColorMap
+from qwt.scale_map import QwtScaleMap
 
 QT_MAJOR_VERSION = int(QC.__version__.split(".")[0])
 
@@ -64,26 +64,10 @@ class QwtPainterClass(object):
     """A collection of `QPainter` workarounds"""
 
     def drawImage(self, painter, rect, image):
-        alignedRect = rect.toAlignedRect()
-        if alignedRect != rect:
-            clipRect = rect.adjusted(0.0, 0.0, -1.0, -1.0)
-            painter.save()
-            painter.setClipRect(clipRect, Qt.IntersectClip)
-            painter.drawImage(alignedRect, image)
-            painter.restore()
-        else:
-            painter.drawImage(alignedRect, image)
+        painter.drawImage(rect, image)
 
     def drawPixmap(self, painter, rect, pixmap):
-        alignedRect = rect.toAlignedRect()
-        if alignedRect != rect:
-            clipRect = rect.adjusted(0.0, 0.0, -1.0, -1.0)
-            painter.save()
-            painter.setClipRect(clipRect, Qt.IntersectClip)
-            painter.drawPixmap(alignedRect, pixmap)
-            painter.restore()
-        else:
-            painter.drawPixmap(alignedRect, pixmap)
+        painter.drawPixmap(rect, pixmap)
 
     def drawFocusRect(self, *args):
         if len(args) == 2:
@@ -397,7 +381,7 @@ class QwtPainterClass(object):
                 pmPainter.setPen(c)
                 pmPainter.drawLine(QLineF(devRect.left(), y, devRect.right(), y))
         pmPainter.end()
-        self.drawPixmap(painter, rect, pixmap)
+        self.drawPixmap(painter, devRect, pixmap)
 
     def fillPixmap(self, widget, pixmap, offset=None):
         """
@@ -447,7 +431,7 @@ class QwtPainterClass(object):
         if widget.testAttribute(Qt.WA_StyledBackground):
             opt = QStyleOption()
             opt.initFrom(widget)
-            opt.rect = QRectF(rect).toAlignedRect()
+            opt.rect = rect
             widget.style().drawPrimitive(QStyle.PE_Widget, opt, painter, widget)
         else:
             brush = widget.palette().brush(widget.backgroundRole())

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/plot.py

@@ -21,34 +21,21 @@ QwtPlotItem
 
 import math
 
-from qtpy.QtWidgets import (
-    QWidget,
-    QSizePolicy,
-    QFrame,
-    QApplication,
-)
-from qtpy.QtGui import QFont, QPainter, QPalette, QColor, QBrush
-from qtpy.QtCore import Qt, Signal, QEvent, QSize, QRectF
+import numpy as np
+from qtpy.QtCore import QEvent, QRectF, QSize, Qt, Signal
+from qtpy.QtGui import QBrush, QColor, QFont, QPainter, QPalette
+from qtpy.QtWidgets import QApplication, QFrame, QSizePolicy, QWidget
 
-from qwt.text import QwtText, QwtTextLabel
-from qwt.scale_widget import QwtScaleWidget
-from qwt.scale_draw import QwtScaleDraw
-from qwt.scale_engine import QwtLinearScaleEngine
+from qwt.graphic import QwtGraphic
+from qwt.interval import QwtInterval
+from qwt.legend import QwtLegendData
 from qwt.plot_canvas import QwtPlotCanvas
 from qwt.scale_div import QwtScaleDiv
+from qwt.scale_draw import QwtScaleDraw
+from qwt.scale_engine import QwtLinearScaleEngine
 from qwt.scale_map import QwtScaleMap
-from qwt.graphic import QwtGraphic
-from qwt.legend import QwtLegendData
-from qwt.interval import QwtInterval
-
-import numpy as np
-
-
-def qwtEnableLegendItems(plot, on):
-    if on:
-        plot.legendDataChanged.connect(plot.updateLegendItems)
-    else:
-        plot.legendDataChanged.disconnect(plot.updateLegendItems)
+from qwt.scale_widget import QwtScaleWidget
+from qwt.text import QwtText, QwtTextLabel
 
 
 def qwtSetTabOrder(first, second, with_children):
@@ -88,111 +75,10 @@ class ItemList(list):
         self.sortItems()
 
 
-class QwtPlotDict_PrivateData(object):
-    def __init__(self):
-        self.itemList = ItemList()
-        self.autoDelete = True
-
-
-class QwtPlotDict(object):
-    """
-    A dictionary for plot items
-
-    `QwtPlotDict` organizes plot items in increasing z-order.
-    If `autoDelete()` is enabled, all attached items will be deleted
-    in the destructor of the dictionary.
-    `QwtPlotDict` can be used to get access to all `QwtPlotItem` items - or
-    all items of a specific type -  that are currently on the plot.
-
-    .. seealso::
-
-        :py:meth:`QwtPlotItem.attach()`, :py:meth:`QwtPlotItem.detach()`,
-        :py:meth:`QwtPlotItem.z()`
-    """
-
-    def __init__(self):
-        self.__data = QwtPlotDict_PrivateData()
-
-    def setAutoDelete(self, autoDelete):
-        """
-        En/Disable Auto deletion
-
-        If Auto deletion is on all attached plot items will be deleted
-        in the destructor of `QwtPlotDict`. The default value is on.
-
-        :param bool autoDelete: enable/disable
-
-        .. seealso::
-
-            :py:meth:`autoDelete()`, :py:meth:`insertItem()`
-        """
-        self.__data.autoDelete = autoDelete
-
-    def autoDelete(self):
-        """
-        :return: true if auto deletion is enabled
-
-        .. seealso::
-
-            :py:meth:`setAutoDelete()`, :py:meth:`insertItem()`
-        """
-        return self.__data.autoDelete
-
-    def insertItem(self, item):
-        """
-        Insert a plot item
-
-        :param qwt.plot.QwtPlotItem item: PlotItem
-
-        .. seealso::
-
-            :py:meth:`removeItem()`
-        """
-        self.__data.itemList.insertItem(item)
-
-    def removeItem(self, item):
-        """
-        Remove a plot item
-
-        :param qwt.plot.QwtPlotItem item: PlotItem
-
-        .. seealso::
-
-            :py:meth:`insertItem()`
-        """
-        self.__data.itemList.removeItem(item)
-
-    def detachItems(self, rtti=None):
-        """
-        Detach items from the dictionary
-
-        :param rtti: In case of `QwtPlotItem.Rtti_PlotItem` or None (default) detach all items otherwise only those items of the type rtti.
-        :type rtti: int or None
-        """
-        for item in self.__data.itemList[:]:
-            if rtti in (None, QwtPlotItem.Rtti_PlotItem) or item.rtti() == rtti:
-                item.attach(None)
-
-    def itemList(self, rtti=None):
-        """
-        A list of attached plot items.
-
-        Use caution when iterating these lists, as removing/detaching an
-        item will invalidate the iterator. Instead you can place pointers
-        to objects to be removed in a removal list, and traverse that list
-        later.
-
-        :param int rtti: In case of `QwtPlotItem.Rtti_PlotItem` detach all items otherwise only those items of the type rtti.
-        :return: List of all attached plot items of a specific type. If rtti is None, return a list of all attached plot items.
-        """
-        if rtti is None or rtti == QwtPlotItem.Rtti_PlotItem:
-            return self.__data.itemList
-        return [item for item in self.__data.itemList if item.rtti() == rtti]
-
-
-class QwtPlot_PrivateData(QwtPlotDict_PrivateData):
+class QwtPlot_PrivateData(object):
     def __init__(self):
         super(QwtPlot_PrivateData, self).__init__()
+        self.itemList = ItemList()
         self.titleLabel = None
         self.footerLabel = None
         self.canvas = None
@@ -217,7 +103,7 @@ class AxisData(object):
         self.scaleWidget = None  # QwtScaleWidget
 
 
-class QwtPlot(QwtPlotDict, QFrame):
+class QwtPlot(QFrame):
     """
     A 2-D plotting widget
 
@@ -300,7 +186,6 @@ class QwtPlot(QwtPlotDict, QFrame):
                 "%s() takes 0, 1 or 2 argument(s) (%s given)"
                 % (self.__class__.__name__, len(args))
             )
-        QwtPlotDict.__init__(self)
         QFrame.__init__(self, parent)
 
         self.__layout_state = None
@@ -359,7 +244,74 @@ class QwtPlot(QwtPlotDict, QFrame):
         for idx in range(len(focusChain) - 1):
             qwtSetTabOrder(focusChain[idx], focusChain[idx + 1], False)
 
-        qwtEnableLegendItems(self, True)
+        self.legendDataChanged.connect(self.updateLegendItems)
+
+    def insertItem(self, item):
+        """
+        Insert a plot item
+
+        :param qwt.plot.QwtPlotItem item: PlotItem
+
+        .. seealso::
+
+            :py:meth:`removeItem()`
+
+        .. note::
+
+            This was a member of QwtPlotDict in older versions.
+        """
+        self.__data.itemList.insertItem(item)
+
+    def removeItem(self, item):
+        """
+        Remove a plot item
+
+        :param qwt.plot.QwtPlotItem item: PlotItem
+
+        .. seealso::
+
+            :py:meth:`insertItem()`
+
+        .. note::
+
+            This was a member of QwtPlotDict in older versions.
+        """
+        self.__data.itemList.removeItem(item)
+
+    def detachItems(self, rtti=None):
+        """
+        Detach items from the dictionary
+
+        :param rtti: In case of `QwtPlotItem.Rtti_PlotItem` or None (default) detach all items otherwise only those items of the type rtti.
+        :type rtti: int or None
+
+        .. note::
+
+            This was a member of QwtPlotDict in older versions.
+        """
+        for item in self.__data.itemList[:]:
+            if rtti in (None, QwtPlotItem.Rtti_PlotItem) or item.rtti() == rtti:
+                item.attach(None)
+
+    def itemList(self, rtti=None):
+        """
+        A list of attached plot items.
+
+        Use caution when iterating these lists, as removing/detaching an
+        item will invalidate the iterator. Instead you can place pointers
+        to objects to be removed in a removal list, and traverse that list
+        later.
+
+        :param int rtti: In case of `QwtPlotItem.Rtti_PlotItem` detach all items otherwise only those items of the type rtti.
+        :return: List of all attached plot items of a specific type. If rtti is None, return a list of all attached plot items.
+
+        .. note::
+
+            This was a member of QwtPlotDict in older versions.
+        """
+        if rtti is None or rtti == QwtPlotItem.Rtti_PlotItem:
+            return self.__data.itemList
+        return [item for item in self.__data.itemList if item.rtti() == rtti]
 
     def setFlatStyle(self, state):
         """
@@ -1573,9 +1525,9 @@ class QwtPlot(QwtPlotDict, QFrame):
                 if self.__data.legend.parent() is not self:
                     self.__data.legend.setParent(self)
 
-                qwtEnableLegendItems(self, False)
+                self.blockSignals(True)
                 self.updateLegend()
-                qwtEnableLegendItems(self, True)
+                self.blockSignals(False)
 
                 lpos = self.__data.layout.legendPosition()
 
@@ -1686,7 +1638,7 @@ class QwtPlot(QwtPlotDict, QFrame):
         renderer.renderTo(self, printer)
 
     def exportTo(
-        self, filename, size=(800, 600), size_mm=None, resolution=72.0, format_=None
+        self, filename, size=(800, 600), size_mm=None, resolution=85, format_=None
     ):
         """
         Export plot to PDF or image file (SVG, PNG, ...)
@@ -1694,7 +1646,7 @@ class QwtPlot(QwtPlotDict, QFrame):
         :param str filename: Filename
         :param tuple size: (width, height) size in pixels
         :param tuple size_mm: (width, height) size in millimeters
-        :param float resolution: Image resolution
+        :param int resolution: Resolution in dots per Inch (dpi)
         :param str format_: File format (PDF, SVG, PNG, ...)
         """
         if size_mm is None:

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/plot_canvas.py

@@ -15,26 +15,25 @@ QwtPlotCanvas
 
 import os
 
-from qwt.null_paintdevice import QwtNullPaintDevice
-from qwt.painter import QwtPainter
-
+from qtpy import QtCore as QC
+from qtpy.QtCore import QEvent, QPointF, QRect, QRectF, QSizeF, Qt
 from qtpy.QtGui import (
-    QPaintEngine,
-    QPen,
     QBrush,
-    QRegion,
+    QGradient,
     QImage,
+    QPaintEngine,
+    QPainter,
     QPainterPath,
+    QPen,
     QPixmap,
-    QGradient,
-    QPainter,
-    qAlpha,
     QPolygonF,
+    QRegion,
+    qAlpha,
 )
-from qtpy.QtWidgets import QFrame, QStyleOption, QStyle
-from qtpy.QtCore import Qt, QSizeF, QEvent, QPointF, QRectF, QRect
-from qtpy import QtCore as QC
+from qtpy.QtWidgets import QFrame, QStyle, QStyleOption
 
+from qwt.null_paintdevice import QwtNullPaintDevice
+from qwt.painter import QwtPainter
 
 QT_MAJOR_VERSION = int(QC.__version__.split(".")[0])
 QT_API = os.environ["QT_API"]
@@ -310,8 +309,7 @@ def qwtFillBackground(*args):
         else:
             clipRegion = widget.contentsRect()
         bgWidget = qwtBackgroundWidget(widget.parentWidget())
-        for fillRect in fillRects:
-            rect = QRectF(fillRect).toAlignedRect()
+        for rect in fillRects:
             if clipRegion.intersects(rect):
                 pm = QPixmap(rect.size())
                 QwtPainter.fillPixmap(

{PythonQwt-0.10.4 → PythonQwt-0.10.6}/qwt/plot_layout.py

@@ -135,7 +135,10 @@ class QwtPlotLayout_LayoutData(object):
                 self.scale[axis].dimWithoutTitle = 0
         layout = plot.canvas().layout()
         if layout is not None:
-            self.canvas.contentsMargins = layout.getContentsMargins()
+            mgn = layout.contentsMargins()
+            self.canvas.contentsMargins = [
+                mgn.left(), mgn.top(), mgn.right(), mgn.bottom()
+            ]
 
 
 class QwtPlotLayout_PrivateData(object):
@@ -571,7 +574,10 @@ class QwtPlotLayout(object):
         if layout is None:
             left, top, right, bottom = 0, 0, 0, 0
         else:
-            left, top, right, bottom = layout.getContentsMargins()
+            mgn = layout.contentsMargins()
+            left, top, right, bottom = (
+                mgn.left(), mgn.top(), mgn.right(), mgn.bottom()
+            )
         for axis in QwtPlot.AXES:
             if plot.axisEnabled(axis):
                 scl = plot.axisWidget(axis)