diff options
| author | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:39 +0200 |
|---|---|---|
| committer | Alexandre Marie <alexandre.marie@synchrotron-soleil.fr> | 2019-07-09 10:20:39 +0200 |
| commit | 032cc0bed452e96456cdc499f98ccaf473416978 (patch) | |
| tree | 514f4532d1ab4dcbea0495488e6dd30bc422a94b /silx/gui/colors.py | |
| parent | 8ff15764a99df31a5d75e1e19a89b413408cfcc2 (diff) | |
| parent | 654a6ac93513c3cc1ef97cacd782ff674c6f4559 (diff) | |
Update upstream source from tag 'upstream/0.11.0+dfsg'
Update to upstream version '0.11.0+dfsg'
with Debian dir 711605a3a57c11c3b5d699da5819c94403f8ac62
Diffstat (limited to 'silx/gui/colors.py')
| -rw-r--r-- | silx/gui/colors.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/silx/gui/colors.py b/silx/gui/colors.py index f1f34c9..aa2958a 100644 --- a/silx/gui/colors.py +++ b/silx/gui/colors.py @@ -1,7 +1,7 @@ # coding: utf-8 # /*########################################################################## # -# Copyright (c) 2015-2018 European Synchrotron Radiation Facility +# Copyright (c) 2015-2019 European Synchrotron Radiation Facility # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -887,7 +887,11 @@ def preferredColormaps(): global _PREFERRED_COLORMAPS if _PREFERRED_COLORMAPS is None: # Initialize preferred colormaps - default_preferred = [k for k in _AVAILABLE_LUTS.keys() if _AVAILABLE_LUTS[k].preferred] + default_preferred = [] + for name, info in _AVAILABLE_LUTS.items(): + if (info.preferred and + (info.source != 'matplotlib' or _matplotlib_cm is not None)): + default_preferred.append(name) setPreferredColormaps(default_preferred) return tuple(_PREFERRED_COLORMAPS) |