Fixed simple plot examples (setup.py & plot.py's doc page)

following the introduction of QtPy since V0.8.0

This closes #55

Author: PierreRaybaut

CHANGELOG.md

@@ -1,5 +1,10 @@
 # PythonQwt Releases #
 
+### Version 0.8.3 ###
+
+- Fixed simple plot example (setup.py & plot.py's doc page) following the introduction 
+  of the new QtPy dependency (Qt compatibility layer) since V0.8.0.
+
 ### Version 0.8.2 ###
 
 - Added new GUI-based test script `PythonQwt-py3` to run the test launcher.

doc/plot_example.py

@@ -1,7 +1,8 @@
+from qtpy import QtWidgets as QW
 import qwt
 import numpy as np
 
-app = qtpy.QtGui.QApplication([])
+app = QW.QApplication([])
 x = np.linspace(-10, 10, 500)
 plot = qwt.QwtPlot("Trigonometric functions")
 plot.insertLegend(qwt.QwtLegend(), qwt.QwtPlot.BottomLegend)

doc/symbol_path_example.py

@@ -1,46 +1,47 @@
-from qtpy.QtGui import QApplication, QPen, QPainterPath, QTransform
-from qtpy.QtCore import Qt, QPointF
-from qwt import QwtPlot, QwtPlotCurve, QwtSymbol
+from qtpy import QtWidgets as QW
+from qtpy import QtGui as QG
+from qtpy import QtCore as QC
+import qwt
 import numpy as np
 import os.path as osp
 
-app = QApplication([])
+app = QW.QApplication([])
 
 # --- Construct custom symbol ---
 
-path = QPainterPath()
+path = QG.QPainterPath()
 path.moveTo(0, 8)
 path.lineTo(0, 5)
 path.lineTo(-3, 5)
 path.lineTo(0, 0)
 path.lineTo(3, 5)
 path.lineTo(0, 5)
 
-transform = QTransform()
+transform = QG.QTransform()
 transform.rotate(-30.0)
 path = transform.map(path)
 
-pen = QPen(Qt.black, 2)
-pen.setJoinStyle(Qt.MiterJoin)
+pen = QG.QPen(QC.Qt.black, 2)
+pen.setJoinStyle(QC.Qt.MiterJoin)
 
-symbol = QwtSymbol()
+symbol = qwt.QwtSymbol()
 symbol.setPen(pen)
-symbol.setBrush(Qt.red)
+symbol.setBrush(QC.Qt.red)
 symbol.setPath(path)
-symbol.setPinPoint(QPointF(0.0, 0.0))
+symbol.setPinPoint(QC.QPointF(0.0, 0.0))
 symbol.setSize(10, 14)
 
 # --- Test it within a simple plot ---
 
-curve = QwtPlotCurve()
-curve_pen = QPen(Qt.blue)
-curve_pen.setStyle(Qt.DotLine)
+curve = qwt.QwtPlotCurve()
+curve_pen = QG.QPen(QC.Qt.blue)
+curve_pen.setStyle(QC.Qt.DotLine)
 curve.setPen(curve_pen)
 curve.setSymbol(symbol)
 x = np.linspace(0, 10, 10)
 curve.setData(x, np.sin(x))
 
-plot = QwtPlot()
+plot = qwt.QwtPlot()
 curve.attach(plot)
 plot.resize(600, 300)
 plot.replot()

qwt/__init__.py

@@ -28,7 +28,7 @@
 .. _GitHubPage: http://pierreraybaut.github.io/PythonQwt
 .. _GitHub: https://github.com/PierreRaybaut/PythonQwt
 """
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 QWT_VERSION_STR = "6.1.5"
 
 import warnings

qwt/plot.py

@@ -234,10 +234,11 @@ class QwtPlot(QFrame, QwtPlotDict):
     The following example is a good starting point to see how to set up a 
     plot widget::
     
+        from qtpy import QtWidgets as QW
         import qwt
         import numpy as np
 
-        app = qtpy.QtGui.QApplication([])
+        app = QW.QApplication([])
         x = np.linspace(-10, 10, 500)
         plot = qwt.QwtPlot("Trigonometric functions")
         plot.insertLegend(qwt.QwtLegend(), qwt.QwtPlot.BottomLegend)

setup.py

@@ -51,17 +51,19 @@
     
 The following example is a good starting point to see how to set up a simple plot widget::
 
+    from qtpy import QtWidgets as QW
     import qwt
     import numpy as np
 
-    app = qtpy.QtGui.QApplication([])
+    app = QW.QApplication([])
     x = np.linspace(-10, 10, 500)
     plot = qwt.QwtPlot("Trigonometric functions")
     plot.insertLegend(qwt.QwtLegend(), qwt.QwtPlot.BottomLegend)
     qwt.QwtPlotCurve.make(x, np.cos(x), "Cosinus", plot, linecolor="red", antialiased=True)
     qwt.QwtPlotCurve.make(x, np.sin(x), "Sinus", plot, linecolor="blue", antialiased=True)
     plot.resize(600, 300)
     plot.show()
+    app.exec_()
     
 .. image:: https://raw.githubusercontent.com/PierreRaybaut/PythonQwt/master/doc/images/QwtPlot_example.png