PythonQwt 0.10.4__py2.py3-none-any.whl → 0.10.6__py2.py3-none-any.whl

{PythonQwt-0.10.4.dist-info → PythonQwt-0.10.6.dist-info}/METADATA

@@ -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.dist-info → PythonQwt-0.10.6.dist-info}/RECORD

@@ -1,78 +1,86 @@
-qwt/__init__.py,sha256=KtaS7yoAuV0dieZcZhp7CxEUCiTsTUoJpFP1-t4I474,5800
+qwt/__init__.py,sha256=CklnpMd6ZslJAB9_HCKOfGSaBDBVmP6E51kpQwpGo7Q,5800
 qwt/_math.py,sha256=Xut9qwwwnzykC5YV2H3h9F4W9z8jv61ckPtMt941hVQ,1584
 qwt/color_map.py,sha256=LkeEyZcZ60rfceZ-G6YwuY6ljjBoDfYr9NDJtX_hqGE,11824
 qwt/column_symbol.py,sha256=gY57VFgmLo0JwT-7AK7ITli61WzUAdQptQTcYHQbUdo,5720
-qwt/dyngrid_layout.py,sha256=QHbyVX1Y4YAuTaPhlxL2AXluLD8-L521N-Y22bzfY-M,13367
-qwt/graphic.py,sha256=hPnjRF08foEsUW1i1UVe-t_jDIqjWWL7No5_c_ebH3M,28446
+qwt/dyngrid_layout.py,sha256=cakSak1zfqucK6ULe1eWdBgOhfQA9sCmkJXwpo_458U,13433
+qwt/graphic.py,sha256=f6IcwY5uxJ3v13xvG0aaF8b8puyuLlB9Yy_ukw6Syj0,28051
 qwt/interval.py,sha256=PMrCQxV9NXGk2JG0MNjJ3zGTNTSSRfa_noxbpm-Okns,12287
-qwt/legend.py,sha256=N455HProPp7mbFrBls5bqCP0q2qblSg4NxM6hU5E6i4,31082
+qwt/legend.py,sha256=mEssQrvFmldRNH7I4rCmDtdK30enH1Nwwq0LgGsDZ-w,31236
 qwt/null_paintdevice.py,sha256=09zYxGLCkdlRhP4hbNIUz4RzEr1Rteso2Ex55PqOEWA,9136
-qwt/painter.py,sha256=E3QeJwrn7cS5aCS5mV9QrkwHqv5U_ZYZcnrhur4I-0k,19343
+qwt/painter.py,sha256=su89df7OzEzH23ImahH2F_mhG_oDThHuBGvDIP8rPO0,18652
 qwt/painter_command.py,sha256=WMHeAWn5ngsmX8hoIVgICTaD1YPYWzGnfUvy0OVO9wA,6955
-qwt/plot.py,sha256=y-rF3x_ulwAvI6k1amJ0-2tpvOMlCt8_AfHFVFp803g,76213
-qwt/plot_canvas.py,sha256=eXFnJ26e_Bbo6jf1qwRRShRqUo16rDgOmGDcIBErvhM,30850
+qwt/plot.py,sha256=O0S5MRcYZNB5bIgXxyZnLBksuitMLa5DBeRcW3fRNwU,74910
+qwt/plot_canvas.py,sha256=biNd-JWUAbwFF1uLW0Yg9sWQ-Eoofdj37qKpp7MrlBo,30791
 qwt/plot_curve.py,sha256=6B3MAPN9-aethy8eqZo4ADtlSBrQO9ggY1z0JkvoKxQ,37270
 qwt/plot_directpainter.py,sha256=TrgiFLdHu2DH-V_aOfH4DQawTaZUaS3EZxTQ-eWRyJc,10537
 qwt/plot_grid.py,sha256=w4bJhR5VDvoXF0dwjcejYIF6t5nZz7vG1Jdq5g3h_1c,16563
-qwt/plot_layout.py,sha256=FhQVYDtvsuvJJqhUAcBbGUt4uUBQZ_N7UrZEvJUrzjk,45829
+qwt/plot_layout.py,sha256=4efiyTSMkw1lW3XuOtQWGjUvkgWh8ybOV3VT_klqZjw,46027
 qwt/plot_marker.py,sha256=ADrdoYaaRqTiyHt3ypAX_9CQvRPyE6GV3Vrm-6K2m88,21272
-qwt/plot_renderer.py,sha256=Tf5aHc3mCs7YlClBEsyXozoMAMenxtt24MHJ7gOUklQ,26663
+qwt/plot_renderer.py,sha256=I4YvEDgA2CTEDq6bj_ptGI214R-QAc184Yp_x7yA-Cg,27166
 qwt/plot_series.py,sha256=H-fUfw-0Edfrn8PIpaRQ1T1yqrHMuMDcNJffrM61aHE,11043
 qwt/qthelpers.py,sha256=koM5xFt2WQCG4JZyu96AdSB4END_CoFn4ivd1rVXcnU,1585
 qwt/scale_div.py,sha256=pZmsg-PIof3yAeLTfiFMC3tMvNSSMHomkYWnAe3eEjw,9276
 qwt/scale_draw.py,sha256=V2sYXOdMN7PF-6oYpJs6XDt8fgXsApj3YUswE-cjGfA,37720
 qwt/scale_engine.py,sha256=2eA491abgPpcIBarszCFSk3IQTy8vGvATDzjzRm6ewo,29070
-qwt/scale_map.py,sha256=pw3FHwrxilof9kdkPSHmrbp_HA96eRWF7apZlPwSPvM,9576
-qwt/scale_widget.py,sha256=XPD0hvB91pQGkRH9czd-YFhuZiNAC7Q1MdhSmjdx-U4,26978
-qwt/symbol.py,sha256=Op-8_A7FpwIncsORTsbmV8abLhovzYN9AV9dIIeCiN4,41434
-qwt/text.py,sha256=MenZcme72HH_7O5fsYqdlFJGyNmUGDBXhugGtgH2_EA,41977
+qwt/scale_map.py,sha256=WobkNna6_RPXYZjGK7gZLykNxN_kYnrcB6fEaWgnL2w,9182
+qwt/scale_widget.py,sha256=L5QbEM5E26bd50JD8mMdKrjO_x2ovzopzrulTfjOd1Q,27077
+qwt/symbol.py,sha256=3kcS0cszZiJwcWK_Nj86b8rfAtYYChmaQ-gSohK0GJY,41347
+qwt/text.py,sha256=Z3qg6HBKqgCuTPhJ4VpKTqUBGbLtbPMJ-UBI9V6DAGI,42074
 qwt/toqimage.py,sha256=XBd1qYgv_FqqmP7BNIWP_5pGDqIwQLUa7Giuj1voEmg,1725
 qwt/transform.py,sha256=XgKuvG5odsjBObwDaPYOnM1QVidFFIPaKDPiCl_fg1E,6001
 qwt/tests/__init__.py,sha256=hdqKy7NmYU1UX6Nv0-WNLeq84BjglHtAWdtnd2K5U28,1117
 qwt/tests/comparative_benchmarks.py,sha256=unAmhNvIo-BexOX0UfsJo7v5_SrBXlEyCJ6SRfgZP6E,1883
 qwt/tests/conftest.py,sha256=JHMXAgmHphJ8hWXjqVBBLxe0XlRb3rKOu9GRKVbcr_A,272
-qwt/tests/test_bodedemo.py,sha256=s_rd0OTTQGWhXyQjmNZXaDgxB1xfPxOsClVt04JmTmg,9304
+qwt/tests/test_bodedemo.py,sha256=_ya6NroUuvGs0BaUcAGn8Adp0ek90JTDevfqN9ew_LE,9691
 qwt/tests/test_cartesian.py,sha256=8rA4CgZ8M73-AmOgLDERuW9-3rjD8jVumcV96LPhSbM,3966
 qwt/tests/test_cpudemo.py,sha256=uT6KRnDupH3LAC9U0CM6yUf346VH_CGX6xPpLpjwogo,13196
-qwt/tests/test_curvebenchmark1.py,sha256=8dmfLznqbSvTP0eNKpBwgwMdyjEgt6fHErDO3UcYXkc,6075
-qwt/tests/test_curvebenchmark2.py,sha256=NrrJTuCGXgtfiUxciT0j3ZbsNVT_kmoqgs0BYTTssmQ,2888
+qwt/tests/test_curvebenchmark1.py,sha256=8aT3tjm6VyzIhEtPPNdILZhGoS1uXVhtgCUFTwfA3nY,6200
+qwt/tests/test_curvebenchmark2.py,sha256=QQDnQQdlW3VDDNlkchdqDrPqGomdy83Ae9sGt5Wojn8,2900
 qwt/tests/test_curvedemo1.py,sha256=P_Dz4ZaH_Nw7cO2EHKz2NKiuGuBGfBtCr22W8N82uc8,4311
 qwt/tests/test_curvedemo2.py,sha256=xh25WN3Wayh8QF2Rh4GCSVI6M3Q50QqymgkEB5XdF78,4233
 qwt/tests/test_data.py,sha256=Qj_sNJHd0o3UF6CI_d-jo5KWLt2bEJzpwF7SRyPm98M,3255
 qwt/tests/test_errorbar.py,sha256=WRGm3YqyuC0P8OlC77Zpk1-v6HlgTkNTAyfQREJYrd8,11021
 qwt/tests/test_eventfilter.py,sha256=hzjZhms1pDg_7RTMXj9O7uYW9Qy1ec_9qVRyX0fi83Q,16927
 qwt/tests/test_image.py,sha256=1lgyBRmy98RYCFh4IR4Z2Wxe0f5l6H-UiKtI2hO2Amo,6755
-qwt/tests/test_loadtest.py,sha256=4Ge0-S70v_0eBX4CJYky3-IPjm97Tm4iLZUAoUuc8D8,1845
+qwt/tests/test_loadtest.py,sha256=B1pqFfYgmpgOpFYAxHmM-IJccLU_Fr2gK-1DG9wbHeM,1915
 qwt/tests/test_logcurve.py,sha256=oPmaqSWmAvO38aXUAuvWI7SeWqAGNdXYE2l7mJ6iPvQ,1169
 qwt/tests/test_mapdemo.py,sha256=Dilldf16_PToTUgsvLV2oBetCPsriGoSNQa8ceueIPk,3529
 qwt/tests/test_multidemo.py,sha256=FqPB8GKALwon42_EifyB5Fa7nQkawKkGh0Jb2Tkrx7Q,2611
-qwt/tests/test_simple.py,sha256=jHIGqQltIs2EZj8bAooJ-VrHf9EHyMwpo6cHVSo2CwM,1934
+qwt/tests/test_simple.py,sha256=JSh4b59RHLSiyIPQi6NLEVdsmZPZywndeuk87NCCi4M,2342
 qwt/tests/test_stylesheet.py,sha256=xpb5S3PLjOTFy1xq94RYIpUqWvfoIr5Qt1o5oEcmiMA,764
+qwt/tests/test_symbols.py,sha256=scPrQmUTd5m7HY7kYP_hCANyqRs51xTeONVTo1n0YKE,5798
 qwt/tests/test_vertical.py,sha256=15ohX935KDB1Ze7QpDiJcusnMVc1wOiLMKBEA7Dd3s8,4183
-qwt/tests/utils.py,sha256=p09KDxZC4zM6iTPLf2ifpzY9kgp_neVy1l_UgqFgbJo,10496
+qwt/tests/utils.py,sha256=cZ_qBvLbK2MoH_ZcZfOqYQeWJ3tTMN6fLYwatIF6448,10810
 qwt/tests/data/PythonQwt.svg,sha256=t-NYdVPqz7BcqtXNWCJvo8udrRmtGh57ksSYWUl1h4o,15232
-qwt/tests/data/bodedemo.png,sha256=8jP1YLE6HdwjEmrQyJclLxiYI4Zs4t0z0BoN1JT3GPQ,24414
+qwt/tests/data/basesymbol.png,sha256=dTXegLKruQ4D5IZL3eEAWw1nUdN06KIyPjQWip9AIfI,7167
+qwt/tests/data/bodedemo.png,sha256=RnYYEP3vcfFEceU1rtml-V2OgVXx4RSiJ4gWpcETpME,24441
+qwt/tests/data/builtinsymbol.png,sha256=pb1BBkWcqk8CfyZyhWSIpcOUKGJH27ItvNC0hbXytxw,55307
 qwt/tests/data/cartesian.png,sha256=Cwbn5Jy3VT-OisFHxzMCVbfdbJacUMZ9uGCD9sCxA-Q,51094
 qwt/tests/data/cpudemo.png,sha256=1sy4hkiT3J7rs0FHQoFNnHtqEzFsP888Cfq27GY-pJI,30241
-qwt/tests/data/curvebenchmark1.png,sha256=a6skUJGNEFhL0kbJAM2Mhs6NpTKav1gJbcsRx4NSfbQ,40992
-qwt/tests/data/curvebenchmark2.png,sha256=L9vgabmzewWLCtlsHg1zzoEylHxpJ6bbz3yj2_4nTuI,126537
+qwt/tests/data/curvebenchmark1.png,sha256=Fp_OWHT8bBufG-R7v8dGrcc7fEg19tWrpgE-ywcdYvk,59171
+qwt/tests/data/curvebenchmark2.png,sha256=CqOZsZzWvIXzALzntYf8PChQAw1vV6mDzhG4CckfgaQ,126528
 qwt/tests/data/curvedemo1.png,sha256=PPYNtnxWdoqsxK3QXo615H-aRTYb71zLyuMEAsZhooc,13908
 qwt/tests/data/curvedemo2.png,sha256=1rnIMEEJCFjYic1wNGP1oyATUt_8VirB7O4PyHPeUfw,8909
-qwt/tests/data/data.png,sha256=NNPnE0PZfRC7dNse1Ia4P3n1rM_ADRfCvXA4I10nLOk,15940
+qwt/tests/data/data.png,sha256=xBD82U2a8gmc8cCDIR4_WeDFZE5nq7oIwvcgvKeCyBg,16179
 qwt/tests/data/errorbar.png,sha256=zqD2aPwPqTm18VuoLAUQPUnSgJfr-NTviPJXm4oLwco,13696
 qwt/tests/data/eventfilter.png,sha256=CUgvSZcoADX_DwW5Lmq_iSMNc7L4Jfk16tXsNexG3ew,9199
-qwt/tests/data/image.png,sha256=Pdz4mMGzzAOTbdKQBwnBscc4JwJxr3dWlUX4yOUCGjg,57728
-qwt/tests/data/loadtest.png,sha256=PmeAPBsKx38rKeHjuyF4CDM7pg4CcI4F_juKv_BBFL8,128560
+qwt/tests/data/graphic.png,sha256=vkOFucftBmCVqCcQj3GwIadvhmRpVLXMnOv79zWbBhw,9148
+qwt/tests/data/image.png,sha256=Bki5gBbfyOBVvEWcurCK5EaZ2--vf7bL6rt5ElnCr9E,57730
+qwt/tests/data/loadtest.png,sha256=KHt--3OCe_z0oaa9KN-ZsBEIAXnl-c84_RNBugfGfcQ,127864
 qwt/tests/data/logcurve.png,sha256=aH9grJlKXUjOjgGO0PVrzTpvXA9Kb6DtU-EL_O8ia_U,16633
-qwt/tests/data/mapdemo.png,sha256=S2xvGNvoTgukvrqWTOIpPQQVtAsWeyFbUkoG4-Wq_TU,19713
+qwt/tests/data/mapdemo.png,sha256=LxQ3uk4ZxJ0bxUfbpCZjI33fINtBRsOV78D6mcdc35k,21828
 qwt/tests/data/multidemo.png,sha256=1nthNyuxz6H_SIKjLdoyS-X-mxOWlW_nxRzRe2V2M5A,8805
-qwt/tests/data/simple.png,sha256=78MdmZfA4F4tyjnvEw0jWD5wh5OEK1LjUb_Mxo7QHok,15709
+qwt/tests/data/path.png,sha256=Uw1V2dkV36e8VqwTe9H6As8bR1TdWnlIU3cOGUPROKk,7897
+qwt/tests/data/pixmap.png,sha256=oKVwNB1Al1UFEykceVAUw7I5Sor1YnB0dFMxdJNy-hg,10784
+qwt/tests/data/simple.png,sha256=sBY1nBfHuxtpMvaMDRAQwxbSauvk5OY7XnICwFj8CxQ,15697
 qwt/tests/data/stylesheet.png,sha256=ZjWURAS_eYB5cyLmkQrUg7bTSv-V3uIm6q8FGQjGnFc,13160
-qwt/tests/data/testlauncher.png,sha256=lb6rUnlpY1Q-rezdG6gAtWMWwY5PX58Zuq6338bI8kY,110858
+qwt/tests/data/svgdocument.png,sha256=i8Y_PEnjV-iGW6oZ_oNsjS1ECbJVdP2is14zT0z0TrY,9275
+qwt/tests/data/symbol.svg,sha256=ONkkohVqpg3OO2-XEZge7UZLqqNyOQXbSpLgHXcTBFU,12795
+qwt/tests/data/testlauncher.png,sha256=EYwQk3dtMepxN44U1YcR7LeyYsO7jXbu3KVyQnDcwts,117589
 qwt/tests/data/vertical.png,sha256=EvyG6q6rZm6pTT08Y_nzdBYCnqmoX1QDuEQtp2pyGlw,34076
-PythonQwt-0.10.4.dist-info/LICENSE,sha256=qjEk8TRuXmFS7QC-omINvD1UPGqWaOs6CzcCZoMEhdI,33457
-PythonQwt-0.10.4.dist-info/METADATA,sha256=UF-RXk3Z0zncgGNjCOtluEU6ZXXeKen7oHyNAYGJfnI,3317
-PythonQwt-0.10.4.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
-PythonQwt-0.10.4.dist-info/entry_points.txt,sha256=wSH-OHXrA7c0ymhYRcBFLhBsMqOiw9gofXVe_5UIBYA,107
-PythonQwt-0.10.4.dist-info/top_level.txt,sha256=KB1IBdWRWnaItyJMaECwZiEi1jWt3IvqCrRVVhMjTu8,4
-PythonQwt-0.10.4.dist-info/RECORD,,
+PythonQwt-0.10.6.dist-info/LICENSE,sha256=qjEk8TRuXmFS7QC-omINvD1UPGqWaOs6CzcCZoMEhdI,33457
+PythonQwt-0.10.6.dist-info/METADATA,sha256=HnAHJuZfVLENSh0CLu9HT9UrqVPXBasdgmBJwCaoHaA,3317
+PythonQwt-0.10.6.dist-info/WHEEL,sha256=a-zpFRIJzOq5QfuhBzbhiA1eHTzNCJn8OdRvhdNX0Rk,110
+PythonQwt-0.10.6.dist-info/entry_points.txt,sha256=wSH-OHXrA7c0ymhYRcBFLhBsMqOiw9gofXVe_5UIBYA,107
+PythonQwt-0.10.6.dist-info/top_level.txt,sha256=KB1IBdWRWnaItyJMaECwZiEi1jWt3IvqCrRVVhMjTu8,4
+PythonQwt-0.10.6.dist-info/RECORD,,

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

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:

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()

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(),

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())

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:

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(