Commit Graph

124 Commits

Author SHA1 Message Date
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Andreas Mueller 6546460f47 COSMIT some pep8 2012-09-30 15:53:33 +01:00
Stefan van der Walt 3469f1f544 Merge pull request #327 from cgohlke/patch-1
BUG: Open image files in default binary write mode.
2012-09-29 18:01:04 -07:00
cgohlke cba654cbda Use io.BytesIO instead of StringIO
Fixes NameError: global name 'io' is not defined on Python 3
2012-09-29 17:00:59 -07:00
cgohlke 0477c9dfeb Open image files in default binary write mode
Fixes test failure on Windows
2012-09-29 14:20:11 -07:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Tony S Yu 0504392fd5 DOC: Fix doctests in io collection module 2012-09-11 23:36:12 -04:00
Tony S Yu d67e81742d DOC: Shorten plugin description so it fits in table 2012-09-02 18:10:14 -04:00
Tony S Yu bfa6f05e1f DOC: Change title to match numpy docstring standard 2012-09-02 17:53:22 -04:00
Stefan van der Walt ce423e169e Merge pull request #257 from ahojnnes/shared
ENH: Add shared package.
2012-08-25 10:35:29 -07:00
Stefan van der Walt 8cdd0e909a Merge pull request #258 from tonysyu/imshow-filename
ENH: Allow imshow to show images when given file name.
2012-08-24 02:56:45 -07:00
Tony S Yu 53807d79a6 Merge pull request #233 from wilsaj:image-html-repr
Conflicts:
	skimage/io/tests/test_collection.py
2012-08-24 00:15:32 -04:00
Tony S Yu de20e482ad ENH: Allow imshow to show images when given file name. 2012-08-22 22:10:32 -04:00
wilsaj 38a96b9ac9 Remove tag metadata-related fucntions from Image class 2012-08-21 20:51:23 -05:00
Johannes Schönberger a08779e06a Use predefined header files from Cython 2012-08-21 15:15:27 +02:00
Stefan van der Walt b1139c724d DOC: Fix typos in see-also references. 2012-08-13 12:02:32 -07:00
wilsaj fabedb58ec add unit test for Image._repr_png_() with PIL plugin 2012-08-12 18:54:43 -05:00
wilsaj 9bd445700a add note about to display protocol to Image docstring 2012-08-12 18:20:58 -05:00
Tony S Yu a05c3c6637 DOC: Add note about ImageCollection slicing.
Also, clean up some whitespace issues.
2012-08-05 17:44:49 -04:00
Tony S Yu 816d6e319a Merge pull request #221 from jjhelmus/imagecollection_slicing
Fix import conflicts:
	skimage/io/collection.py
2012-08-05 17:41:29 -04:00
Jonathan Helmus 03d037d044 ImageCollection now slices like other iterables 2012-07-25 11:11:25 -04:00
wilsaj 2b66f0c303 role duplicate logic for Image._repr_png_() and Image._repr_jpeg_() into a common method 2012-07-24 23:21:42 -05:00
wilsaj b9d468b668 use standard conventions for Image.__new__() cls attribute and docstring 2012-07-24 23:20:22 -05:00
wilsaj 7368332df9 remove unused import 2012-07-24 23:07:44 -05:00
wilsaj a31e0d9eeb remove superfluous conditional logic 2012-07-24 23:01:51 -05:00
tonysyu 71a518c8cf Merge pull request #226 from jni/jni-alphanumeric-sort
Sort files from a global pattern alphanumerically
2012-07-22 21:28:38 -07:00
wilsaj dcb7dacc6c open buffer on on byte_array 2012-07-21 10:23:20 -05:00
Juan Nunez-Iglesias 9cbf2ef369 Simplify alphanumeric_key logic
Thanks to Tony Yu for the suggestion.
2012-07-21 00:51:55 -05:00
wilsaj fbb2ec3afa close temp StringIO buffers when we're done with them 2012-07-20 20:34:12 -05:00
wilsaj 74cde286b4 allow qt_plugin imsave() function to write to file-like objects 2012-07-20 20:33:25 -05:00
Stefan van der Walt 37e0ce0fc8 Merge pull request #223 from jni/jni-concatenate-image-collection
ENH: Concatenate image collection.
2012-07-20 16:02:04 -07:00
Juan Nunez-Iglesias 699b5d9269 Add test coverage for alphabetic sort
alphanumeric_key should sort filenames correctly when they differ in
text, not just numbers.
2012-07-20 17:50:04 -05:00
Juan Nunez-Iglesias 9006c1dab3 Sort files from a global pattern alphanumerically
Users usually expect an alphanumeric sort, not lexicographic sort, on
their filenames. This is now the behaviour of ImageCollection.
2012-07-20 17:38:06 -05:00
Juan Nunez-Iglesias a61ac37ff2 Add concatenate() support for MultiImage
Previously we added the ImageCollection.concatenate function. This
updates MultiImage to have the same functionality, and moves the grunt
work to an outside function to avoid repetition.
2012-07-20 16:46:33 -05:00
wilsaj 32d3e1b161 use repr_png and repr_jpeg hooks rather than repr_html
these will work in the ipython qtconsole as well!
2012-07-20 16:44:05 -05:00
wilsaj 70cf6cfba0 fix test so it looks for new Image class 2012-07-20 15:39:50 -05:00
Juan Nunez-Iglesias 62ce6f3ab5 Add test for ImageCollection.concatenate 2012-07-20 15:35:03 -05:00
wilsaj 605a4e2cd7 add support for serializing to file-like objects (e.g. StringIO) to PIL plugin 2012-07-20 15:22:53 -05:00
wilsaj d2e0484845 add html repr method for Image class 2012-07-20 15:19:22 -05:00
wilsaj f676152448 add stefan's image class 2012-07-20 15:18:09 -05:00
Juan Nunez-Iglesias 11c7fd2f59 Add function 'concatenate' to ImageCollection
Many algorithms work on 3D stacks rather than images. It is convenient
to provide automatic conversion from an ImageCollection to an nD-stack.
2012-07-20 15:16:48 -05:00
Stefan van der Walt c9bef5e06f Merge pull request #222 from thewtex/freeimage_error_2
BUG: Fix tests when FreeImage is not installed.
2012-07-20 13:05:37 -07:00
Matt McCormick 74554793ad STY: Align multi-line string statements. 2012-07-20 16:00:06 -04:00
Matt McCormick db4cc04a90 BUG: Fix tests when FreeImage is not installed.
The plugin loader tries plugins but only catches ImportError and
RuntimeError.  The FreeImage plugin was throwing OSError.  Tests
were failing when FreeImage was not installed.  It now throws a
RuntimeError.
2012-07-20 15:46:58 -04:00
Jonathan J. Helmus dceb7b6c7d variable name changes and small fixes 2012-07-20 15:39:40 -04:00
Jonathan J. Helmus 5101aa2a38 added test for ImageCollection slicing 2012-07-20 15:23:25 -04:00
Jonathan J. Helmus 0036dc9775 ImageCollection now supports slicing 2012-07-20 15:09:18 -04:00
Matt McCormick 89f0151a7a BUG: Fix testing failures when FreeImage not installed.
FreeImage throws an OSError, which must be caught when attempting
to load the IO plugins for tests to pass without FreeImage installed.
2012-07-20 15:05:45 -04:00
cgohlke 8d313f1d57 Fix io.imsave() problems with passing arguments to plugin "freeimage" 2012-07-12 10:34:15 -07:00
Andreas Mueller d7f1a3abec COSMIT minor stype improvements, whitespace in error messages 2012-06-29 11:27:23 +02:00