Fixed some examples (BodeDemo, CartesianDemo, CurveDemo1, DataDemo, ...)

Author: Pierre Raybaut

examples/BodeDemo.py

@@ -10,9 +10,8 @@
 
 import sys
 from PyQt4.Qt import *
-#from PyQt4.Qwt5 import *
 from qwt import *
-import PyQt4.Qwt5.anynumpy as np
+import numpy as np
 
 
 print_xpm = ['32 32 12 1',
@@ -194,30 +193,22 @@ def __init__(self, *args):
 
         self.setDamp(0.01)
 
-    # __init__()
-
     def showData(self, frequency, amplitude, phase):
         self.curve1.setData(frequency, amplitude)
         self.curve2.setData(frequency, phase)
 
-    # showData()
-
     def showPeak(self, frequency, amplitude):
         self.peakMarker.setValue(frequency, amplitude)
         label = self.peakMarker.label()
         label.setText('Peak: %4g dB' % amplitude)
         self.peakMarker.setLabel(label)
 
-    # showPeak()
-
     def show3dB(self, frequency):
         self.dB3Marker.setValue(frequency, 0.0)
         label = self.dB3Marker.label()
         label.setText('-3dB at f = %4g' % frequency)
         self.dB3Marker.setLabel(label)
 
-    # show3dB()
-
     def setDamp(self, d):
         self.damping = d
         # Numerical Python: f, g, a and p are NumPy arrays!
@@ -237,10 +228,6 @@ def setDamp(self, d):
 
         self.replot()
 
-    # setDamp()
-
-# class BodePlot
-
 
 class BodeDemo(QMainWindow):
 
@@ -252,35 +239,6 @@ def __init__(self, *args):
 
         self.setContextMenuPolicy(Qt.NoContextMenu)
 
-#        self.zoomers = []
-#        zoomer = QwtPlotZoomer(
-#            QwtPlot.xBottom,
-#            QwtPlot.yLeft,
-#            QwtPicker.DragSelection,
-#            QwtPicker.AlwaysOff,
-#            self.plot.canvas())
-#        zoomer.setRubberBandPen(QPen(Qt.green))
-#        self.zoomers.append(zoomer)
-#
-#        zoomer = QwtPlotZoomer(
-#            QwtPlot.xTop,
-#            QwtPlot.yRight,
-#            QwtPicker.PointSelection | QwtPicker.DragSelection,
-#            QwtPicker.AlwaysOff,
-#            self.plot.canvas())
-#        zoomer.setRubberBand(QwtPicker.NoRubberBand)
-#        self.zoomers.append(zoomer)
-
-#        self.picker = QwtPlotPicker(
-#            QwtPlot.xBottom,
-#            QwtPlot.yLeft,
-#            QwtPicker.PointSelection | QwtPicker.DragSelection,
-#            QwtPlotPicker.CrossRubberBand,
-#            QwtPicker.AlwaysOn,
-#            self.plot.canvas())
-#        self.picker.setRubberBandPen(QPen(Qt.green))
-#        self.picker.setTrackerPen(QPen(Qt.cyan))
- 
         self.setCentralWidget(self.plot)
 
         toolBar = QToolBar(self)
@@ -316,32 +274,11 @@ def __init__(self, *args):
         dampLayout.addWidget(QLabel("Damping Factor", dampBox), 0)
         dampLayout.addSpacing(10)
 
-#        self.cntDamp = QwtCounter(dampBox)
-#        self.cntDamp.setRange(0.01, 5.0, 0.01)
-#        self.cntDamp.setValue(0.01)
-#        dampLayout.addWidget(self.cntDamp, 10)
-
         toolBar.addWidget(dampBox)
 
         self.statusBar()
 
-        self.zoom(False)
         self.showInfo()
-        
-#        self.connect(self.cntDamp,
-#                     SIGNAL('valueChanged(double)'),
-#                     self.plot.setDamp)
-        self.connect(btnZoom,
-                     SIGNAL('toggled(bool)'),
-                     self.zoom)
-#        self.connect(self.picker,
-#                     SIGNAL('moved(const QPoint &)'),
-#                     self.moved)
-#        self.connect(self.picker,
-#                     SIGNAL('selected(const QPolygon &)'),
-#                     self.selected)
-
-    # __init__()
 
     def print_(self):
         printer = QPrinter(QPrinter.HighResolution)
@@ -366,48 +303,22 @@ def print_(self):
             renderer.renderTo(self.plot, printer)
 
     def exportDocument(self):
-        self.plot.exportTo("bode.pdf")
-
-    def zoom(self, on):
-#        self.zoomers[0].setEnabled(on)
-#        self.zoomers[0].zoom(0)
-#        
-#        self.zoomers[1].setEnabled(on)
-#        self.zoomers[1].zoom(0)
-
-#        if on:
-#            self.picker.setRubberBand(Qwt.QwtPicker.NoRubberBand)
-#        else:
-#            self.picker.setRubberBand(Qwt.QwtPicker.CrossRubberBand)
-
-        self.showInfo()
-
-    # zoom()
+        renderer = QwtPlotRenderer(self.plot)
+        renderer.exportTo(self.plot, "bode")
 
     def showInfo(self, text=""):
-#        if not text:
-#            if self.picker.rubberBand():
-#                text = 'Cursor Pos: Press left mouse button in plot region'
-#            else:
-#                text = 'Zoom: Press mouse button and drag'
-                
         self.statusBar().showMessage(text)
 
-    # showInfo()
-    
     def moved(self, point):
         info = "Freq=%g, Ampl=%g, Phase=%g" % (
             self.plot.invTransform(Qwt.QwtPlot.xBottom, point.x()),
             self.plot.invTransform(Qwt.QwtPlot.yLeft, point.y()),
             self.plot.invTransform(Qwt.QwtPlot.yRight, point.y()))
         self.showInfo(info)
 
-    # moved()
-
     def selected(self, _):
         self.showInfo()
 
-    # selected()
 
 def make():
     demo = BodeDemo()

examples/CartesianDemo.py

@@ -2,52 +2,33 @@
 
 import sys
 from PyQt4 import Qt
-#import PyQt4.Qwt5 as Qwt
 import qwt as Qwt
-from PyQt4.Qwt5.anynumpy import *
+import numpy as np
 
 
 class CartesianAxis(Qwt.QwtPlotItem):
     """Supports a coordinate system similar to 
-    http://en.wikipedia.org/wiki/Image:Cartesian-coordinate-system.svg
-    """
-
+    http://en.wikipedia.org/wiki/Image:Cartesian-coordinate-system.svg"""
     def __init__(self, masterAxis, slaveAxis):
         """Valid input values for masterAxis and slaveAxis are QwtPlot.yLeft,
         QwtPlot.yRight, QwtPlot.xBottom, and QwtPlot.xTop. When masterAxis is
-        an x-axis, slaveAxis must be an y-axis; and vice versa.
-        """
+        an x-axis, slaveAxis must be an y-axis; and vice versa."""
         Qwt.QwtPlotItem.__init__(self)
         self.__axis = masterAxis
-        try:
-            # Qwt5
-            set_axes = self.setAxis
-        except AttributeError:
-            # Qwt6
-            set_axes = self.setAxes
         if masterAxis in (Qwt.QwtPlot.yLeft, Qwt.QwtPlot.yRight):
-            set_axes(slaveAxis, masterAxis)
+            self.setAxes(slaveAxis, masterAxis)
         else:
-            set_axes(masterAxis, slaveAxis)
+            self.setAxes(masterAxis, slaveAxis)
         self.scaleDraw = Qwt.QwtScaleDraw()
         self.scaleDraw.setAlignment((Qwt.QwtScaleDraw.LeftScale,
                                      Qwt.QwtScaleDraw.RightScale,
                                      Qwt.QwtScaleDraw.BottomScale,
                                      Qwt.QwtScaleDraw.TopScale)[masterAxis])
 
-    # __init__()
-
     def draw(self, painter, xMap, yMap, rect):
-        """Draw an axis on the plot canvas
-        """
-        try:
-            # Qwt5
-            xtr = xMap.xTransform
-            ytr = yMap.xTransform
-        except AttributeError:
-            # Qwt6
-            xtr = xMap.transform
-            ytr = yMap.transform
+        """Draw an axis on the plot canvas"""
+        xtr = xMap.transform
+        ytr = yMap.transform
         if self.__axis in (Qwt.QwtPlot.yLeft, Qwt.QwtPlot.yRight):
             self.scaleDraw.move(round(xtr(0.0)), yMap.p2())
             self.scaleDraw.setLength(yMap.p1()-yMap.p2())
@@ -57,23 +38,16 @@ def draw(self, painter, xMap, yMap, rect):
         self.scaleDraw.setScaleDiv(self.plot().axisScaleDiv(self.__axis))
         self.scaleDraw.draw(painter, self.plot().palette())
 
-    # draw()
-
-# class CartesianAxis
-
 
 class CartesianPlot(Qwt.QwtPlot):
     """Creates a coordinate system similar system 
-    http://en.wikipedia.org/wiki/Image:Cartesian-coordinate-system.svg
-    """
-
+    http://en.wikipedia.org/wiki/Image:Cartesian-coordinate-system.svg"""
     def __init__(self, *args):
         Qwt.QwtPlot.__init__(self, *args)
         self.setTitle('Cartesian Coordinate System Demo')
         # create a plot with a white canvas
         self.setCanvasBackground(Qt.Qt.white)
         # set plot layout
-#        self.plotLayout().setMargin(0)
         self.plotLayout().setCanvasMargin(0)
         self.plotLayout().setAlignCanvasToScales(True)
         # attach a grid
@@ -89,9 +63,9 @@ def __init__(self, *args):
         yaxis.attach(self)
         self.enableAxis(Qwt.QwtPlot.yLeft, False)
         # calculate 3 NumPy arrays
-        x = arange(-2*pi, 2*pi, 0.01)
-        y = pi*sin(x)
-        z = 4*pi*cos(x)*cos(x)*sin(x)
+        x = np.arange(-2*np.pi, 2*np.pi, 0.01)
+        y = np.pi*np.sin(x)
+        z = 4*np.pi*np.cos(x)*np.cos(x)*np.sin(x)
         # attach a curve
         curve = Qwt.QwtPlotCurve('y = pi*sin(x)')
         curve.attach(self)
@@ -104,32 +78,15 @@ def __init__(self, *args):
         curve.setData(x, z)
         self.replot()
 
-    # __init__()
-
-# class CartesianPlot
-
 
 def make():
     demo = CartesianPlot()
     demo.resize(400, 300)
     demo.show()
     return demo
 
-# make()
 
-
-def main(args):
-    app = Qt.QApplication(args)
+if __name__ == '__main__':
+    app = Qt.QApplication(sys.argv)
     demo = make()
     sys.exit(app.exec_())
-
-# main()
-
-
-# Admire
-if __name__ == '__main__':
-    main(sys.argv)
-
-# Local Variables: ***
-# mode: python ***
-# End: ***