From 2e2a82ab309a4b93330cc5d14bd9105e20cac5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Wed, 2 Oct 2013 17:48:09 +0200 Subject: [PATCH] MAINT: matplotlib is in requierements.txt --- skimage/viewer/canvastools/painttool.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/skimage/viewer/canvastools/painttool.py b/skimage/viewer/canvastools/painttool.py index 0678c460..3b4132f0 100644 --- a/skimage/viewer/canvastools/painttool.py +++ b/skimage/viewer/canvastools/painttool.py @@ -1,12 +1,8 @@ import numpy as np - -try: - import matplotlib.pyplot as plt - import matplotlib.colors as mcolors - LABELS_CMAP = mcolors.ListedColormap(['white', 'red', 'dodgerblue', 'gold', +import matplotlib.pyplot as plt +import matplotlib.colors as mcolors +LABELS_CMAP = mcolors.ListedColormap(['white', 'red', 'dodgerblue', 'gold', 'greenyellow', 'blueviolet']) -except ImportError: - print("Could not import matplotlib -- skimage.viewer not available.") from skimage.viewer.canvastools.base import CanvasToolBase @@ -192,7 +188,6 @@ class CenteredWindow(object): if __name__ == '__main__': np.testing.rundocs() - import matplotlib.pyplot as plt from skimage import data image = data.camera()