Improved curve benchmark test + added curve styles test

Author: PierreRaybaut

.gitignore

@@ -1,4 +1,5 @@
 .spyderproject
+qwt-6.1.2
 
 # Created by https://www.gitignore.io/api/python
 

qwt/tests/curve_benchmark.py

@@ -50,24 +50,22 @@ def __init__(self, title, xdata, ydata, style, symbol=None, *args):
 
 
 class BMWidget(QWidget):
-    def __init__(self, points, parent=None):
-        super(BMWidget, self).__init__(parent)
-        layout = QGridLayout()
+    def __init__(self, points, *args):
+        super(BMWidget, self).__init__()
+        self.setup(points, *args)
+    
+    def params(self, *args):
+        return (
+                ('Lines', None),
+                ('Dots', None),
+                )
+    
+    def setup(self, points, *args):
         x = np.linspace(.001, 20., points)
         y = (np.sin(x)/x)*np.cos(20*x)
-        symb1 = QwtSymbol(QwtSymbol.Ellipse, QBrush(Qt.yellow),
-                          QPen(Qt.blue), QSize(5, 5))
-        symb2 = QwtSymbol(QwtSymbol.XCross, QBrush(),
-                          QPen(Qt.darkMagenta), QSize(5, 5))
+        layout = QGridLayout()
         nbcol, col, row = 2, 0, 0
-#        for style, symbol in (('Lines', None),
-#                              ('Lines', None),
-#                              ('Lines', None),
-#                              ('Lines', None)):
-        for style, symbol in (('Sticks', symb1),
-                              ('Lines', None),
-                              ('Steps', None),
-                              ('NoCurve', symb2)):
+        for style, symbol in self.params(*args):
            layout.addWidget(BMPlot(style, x, y, getattr(QwtPlotCurve, style),
                                    symbol=symbol), row, col)
            col += 1
@@ -103,17 +101,24 @@ def __init__(self, max_n, parent=None, **kwargs):
         self.setCentralWidget(tabs)
         contents = BMText()
         tabs.addTab(contents, 'Contents')
-        self.resize(1000, 800)
+        self.resize(1000, 600)
+
+        # Force window to show up and refresh (for test purpose only)
         self.show()
+        QApplication.processEvents()
+
         t0g = time.time()
-        for idx in range(3, -1, -1):
+        for idx in range(4, -1, -1):
             points = max_n/10**idx
             t0 = time.time()
             widget = BMWidget(points)
             title = '%d points' % points
             tabs.addTab(widget, title)
             tabs.setCurrentWidget(widget)
+
+            # Force widget to refresh (for test purpose only)
             QApplication.processEvents()
+
             time_str = "Elapsed time: %d ms" % ((time.time()-t0)*1000)
             widget.text.setText(time_str)
             contents.append("<br><i>%s:</i><br>%s" % (title, time_str))
@@ -128,5 +133,5 @@ def __init__(self, max_n, parent=None, **kwargs):
         if name in QFontDatabase().families():
             app.setFont(QFont(name))
             break
-    demo = BMDemo(100000)
+    demo = BMDemo(1000000)
     app.exec_()

qwt/tests/curve_styles.py

@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the MIT License
+# Copyright (c) 2015 Pierre Raybaut
+# (see LICENSE file for more details)
+
+"""Curve styles"""
+
+SHOW = True # Show test in GUI-based test launcher
+
+import time
+
+from qwt.qt.QtGui import (QApplication, QPen, QBrush, QMainWindow, QTabWidget,
+                          QFont, QFontDatabase)
+from qwt.qt.QtCore import QSize
+from qwt.qt.QtCore import Qt
+
+from qwt.tests import curve_benchmark as cb
+from qwt import QwtSymbol
+
+
+class CSWidget(cb.BMWidget):
+    def params(self, *args):
+        symbols, = args
+        symb1 = QwtSymbol(QwtSymbol.Ellipse, QBrush(Qt.yellow),
+                          QPen(Qt.blue), QSize(5, 5))
+        symb2 = QwtSymbol(QwtSymbol.XCross, QBrush(),
+                          QPen(Qt.darkMagenta), QSize(5, 5))
+        if symbols:
+            return (
+                    ('Sticks', symb1),
+                    ('Lines', symb1),
+                    ('Steps', symb2),
+                    ('Dots', symb2),
+                    )
+        else:
+            return (
+                    ('Sticks', None),
+                    ('Lines', None),
+                    ('Steps', None),
+                    ('Dots', None),
+                    )
+
+
+class BMDemo(QMainWindow):
+    def __init__(self, max_n, parent=None, **kwargs):
+        super(BMDemo, self).__init__(parent=parent)
+        self.setWindowTitle('Curve styles')
+        tabs = QTabWidget()
+        self.resize(1000, 800)
+        
+        # Force window to show up and refresh (for test purpose only)
+        self.show()
+        QApplication.processEvents()
+
+        self.setCentralWidget(tabs)
+        pts = 1000
+        for points, symbols in zip((pts/10, pts/10, pts, pts),
+                                   (True, False)*2):
+            t0 = time.time()
+            widget = CSWidget(points, symbols)
+            symtext = "with%s symbols" % ("" if symbols else "out")
+            title = '%d points, %s' % (points, symtext)
+            tabs.addTab(widget, title)
+            tabs.setCurrentWidget(widget)
+
+            # Force widget to refresh (for test purpose only)
+            QApplication.processEvents()
+
+            time_str = "Elapsed time: %d ms" % ((time.time()-t0)*1000)
+            widget.text.setText(time_str)
+        tabs.setCurrentIndex(0)
+
+
+if __name__ == '__main__':
+    app = QApplication([])
+    for name in ('Calibri', 'Verdana', 'Arial'):
+        if name in QFontDatabase().families():
+            app.setFont(QFont(name))
+            break
+    demo = BMDemo(100000)
+    app.exec_()