Skip to content

BUG FIX for Pull Request #2275: Fix incorrect function calls #2326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
efiring merged 1 commit into from
Aug 22, 2013
Merged

BUG FIX for Pull Request #2275: Fix incorrect function calls #2326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/matplotlib/backends/qt4_editor/formlayout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def choose_color(self):
def get_color(self):
return self._color

@QtCore.pyqtSignature("QColor")
@QtCore.Slot("QColor")
def set_color(self, color):
if color != self._color:
self._color = color
Expand All @@ -88,7 +88,7 @@ def set_color(self, color):
pixmap.fill(color)
self.setIcon(QtGui.QIcon(pixmap))

color = QtCore.pyqtProperty("QColor", get_color, set_color)
color = QtCore.Property("QColor", get_color, set_color)

def col2hex(color):
"""Convert matplotlib color to hex before passing to Qt"""
Expand Down