Skip to content

New stlye qt calls #2382

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 8 commits into from
Sep 10, 2013
Merged

New stlye qt calls #2382

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5013dc8
replaced `col2hex` which seems to have gotten lost in a bad merge
tacaswell Sep 5, 2013
c5abc50
pep8 fixes
tacaswell Sep 5, 2013
b5add85
pep8 fixes
tacaswell Sep 5, 2013
7ddc5ee
converted import-critical PyQt calls to new style so that it will
tacaswell Sep 5, 2013
bf3b1b4
pep8 fixes
tacaswell Sep 5, 2013
bcdf5f5
second pass at catching the rest of the old-style signal/slot
tacaswell Sep 5, 2013
1c649f5
change from mdboom
tacaswell Sep 5, 2013
df3d882
use new-style for PyQt as well as PySide
tacaswell Sep 7, 2013
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
Next Next commit
replaced col2hex which seems to have gotten lost in a bad merge
  • Loading branch information
@tacaswell
tacaswell committed Sep 5, 2013
commit 5013dc8d82b95f46b22f3141ad993865d43ce00b
6 changes: 6 additions & 0 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 @@ -60,6 +60,12 @@

import datetime


def col2hex(color):
"""Convert matplotlib color to hex before passing to Qt"""
return rgb2hex(colorConverter.to_rgb(color))


class ColorButton(QtGui.QPushButton):
"""
Color choosing push button
Expand Down