Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit 915b34f19c43 · 2013-08-26T12:55:06.000-04:00
Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py
diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py
@@ -1776,7 +1776,7 @@ def bar(self, left, height, width=0.8, bottom=None, **kwargs):
             the y coordinate(s) of the bars
 
         color : scalar or array-like, optional
-            the colors of the bars
+            the colors of the bar faces
 
         edgecolor : scalar or array-like, optional
             the colors of the bar edges
diff --git a/lib/matplotlib/backends/qt4_editor/formlayout.py b/lib/matplotlib/backends/qt4_editor/formlayout.py
@@ -79,20 +79,55 @@ def choose_color(self):
     def get_color(self):
         return self._color
 
+<<<<<<< HEAD
     @QtCore.Slot("QColor")
+=======
+<<<<<<< HEAD
+    @pyqtSignature("QColor")
+=======
+    @QtCore.Slot("QColor")
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
+>>>>>>> upstream/v1.3.x
     def set_color(self, color):
         if color != self._color:
             self._color = color
             self.emit(QtCore.SIGNAL("colorChanged(QColor)"), self._color)
             pixmap = QtGui.QPixmap(self.iconSize())
             pixmap.fill(color)
+<<<<<<< HEAD
+            self.setIcon(QtGui.QIcon(pixmap))
+=======
+<<<<<<< HEAD
+            self.setIcon(QIcon(pixmap))
+=======
             self.setIcon(QtGui.QIcon(pixmap))
 
     color = QtCore.Property("QColor", get_color, set_color)
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
+>>>>>>> upstream/v1.3.x
+
+    color = QtCore.Property("QColor", get_color, set_color)
 
+<<<<<<< HEAD
 def col2hex(color):
     """Convert matplotlib color to hex before passing to Qt"""
     return rgb2hex(colorConverter.to_rgb(color))
+=======
+<<<<<<< HEAD
+=======
+def to_qcolor(color):
+    """Create a QColor from a matplotlib color"""
+    qcolor = QtGui.QColor()
+    color = str(color)
+    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
+>>>>>>> 8bba2a4... Merge pull request #2328 from mspacek/qtapi
+>>>>>>> upstream/v1.3.x
 
 def to_qcolor(color):
     """Create a QColor from a matplotlib color"""
