Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
fsleyes
fsleyes-props
Commits
c094d23d
Commit
c094d23d
authored
Apr 21, 2021
by
Paul McCarthy
🚵
Browse files
MNT: Don't use matplotlib.cm.cmap_d
parent
a811c494
Changes
2
Hide whitespace changes
Inline
Side-by-side
fsleyes_props/cli.py
View file @
c094d23d
...
...
@@ -193,8 +193,11 @@ import logging
import
sys
import
argparse
from
.
import
properties
as
props
from
.
import
properties_types
as
ptypes
import
matplotlib.pyplot
as
plt
import
matplotlib.cm
as
mplcm
import
fsleyes_props.properties
as
props
import
fsleyes_props.properties_types
as
ptypes
log
=
logging
.
getLogger
(
__name__
)
...
...
@@ -205,7 +208,6 @@ class SkipArgument(Exception):
by :func:`applyArguments` and :func:`generateArguments` to indicate
that the arguemnt should be skipped (i.e. not applied, or not generated).
"""
pass
def
_String
(
parser
,
...
...
@@ -480,24 +482,21 @@ def _ColourMap(parser,
def
parse
(
cmapName
):
try
:
import
matplotlib.cm
as
mplcm
cmapKeys
=
list
(
mplcm
.
cmap_d
.
keys
())
cmapNames
=
[
mplcm
.
cmap_d
[
k
].
name
for
k
in
cmapKeys
]
cmapKeys
=
plt
.
colormaps
()
cmapNames
=
[
mplcm
.
get_cmap
(
cm
).
name
for
cm
in
cmapKeys
]
lCmapNames
=
[
s
.
lower
()
for
s
in
cmapNames
]
lCmapKeys
=
[
s
.
lower
()
for
s
in
cmapKeys
]
cmapName
=
cmapName
.
lower
()
cmapName
=
cmapName
.
lower
()
try
:
idx
=
lCmapKeys
.
index
(
cmapName
)
except
:
idx
=
lCmapNames
.
index
(
cmapName
)
try
:
idx
=
lCmapKeys
.
index
(
cmapName
)
except
ValueError
:
idx
=
lCmapNames
.
index
(
cmapName
)
cmapName
=
cmapKeys
[
idx
]
return
mplcm
.
get_cmap
(
cmapName
)
except
:
except
Exception
:
raise
argparse
.
ArgumentTypeError
(
'Unknown colour map: {}'
.
format
(
cmapName
))
...
...
fsleyes_props/properties_types.py
View file @
c094d23d
...
...
@@ -33,8 +33,8 @@ added as attributes of a :class:`.HasProperties` class definition.
import
os.path
as
op
from
collections
import
abc
import
matplotlib.pyplot
as
plt
import
matplotlib.cm
as
mplcm
import
matplotlib.colors
as
mplcolors
import
numpy
as
np
...
...
@@ -892,7 +892,6 @@ class ColourMap(props.PropertyBase):
matplotlib :class:`.Colormap` instance.
"""
import
matplotlib.colors
as
mplcolors
if
not
isinstance
(
value
,
mplcolors
.
Colormap
):
raise
ValueError
(
'Colour map value is not a '
'matplotlib.colors.Colormap instance'
)
...
...
@@ -909,26 +908,19 @@ class ColourMap(props.PropertyBase):
if
isinstance
(
value
,
str
):
import
matplotlib.cm
as
mplcm
#
Case insensitive match
cmapKeys
=
list
(
mplcm
.
cmap_d
.
key
s
()
)
cmapNames
=
[
cm
.
name
for
cm
in
mplcm
.
cmap_d
.
values
()
]
# Case insensitive match against either
# the registered colourmap key, or the
#
colourmap name
cmapKeys
=
plt
.
colormap
s
()
cmapNames
=
[
mplcm
.
get_cmap
(
cm
).
name
for
cm
in
cmapKeys
]
lCmapNames
=
[
s
.
lower
()
for
s
in
cmapNames
]
lCmapKeys
=
[
s
.
lower
()
for
s
in
cmapKeys
]
value
=
value
.
lower
()
idx
=
None
value
=
value
.
lower
()
try
:
idx
=
lCmapKeys
.
index
(
value
)
except
ValueError
:
idx
=
None
try
:
idx
=
lCmapNames
.
index
(
value
)
except
ValueError
:
idx
=
None
try
:
idx
=
lCmapKeys
.
index
(
value
)
except
ValueError
:
idx
=
lCmapNames
.
index
(
value
)
if
idx
is
None
:
raise
ValueError
(
'Unknown colour map ({}) - valid choices '
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment