From 2b43dab5469b24097da0c7f86206197b5389a204 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Tue, 13 Aug 2013 20:25:00 -0400 Subject: [PATCH 1/2] Added elements to the coffee picture docstring. --- skimage/data/__init__.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py index 3791089b..c3d9d5d8 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -23,7 +23,8 @@ __all__ = ['load', 'horse', 'clock', 'immunohistochemistry', - 'chelsea'] + 'chelsea', + 'coffee'] def load(f): @@ -189,11 +190,14 @@ def chelsea(): def coffee(): """Coffee cup. - An example with several shapes (including an ellipse). + This photograph is courtesy of Pikolo Espresso Bar. + It shows several shapes (including an ellipse). It may be used to + illustrate ellipse detection (using the Hough transform). Notes ----- - No copyright restrictions. CC0 by the photographer. + No copyright restrictions. CC0 by the photographer (Rachel Michetti). """ return load("coffee.png") + From 5afb53a1260bb33611270db65ce8eae098bef2b0 Mon Sep 17 00:00:00 2001 From: Marianne Corvellec Date: Fri, 16 Aug 2013 18:47:19 -0400 Subject: [PATCH 2/2] Edited docstring according to comments. --- skimage/data/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py index c3d9d5d8..cea2a9f5 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -191,8 +191,8 @@ def coffee(): """Coffee cup. This photograph is courtesy of Pikolo Espresso Bar. - It shows several shapes (including an ellipse). It may be used to - illustrate ellipse detection (using the Hough transform). + It contains several elliptical shapes as well as varying texture (smooth + porcelain to course wood grain). Notes -----