curve/grid/... make functions: added possibility to set color from str

Author: PierreRaybaut

qwt/plot_curve.py

@@ -25,6 +25,7 @@
 )
 from .symbol import QwtSymbol
 from .plot_directpainter import QwtPlotDirectPainter
+from .qthelpers import qcolor_from_str
 
 from .qt.QtGui import QPen, QBrush, QPainter, QPolygonF, QColor
 from .qt.QtCore import QSize, Qt, QRectF, QPointF
@@ -228,7 +229,7 @@ def make(
         :param symbol: curve symbol
         :type symbol: qwt.symbol.QwtSymbol or None
         :param linecolor: curve line color
-        :type linecolor: QColor or None
+        :type linecolor: QColor or str or None
         :param linewidth: curve line width
         :type linewidth: float or None
         :param linestyle: curve pen style
@@ -258,7 +259,7 @@ def make(
             item.setStyle(style)
         if symbol is not None:
             item.setSymbol(symbol)
-        linecolor = Qt.black if linecolor is None else linecolor
+        linecolor = qcolor_from_str(linecolor, Qt.black)
         linewidth = 1.0 if linewidth is None else linewidth
         linestyle = Qt.SolidLine if linestyle is None else linestyle
         item.setPen(QPen(linecolor, linewidth, linestyle))

qwt/plot_grid.py

@@ -17,6 +17,7 @@
 from .plot import QwtPlot, QwtPlotItem
 from .text import QwtText
 from ._math import qwtFuzzyGreaterOrEqual, qwtFuzzyLessOrEqual
+from .qthelpers import qcolor_from_str
 
 from .qt.QtGui import QPen
 from .qt.QtCore import Qt
@@ -79,13 +80,13 @@ def make(
         :param enableminor: Tuple of two boolean values (x, y) for enabling minor grid lines
         :type enableminor: bool or None
         :param color: Pen color for both major and minor grid lines (default: Qt.gray)
-        :type color: QColor or None
+        :type color: QColor or str or None
         :param width: Pen width for both major and minor grid lines (default: 1.0)
         :type width: float or None
         :param style: Pen style for both major and minor grid lines (default: Qt.DotLine)
         :type style: Qt.PenStyle or None
         :param mincolor: Pen color for minor grid lines only (default: Qt.gray)
-        :type mincolor: QColor or None
+        :type mincolor: QColor or str or None
         :param minwidth: Pen width for minor grid lines only (default: 1.0)
         :type minwidth: float or None
         :param minstyle: Pen style for minor grid lines only (default: Qt.DotLine)
@@ -98,12 +99,12 @@ def make(
         item = cls()
         if z is not None:
             item.setZ(z)
-        color = Qt.gray if color is None else color
+        color = qcolor_from_str(color, Qt.gray)
         width = 1.0 if width is None else width
         style = Qt.DotLine if style is None else style
         item.setPen(QPen(color, width, style))
         if mincolor is not None or minwidth is not None or minstyle is not None:
-            mincolor = Qt.gray if mincolor is None else mincolor
+            mincolor = qcolor_from_str(mincolor, Qt.gray)
             minwidth = 1.0 if width is None else minwidth
             minstyle = Qt.DotLine if style is None else minstyle
             item.setMinorPen(QPen(mincolor, minwidth, minstyle))

qwt/plot_marker.py

@@ -18,6 +18,7 @@
 from .painter import QwtPainter
 from .graphic import QwtGraphic
 from .symbol import QwtSymbol
+from .qthelpers import qcolor_from_str
 
 from .qt.QtGui import QPen, QPainter
 from .qt.QtCore import Qt, QPointF, QRectF, QSizeF, QRect
@@ -123,7 +124,8 @@ def make(
         :param spacing: Spacing (distance between the position and the label)
         :type spacing: int or None
         :param int linestyle: Line style
-        :param QColor color: Pen color
+        :param color: Pen color
+        :type color: QColor or str or None
         :param float width: Pen width
         :param Qt.PenStyle style: Pen style
         :param bool antialiased: if True, enable antialiasing rendering
@@ -152,7 +154,7 @@ def make(
             item.setLabelOrientation(orientation)
         if spacing is not None:
             item.setSpacing(spacing)
-        color = Qt.black if color is None else color
+        color = qcolor_from_str(color, Qt.black)
         width = 1.0 if width is None else width
         style = Qt.SolidLine if style is None else style
         item.setLinePen(QPen(color, width, style))

qwt/qthelpers.py

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+#
+# Licensed under the terms of the MIT License
+# Copyright (c) 2015 Pierre Raybaut
+# (see LICENSE file for more details)
+
+"""Qt helpers"""
+
+from qwt.qt import QtGui as QG
+from qwt.qt.QtCore import Qt
+
+
+def qcolor_from_str(color, default):
+    """Return QColor object from str
+
+    :param color: Input color
+    :type color: QColor or str or None
+    :param QColor default: Default color (returned if color is None)
+
+    If color is already a QColor instance, simply return color.
+    If color is None, return default color.
+    If color is neither an str nor a QColor instance nor None, raise TypeError.
+    """
+    if color is None:
+        return default
+    elif isinstance(color, QG.QColor):
+        return color
+    elif isinstance(color, str):
+        try:
+            return getattr(Qt, color)
+        except AttributeError:
+            raise ValueError("Unknown Qt color %r" % color)
+    else:
+        raise TypeError("Invalid color %r" % color)

qwt/text.py

@@ -67,6 +67,7 @@
 from .qt.QtCore import Qt, QSizeF, QSize, QRectF
 
 from .painter import QwtPainter
+from .qthelpers import qcolor_from_str
 
 QWIDGETSIZE_MAX = (1 << 24) - 1
 
@@ -638,7 +639,7 @@ def make(
         :param weight: Font weight (default: QFont.Normal)
         :type weight: int or None
         :param color: Pen color
-        :type color: QColor or None
+        :type color: QColor or str or None
         :param borderradius: Radius for the corners of the border frame
         :type borderradius: float or None
         :param borderpen: Background pen
@@ -661,7 +662,7 @@ def make(
             weight = QFont.Normal if weight is None else weight
             item.setFont(QFont(family, pointsize, weight))
         if color is not None:
-            item.setColor(color)
+            item.setColor(qcolor_from_str(color, Qt.black))
         if borderradius is not None:
             item.setBorderRadius(borderradius)
         if borderpen is not None: