Commit Graph

5298 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias 82189f546f Merge pull request #964 from ahojnnes/submods
Update subpackage descriptions
2014-03-30 13:24:32 +11:00
Juan Nunez-Iglesias 5b5ef4d42b Merge pull request #963 from tonysyu/feature/tinting-example
Add example of tinting a grayscale image
2014-03-30 13:22:37 +11:00
Tony S Yu 040890f594 Fix a couple of grammar typos 2014-03-29 18:49:57 -05:00
Tony S Yu a881d2fc5f Incorporate PR feedback
- Change wording to remove "I"
- Fix typo
- Resize figure for better display
- Create mask using entropy filter to improve colored regions
2014-03-29 10:28:08 -05:00
Johannes Schönberger 9e3070ac57 Homogenize subpackage description 2014-03-29 01:23:10 -04:00
Johannes Schönberger 65dbff751d Update subpackage descriptions 2014-03-28 18:22:50 -04:00
Tony S Yu 40cc93a92d Add example of tinting a grayscale image 2014-03-27 22:47:22 -05:00
Johannes Schönberger 9772cf34f2 Merge pull request #960 from sciunto/doc_enhan
DOC: simplify the code (Thx Stefan)
2014-03-27 09:03:54 -04:00
François Boulogne 05458457f1 DOC: simplify the code (Thx Stefan) 2014-03-27 08:34:35 -04:00
Josh Warner efcd8153b5 Merge pull request #926 from sivapvarma/plt-subplots-examples
DOC: Use standard plt.subplots motif in examples
2014-03-27 00:40:16 -05:00
Tony S Yu 55b0b0bcd5 Merge pull request #959 from ahojnnes/viewer-backend
Warn about matplotlib backend in skimage.viewer
2014-03-26 20:49:07 -05:00
Johannes Schönberger 06498c3c59 Warn about matplotlib backend in skimage.viewer 2014-03-26 19:06:06 -04:00
Stefan van der Walt 5593bad86d Merge pull request #958 from ahojnnes/numpydoc
Upgrade numpydoc to version 0.4
2014-03-26 23:32:41 +02:00
Johannes Schönberger e812a8f805 Merge pull request #946 from synesthesiam/master
Added alpha support to novice
2014-03-26 09:31:15 -04:00
Michael Hansen f84cce3238 Convert incoming novice images to ubyte 2014-03-26 08:48:10 -04:00
Michael Hansen dc798e27f1 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-26 08:47:48 -04:00
Johannes Schönberger 9e028aeb99 Merge pull request #957 from sciunto/fixdoc
MAINT: use region.bbox
2014-03-26 07:51:22 -04:00
François Boulogne ea70724216 MAINT: use region.area 2014-03-26 06:48:16 -04:00
François Boulogne 4b714c54f2 MAINT: use region.bbox 2014-03-25 22:24:34 -04:00
Siva Prasad Varma 5d82abd072 changed io to ax 2014-03-24 09:37:59 +05:30
Michael Hansen f792b11a15 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-23 18:04:48 -04:00
Johannes Schönberger b7ae413ce0 Merge pull request #948 from stefanv/bug/plot_matches-cmap-interp
Use nearest neighbor interpolation and a gray-level color map for plotting feature matches
2014-03-20 13:17:41 -04:00
Stefan van der Walt b54b41bcb2 Use nearest neighbor interpolation and a gray-level color map for plotting feature matches 2014-03-20 18:08:56 +02:00
Johannes Schönberger c31f91919d Merge pull request #947 from stefanv/build/contribs
Remove debug print in contribs
2014-03-20 07:52:33 -04:00
Stefan van der Walt 397177ea2a Remove debug print in contribs 2014-03-20 11:00:13 +02:00
Michael Hansen aa8cc0af40 Merged with ahojnnes novice 2014-03-19 20:58:44 -04:00
Michael Hansen 42417def67 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-19 20:46:33 -04:00
Johannes Schönberger 55897597a6 Upgrade numpydoc to version 0.4 2014-03-19 18:06:03 -04:00
Johannes Schönberger f871c4024f Extract changes by @synesthesiam in PR #797 2014-03-19 17:47:49 -04:00
Siva Prasad Varma 6a8f5fefd6 changed f to fig in applications 2014-03-19 17:30:20 +05:30
Siva Prasad Varma a89dd4dedd changed f to fig 2014-03-19 17:18:33 +05:30
Stefan van der Walt 5db5b1899c Merge pull request #935 from neerajgangwar/fix-greycomatrix
Correctly calculate offsets in grey-level co-occurrence matrices
2014-03-18 18:18:55 +02:00
Michael Hansen c244951e90 Merge branch 'master' of https://github.com/scikit-image/scikit-image 2014-03-17 08:52:17 -04:00
Michael Hansen 8321c84e63 Merged with master 2014-03-17 08:40:58 -04:00
Neeraj Gangwar 7a164d274d minor changes in syntax in _glcm_loop method.
Using round in place of floor in _texture.pyx to calculate the pixel offset.
2014-03-17 09:53:09 +05:30
Stefan van der Walt dfea80cd86 Merge pull request #939 from sciunto/py3
Python 3 compatibility for contribs build script
2014-03-16 22:47:10 +02:00
Stefan van der Walt 85bbd0c3be Merge pull request #938 from sciunto/draw
Ellipse should not return coordinates outside of the image (closes #832)
2014-03-16 22:45:12 +02:00
François Boulogne 4c1b650d1b MAINT: python3 compat. 2014-03-16 16:35:27 -04:00
Stefan van der Walt aaa2257345 Merge pull request #937 from sciunto/doc
Fix typo in SimilarityTransform docstring
2014-03-16 21:51:21 +02:00
François Boulogne b3f0c1eb96 FIX bug #832 + testcase 2014-03-16 15:46:39 -04:00
François Boulogne 11725c9396 PEP8 2014-03-16 15:16:35 -04:00
François Boulogne 452fcdaba8 DOC: typo 2014-03-16 15:15:42 -04:00
Juan Nunez-Iglesias 3102dcad8d Merge pull request #934 from sciunto/coverage2
Tests improvements + doc
2014-03-16 01:58:28 +11:00
François Boulogne 6093c55aa2 MIN: typo 2014-03-15 10:29:45 -04:00
François Boulogne 67b1335c15 remove '' around ValueError 2014-03-15 08:50:53 -04:00
François Boulogne c6e916d082 remove extra ) 2014-03-15 08:26:45 -04:00
François Boulogne a423bd15e6 MAINT: use asset_allclose instead of round 2014-03-15 07:58:01 -04:00
François Boulogne ee12ccff26 TEST: add unittest about ValueError 2014-03-15 07:47:05 -04:00
François Boulogne ced3f5656f DOC: specify range for step 2014-03-15 07:42:08 -04:00
François Boulogne cf7a184ba7 TEST: add test on step 2014-03-15 07:40:39 -04:00