Skip to content

Backport qt editor improvements #6717

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

Closed
anntzer wants to merge 14 commits into from
Closed

Backport qt editor improvements #6717

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e077c13
FIX: handle non-native endian images
tacaswell Jul 2, 2016
3c2ea5a
TST: add missing decorator
tacaswell Jul 9, 2016
f7aa7b3
Merge pull request #6381 from anntzer/figure-options-canonical-none-l…
tacaswell Jul 9, 2016
8916067
Merge pull request #6713 from tacaswell/tst_missing_decorator
QuLogic Jul 10, 2016
f443b12
Merge pull request #6674 from tacaswell/fix_imshow_endiannes
QuLogic Jul 10, 2016
44ce103
Sort and uniquify style entries in figure options.
anntzer Oct 28, 2015
68b42d9
Clarify the implementation of prepare_data.
anntzer Nov 12, 2015
240d24b
Set image cmap from figure options.
anntzer Nov 12, 2015
cf4b219
Avoid duplicate cmap in image options.
anntzer Apr 28, 2016
21174b5
Allow setting image clims in Qt options editor.
anntzer Apr 28, 2016
6d9b4a5
Sort default labels numerically in Qt editor.
anntzer May 5, 2016
5d179ba
DOC: add whats_new for qt configuration editor.
anntzer May 5, 2016
46dd689
Minor cleanups for FormLayout.
anntzer May 5, 2016
c077c56
Qt editor alpha handling.
anntzer May 5, 2016
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
Prev Previous commit
Next Next commit
Minor cleanups for FormLayout.
  • Loading branch information
@anntzer
anntzer committed Jul 10, 2016
commit 46dd6891ae326256dfee10267beeaa9240ecf911
62 changes: 28 additions & 34 deletions lib/matplotlib/backends/qt_editor/formlayout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,43 +32,33 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
"""
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
from six.moves import xrange

# History:
# 1.0.10: added float validator (disable "Ok" and "Apply" button when not valid)
# 1.0.7: added support for "Apply" button
# 1.0.6: code cleaning

from __future__ import (absolute_import, division, print_function,
unicode_literals)

__version__ = '1.0.10'
__license__ = __doc__

DEBUG = False

import sys
STDERR = sys.stderr
import six

from matplotlib.colors import is_color_like
from matplotlib.colors import rgb2hex
from matplotlib.colors import colorConverter
import copy
import datetime
import warnings

from matplotlib.colors import colorConverter, is_color_like, rgb2hex
from matplotlib.backends.qt_compat import QtGui, QtWidgets, QtCore
if not hasattr(QtWidgets, 'QFormLayout'):
raise ImportError("Warning: formlayout requires PyQt4 >v4.3 or PySide")

import datetime

BLACKLIST = set(["title", "label"])


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


class ColorButton(QtWidgets.QPushButton):
"""
Color choosing push button
Expand All @@ -83,7 +73,8 @@ def __init__(self, parent=None):
self._color = QtGui.QColor()

def choose_color(self):
color = QtWidgets.QColorDialog.getColor(self._color, self.parentWidget(), '')
color = QtWidgets.QColorDialog.getColor(
self._color, self.parentWidget(), '')
if color.isValid():
self.set_color(color)

Expand All @@ -101,18 +92,20 @@ def set_color(self, color):

color = QtCore.Property(QtGui.QColor, get_color, set_color)


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


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)
warnings.warn('Ignoring invalid color %r' % color)
return qcolor # return invalid QColor
qcolor.setNamedColor(color) # set using hex color
return qcolor # return valid QColor
Expand Down Expand Up @@ -146,19 +139,19 @@ def text(self):
def font_is_installed(font):
"""Check if font is installed"""
return [fam for fam in QtGui.QFontDatabase().families()
if six.text_type(fam) == font]
if six.text_type(fam) == font]


def tuple_to_qfont(tup):
"""
Create a QFont from tuple:
(family [string], size [int], italic [bool], bold [bool])
"""
if not isinstance(tup, tuple) or len(tup) != 4 \
or not font_is_installed(tup[0]) \
or not isinstance(tup[1], int) \
or not isinstance(tup[2], bool) \
or not isinstance(tup[3], bool):
if not (isinstance(tup, tuple) and len(tup) == 4
and font_is_installed(tup[0])
and isinstance(tup[1], int)
and isinstance(tup[2], bool)
and isinstance(tup[3], bool)):
return None
font = QtGui.QFont()
family, size, italic, bold = tup
Expand Down Expand Up @@ -189,7 +182,7 @@ def __init__(self, value, parent=None):
# Font size
self.size = QtWidgets.QComboBox(parent)
self.size.setEditable(True)
sizelist = list(xrange(6, 12)) + list(xrange(12, 30, 2)) + [36, 48, 72]
sizelist = list(range(6, 12)) + list(range(12, 30, 2)) + [36, 48, 72]
size = font.pointSize()
if size not in sizelist:
sizelist.append(size)
Expand Down Expand Up @@ -227,8 +220,7 @@ class FormWidget(QtWidgets.QWidget):
update_buttons = QtCore.Signal()
def __init__(self, data, comment="", parent=None):
QtWidgets.QWidget.__init__(self, parent)
from copy import deepcopy
self.data = deepcopy(data)
self.data = copy.deepcopy(data)
self.widgets = []
self.formlayout = QtWidgets.QFormLayout(self)
if comment:
Expand Down Expand Up @@ -284,8 +276,9 @@ def setup(self):
elif selindex in keys:
selindex = keys.index(selindex)
elif not isinstance(selindex, int):
print("Warning: '%s' index is invalid (label: "
"%s, value: %s)" % (selindex, label, value), file=STDERR)
warnings.warn(
"index '%s' is invalid (label: %s, value: %s)" %
(selindex, label, value))
selindex = 0
field.setCurrentIndex(selindex)
elif isinstance(value, bool):
Expand Down Expand Up @@ -431,8 +424,8 @@ def __init__(self, data, title="", comment="",
self.formwidget.setup()

# Button box
self.bbox = bbox = QtWidgets.QDialogButtonBox(QtWidgets.QDialogButtonBox.Ok
| QtWidgets.QDialogButtonBox.Cancel)
self.bbox = bbox = QtWidgets.QDialogButtonBox(
QtWidgets.QDialogButtonBox.Ok | QtWidgets.QDialogButtonBox.Cancel)
self.formwidget.update_buttons.connect(self.update_buttons)
if self.apply_callback is not None:
apply_btn = bbox.addButton(QtWidgets.QDialogButtonBox.Apply)
Expand All @@ -457,7 +450,8 @@ def update_buttons(self):
for field in self.float_fields:
if not is_edit_valid(field):
valid = False
for btn_type in (QtWidgets.QDialogButtonBox.Ok, QtWidgets.QDialogButtonBox.Apply):
for btn_type in (QtWidgets.QDialogButtonBox.Ok,
QtWidgets.QDialogButtonBox.Apply):
btn = self.bbox.button(btn_type)
if btn is not None:
btn.setEnabled(valid)
Expand Down