QwtPlot: added "flatStyle" option

This is a PythonQwt-exclusive feature improving default plot style (without margin, more compact and flat look) -- option is enabled by default

Author: PierreRaybaut

CHANGELOG.md

@@ -1,8 +1,11 @@
 # PythonQwt Releases #
 
 
-### Version 0.6.3 ###
+### Version 0.7.0 ###
 
+- QwtPlot: added "flatStyle" option, a PythonQwt-exclusive feature improving 
+  default plot style (without margin, more compact and flat look) -- option is 
+  enabled by default
 - Fixed obvious errors (+ poor implementations) in untested code parts
 
 

qwt/__init__.py

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

qwt/plot.py

@@ -20,7 +20,7 @@
 """
 
 from .qt.QtGui import (QWidget, QFont, QSizePolicy, QFrame, QApplication,
-                       QPainter, QPalette)
+                       QPainter, QPalette, QColor)
 from .qt.QtCore import Qt, Signal, QEvent, QSize, QRectF
 
 from .text import QwtText, QwtTextLabel
@@ -192,6 +192,7 @@ def __init__(self):
         self.legend = None
         self.layout = None
         self.autoReplot = None
+        self.flatStyle = None
 
 
 class AxisData(object):
@@ -309,7 +310,7 @@ def __init__(self, *args):
         self.__data.autoReplot = False
 
         self.setAutoReplot(True)
-#        self.setPlotLayout(self.__data.layout)
+        self.setPlotLayout(self.__data.layout)
 
         # title
         self.__data.titleLabel = QwtTextLabel(self)
@@ -338,6 +339,8 @@ def __init__(self, *args):
         self.__data.canvas = QwtPlotCanvas(self)
         self.__data.canvas.setObjectName("QwtPlotCanvas")
         self.__data.canvas.installEventFilter(self)
+
+        self.setFlatStyle(True)
 
         self.setSizePolicy(QSizePolicy.MinimumExpanding,
                            QSizePolicy.MinimumExpanding)
@@ -972,7 +975,7 @@ def setAutoReplot(self, tf=True):
 
         .. seealso::
         
-            :py:meth:`canvas()`
+            :py:meth:`autoReplot()`
         """
         self.__data.autoReplot = tf
 
@@ -986,6 +989,58 @@ def autoReplot(self):
         """
         return self.__data.autoReplot
 
+    def setFlatStyle(self, state):
+        """
+        Set or reset the flatStyle option
+
+        If the flatStyle option is set, the plot will be 
+        rendered without any margin (scales, canvas, layout).
+
+        Enabling this option makes the plot look flat and compact.
+        
+        The flatStyle option is set to True by default.
+        
+        :param bool state: True or False.
+
+        .. seealso::
+        
+            :py:meth:`flatStyle()`
+        """
+        if state:
+            self.canvas().setFrameStyle(QFrame.NoFrame)
+            self.plotLayout().setCanvasMargin(0)
+            self.plotLayout().setSpacing(0)
+            palette = self.palette()
+            palette.setColor(QPalette.WindowText, QColor(Qt.darkGray))
+            palette.setColor(QPalette.Text, QColor("#444444"))
+            self.setPalette(palette)
+            for axis_id in self.validAxes:
+                self.axisWidget(axis_id).setMargin(0)
+                self.axisWidget(axis_id).setSpacing(0)
+                # self.axisWidget(axis_id).setBorderDist(0, 0)
+        else:
+            self.canvas().setFrameStyle(QFrame.Panel|QFrame.Sunken)
+            self.plotLayout().setCanvasMargin(4)
+            self.plotLayout().setSpacing(5)
+            palette = self.palette()
+            palette.setColor(QPalette.WindowText, QColor(Qt.black))
+            palette.setColor(QPalette.Text, QColor(Qt.black))
+            self.setPalette(palette)
+            for axis_id in self.validAxes:
+                self.axisWidget(axis_id).setMargin(2)
+                self.axisWidget(axis_id).setSpacing(2)
+        self.__data.flatStyle = state
+    
+    def flatStyle(self):
+        """
+        :return: True if the flatStyle option is set.
+
+        .. seealso::
+        
+            :py:meth:`setFlatStyle()`
+        """
+        return self.__data.flatStyle
+
     def setTitle(self, title):
         """
         Change the plot's title

qwt/tests/CartesianDemo.py

@@ -62,7 +62,8 @@ def __init__(self, *args):
         # attach a grid
         grid = QwtPlotGrid()
         grid.attach(self)
-        grid.setPen(QPen(Qt.black, 0, Qt.DotLine))
+        grid.setPen(QPen(Qt.lightGray, 0, Qt.DotLine))
+        grid.setZ(-1)
         # attach a x-axis
         xaxis = CartesianAxis(QwtPlot.xBottom, QwtPlot.yLeft)
         xaxis.attach(self)
@@ -83,11 +84,11 @@ def __init__(self, *args):
         # attach another curve
         curve = QwtPlotCurve('y = 4*pi*sin(x)*cos(x)**2')
         curve.attach(self)
-        curve.setPen(QPen(Qt.black, 2))
+        curve.setPen(QPen(Qt.blue, 2))
         curve.setData(x, z)
         self.replot()
 
 
 if __name__ == '__main__':
     from qwt.tests import test_widget
-    test_widget(CartesianPlot, (400, 300))
+    test_widget(CartesianPlot, (800, 480))

qwt/tests/no_margin.py

@@ -54,7 +54,7 @@ def __init__(self, parent=None):
                 ticks_font = self.axisFont(axis_id)
                 self.setAxisFont(axis_id, ticks_font)
 
-        self.canvas().setFrameStyle(0)#QFrame.Panel|QFrame.Sunken)
+        self.canvas().setFrameStyle(0)
         self.plotLayout().setCanvasMargin(0)
         self.axisWidget(QwtPlot.yLeft).setMargin(0)
         self.axisWidget(QwtPlot.xTop).setMargin(0)