From 4d747720de210525aa8e3d7c36da38e3a71f3067 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sat, 21 Jul 2012 22:03:46 -0500 Subject: [PATCH] Change ImageViewer to automatically call plugins. --- skimage/viewer/viewers/core.py | 2 ++ viewer_examples/plugins/canny.py | 3 +-- viewer_examples/plugins/lineprofile.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/viewer/viewers/core.py b/skimage/viewer/viewers/core.py index b6c1db69..6ef83d27 100644 --- a/skimage/viewer/viewers/core.py +++ b/skimage/viewer/viewers/core.py @@ -104,6 +104,8 @@ class ImageViewer(QtGui.QMainWindow): self.close() def show(self): + for p in self.plugins: + p.show() super(ImageViewer, self).show() sys.exit(qApp.exec_()) diff --git a/viewer_examples/plugins/canny.py b/viewer_examples/plugins/canny.py index d5e858ec..e84a8270 100644 --- a/viewer_examples/plugins/canny.py +++ b/viewer_examples/plugins/canny.py @@ -5,6 +5,5 @@ from skimage.viewer.plugins.canny import CannyPlugin image = data.camera() viewer = ImageViewer(image) -p = CannyPlugin(viewer) -p.show() +CannyPlugin(viewer) viewer.show() diff --git a/viewer_examples/plugins/lineprofile.py b/viewer_examples/plugins/lineprofile.py index cecb2539..310c23e4 100644 --- a/viewer_examples/plugins/lineprofile.py +++ b/viewer_examples/plugins/lineprofile.py @@ -5,6 +5,5 @@ from skimage.viewer.plugins.lineprofile import LineProfile image = data.camera() viewer = ImageViewer(image) -p = LineProfile(viewer) -p.show() +LineProfile(viewer) viewer.show()