Do all color conversion in one place, reuse MPL methods

mspacek · mspacek · commit 8f3baf0b0633 · 2013-08-03T12:00:07.000-07:00
diff --git a/lib/matplotlib/backends/qt4_editor/figureoptions.py b/lib/matplotlib/backends/qt4_editor/figureoptions.py
@@ -30,13 +30,6 @@ def get_icon(name):
 
 MARKERS = markers.MarkerStyle.markers
 
-COLORS = {'b': '#0000ff', 'g': '#00ff00', 'r': '#ff0000', 'c': '#ff00ff',
-          'm': '#ff00ff', 'y': '#ffff00', 'k': '#000000', 'w': '#ffffff'}
-
-def col2hex(color):
-    """Convert matplotlib color to hex"""
-    return COLORS.get(color, color)
-
 def figure_edit(axes, parent=None):
     """Edit matplotlib figure options"""
     sep = (None, None) # separator
@@ -79,13 +72,13 @@ def figure_edit(axes, parent=None):
                          (None, '<b>Line</b>'),
                          ('Style', [line.get_linestyle()] + linestyles),
                          ('Width', line.get_linewidth()),
-                         ('Color', col2hex(line.get_color())),
+                         ('Color', line.get_color()),
                          sep,
                          (None, '<b>Marker</b>'),
                          ('Style', [line.get_marker()] + markers),
                          ('Size', line.get_markersize()),
-                         ('Facecolor', col2hex(line.get_markerfacecolor())),
-                         ('Edgecolor', col2hex(line.get_markeredgecolor())),
+                         ('Facecolor', line.get_markerfacecolor()),
+                         ('Edgecolor', line.get_markeredgecolor()),
                          ]
             curves.append([curvedata, label, ""])
 
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -48,9 +48,11 @@
 import sys
 STDERR = sys.stderr
 
-from matplotlib.backends.qt4_compat import QtGui,QtCore
-if not hasattr(QtGui,'QFormLayout'):
-    raise ImportError, "Warning: formlayout requires PyQt4 >v4.3 or PySide"
+from matplotlib.colors import is_color_like
+from matplotlib.colors import rgb2hex
+from matplotlib.colors import colorConverter
+
+from matplotlib.backends.qt4_compat import QtGui, QtCore
 
 (QWidget, QLineEdit, QComboBox, QLabel, QSpinBox, QIcon,QStyle,
  QDialogButtonBox, QHBoxLayout, QVBoxLayout, QDialog, QColor, QPushButton,
@@ -68,6 +70,8 @@
 (Qt, SIGNAL, SLOT, QObject, QSize,pyqtSignature, pyqtProperty) =\
 (QtCore.Qt, QtCore.SIGNAL, QtCore.SLOT, QtCore.QObject, QtCore.QSize,
  QtCore.Slot, QtCore.Property)
+if not hasattr(QtGui, 'QFormLayout'):
+    raise ImportError("Warning: formlayout requires PyQt4 >v4.3 or PySide")
 
 import datetime
 
@@ -103,41 +107,24 @@ def set_color(self, color):
 
     color = pyqtProperty("QColor", get_color, set_color)
 
+def col2hex(color):
+    """Convert matplotlib color to hex before passing to Qt"""
+    return rgb2hex(colorConverter.to_rgb(color))
 
-def text_to_qcolor(text):
-    """
-    Create a QColor from specified string
-    Avoid warning from Qt when an invalid QColor is instantiated
-    """
-    color = QColor()
+def to_qcolor(color):
+    """Create a QColor from a matplotlib color"""
+    qcolor = QColor()
     if isinstance(text, QObject):
         # actually a QString, which is not provided by the new PyQt4 API:
         text = str(text)
-    if not isinstance(text, (unicode, str)):
-        return color
-    if text.startswith('#') and len(text)==7:
-        correct = '#0123456789abcdef'
-        for char in text:
-            if char.lower() not in correct:
-                return color
-    elif text not in list(QColor.colorNames()):
-        return color
-    color.setNamedColor(text)
-    return color
-
-def is_matplotlib_color(value):
-    """
-    Check if value is a color passed to us from matplotlib.
-    It could either be a valid color string or a 3-tuple of floats between 0. and 1.
-    """
-    if text_to_qcolor(value).isValid():
-        return True
-    if isinstance(value,tuple) and len(value)==3 and all(map(lambda v: isinstance(v,float),value)):
-        for c in value:
-            if c < 0. or c > 1.:
-                return False
-        return True
-    return False
+    try:
+        color = col2hex(color)
+    except ValueError:
+        #print('WARNING: ignoring invalid color %r' % color)
+        return qcolor # return invalid QColor
+    qcolor.setNamedColor(color) # set using hex color
+    return qcolor # return valid QColor
+
 
 class ColorLayout(QHBoxLayout):
     """Color-specialized QLineEdit layout"""
@@ -154,10 +141,10 @@ def __init__(self, color, parent=None):
                      self.update_text)
         self.addWidget(self.colorbtn)
 
-    def update_color(self, text):
-        color = text_to_qcolor(text)
+    def update_color(self, color):
+        qcolor = to_qcolor(color)
         if color.isValid():
-            self.colorbtn.color = color
+            self.colorbtn.color = qcolor
 
     def update_text(self, color):
         self.lineedit.setText(color.name())
@@ -281,8 +268,8 @@ def setup(self):
                 continue
             elif tuple_to_qfont(value) is not None:
                 field = FontLayout(value, self)
-            elif is_matplotlib_color(value):
-                field = ColorLayout(QColor(value), self)
+            elif is_color_like(value):
+                field = ColorLayout(to_qcolor(value), self)
             elif isinstance(value, (str, unicode)):
                 field = QLineEdit(value, self)
             elif isinstance(value, (list, tuple)):
@@ -342,7 +329,7 @@ def get(self):
                 continue
             elif tuple_to_qfont(value) is not None:
                 value = field.get_font()
-            elif isinstance(value, (str, unicode)) or is_matplotlib_color(value):
+            elif isinstance(value, (str, unicode)) or is_color_like(value):
                 value = unicode(field.text())
             elif isinstance(value, (list, tuple)):
                 index = int(field.currentIndex())
