8000 Fix PySide compatibility by mspacek · Pull Request #2328 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix PySide compatibility #2328

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
merged 2 commits into from
Aug 22, 2013
Merged

Fix PySide compatibility #2328

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1f3814
BUG FIX
Aug 22, 2013
cea9000
Stop testing for QString, fixes AttributeError in PySide
mspacek Aug 22, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
8000 Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 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 All @@ -97,8 +97,7 @@ def col2hex(color):
def to_qcolor(color):
"""Create a QColor from a matplotlib color"""
qcolor = QtGui.QColor()
if isinstance(color, QtCore.QString):
color = str(color)
color = str(color)
try:
color = col2hex(color)
except ValueError:
Expand Down
0