Use a less-invasive approach

This commit is contained in:
Steven Silvester
2015-07-16 07:56:14 -05:00
parent b75ee66a61
commit 3d963649fc
3 changed files with 12 additions and 20 deletions
-7
View File
@@ -61,8 +61,6 @@ import imp
import functools
import warnings
from .util.dtype import *
from .util.colormap import viridis
from matplotlib.cm import register_cmap
pkg_dir = osp.abspath(osp.dirname(__file__))
data_dir = osp.join(pkg_dir, 'data')
@@ -101,11 +99,6 @@ else:
return 1
# register the viridis colormap
register_cmap('viridis', viridis)
del register_cmap, viridis
# do not use `test` as function name as this leads to a recursion problem with
# the nose test suite
test = _test
+3 -4
View File
@@ -4,11 +4,10 @@ import warnings
import matplotlib.pyplot as plt
from ...util import dtype as dtypes
from ...exposure import is_low_contrast
from ..._shared._warnings import all_warnings
from ..util.colormap import viridis
_default_colormap = 'viridis'
_nonstandard_colormap = 'viridis'
_default_colormap = 'gray'
_nonstandard_colormap = viridis
_diverging_colormap = 'RdBu'
+9 -9
View File
@@ -44,28 +44,28 @@ def n_subplots(ax_im):
def test_uint8():
plt.figure()
ax_im = io.imshow(im8)
assert ax_im.cmap.name == 'viridis'
assert ax_im.cmap.name == 'gray'
assert ax_im.get_clim() == (0, 255)
assert n_subplots(ax_im) == 2
assert ax_im.colorbar is not None
assert n_subplots(ax_im) == 1
assert ax_im.colorbar is None
def test_uint16():
plt.figure()
ax_im = io.imshow(im16)
assert ax_im.cmap.name == 'viridis'
assert ax_im.cmap.name == 'gray'
assert ax_im.get_clim() == (0, 65535)
assert n_subplots(ax_im) == 2
assert ax_im.colorbar is not None
assert n_subplots(ax_im) == 1
assert ax_im.colorbar is None
def test_float():
plt.figure()
ax_im = io.imshow(imf)
assert ax_im.cmap.name == 'viridis'
assert ax_im.cmap.name == 'gray'
assert ax_im.get_clim() == (0, 1)
assert n_subplots(ax_im) == 2
assert ax_im.colorbar is not None
assert n_subplots(ax_im) == 1
assert ax_im.colorbar is None
def test_low_dynamic_range():