Commit Graph

50 Commits

Author SHA1 Message Date
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Steven Silvester a4a628b529 Fix file indexing in ImageCollection 2014-12-12 09:38:48 -06:00
Steven Silvester ad3939784c Indentation fix 2014-11-07 15:23:38 +02:00
Steven Silvester b5a988a52f Close the image file pointer when done. 2014-11-07 15:22:20 +02:00
Steven Silvester 0d76827734 Allow keyword arguments to imread 2014-11-07 15:22:20 +02:00
Steven Silvester 502f6af481 Pep8 cleanup 2014-11-07 15:22:19 +02:00
Steven Silvester 76fc909b62 Finish merging multiimage capability into collections 2014-11-07 15:22:19 +02:00
Steven Silvester b4838c3bd9 Fix failing tests 2014-11-07 15:22:19 +02:00
Steven Silvester d27fadb5cf Avoid circular import 2014-11-07 15:22:19 +02:00
Steven Silvester 305abf6d0c Change MultiImage to use new imread. 2014-11-07 15:22:19 +02:00
Steven Silvester 4298b8babc Allow multiple frames in PIL data in imread 2014-11-07 15:22:19 +02:00
Steven Silvester 39d9dcf20e Fix implementation of pil_to_ndarray in MultiImage 2014-11-07 15:22:19 +02:00
Steven Silvester 93c6d010e6 Use pil_to_ndarray to load PIL images 2014-11-07 15:22:19 +02:00
Steven Silvester 9a126e7009 Add a comment about reading in order 2014-11-07 15:22:19 +02:00
Steven Silvester 945e163867 Add animated gif, a test for it, and tests without conserve_memory.
Add animated gif, and a test for it, plus tests without conserve_memory

Add the gif file
2014-11-07 15:22:18 +02:00
Steven Silvester 49a92482cb Cleanup 2014-11-07 15:22:18 +02:00
Steven Silvester caaf37ec0c Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester 09e6439310 Update multi_image test and install tifffile for travis. 2014-11-07 15:22:18 +02:00
Steven Silvester 732c9c37cc Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
Steven Silvester a70a4933aa Fix implementation errors 2014-11-07 15:22:18 +02:00
Steven Silvester e0e4fe26f1 Add tifffile support for MultiImage 2014-11-07 15:22:18 +02:00
cgohlke 5403e7a61e Use os.pathsep to sepatate multiple ImageCollection load_pattern
The colon `:` does not work on Windows as it can be part of a path
2014-03-10 22:50:00 -07:00
Tony S Yu 25e349d416 Remove outdated function 2014-01-14 23:15:45 -06:00
Tony S Yu 07f2656975 Factor out function injection 2014-01-14 23:09:27 -06:00
Tony S Yu 19102510ce Move wrapper function 2014-01-14 23:09:27 -06:00
Tony S Yu 0f78de46e5 Add dynamic creation of imread_collection function 2014-01-14 23:09:26 -06:00
Johannes Schönberger 2e7f14d2d0 Fix multi image doctest 2013-11-03 19:14:58 +01:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Stefan van der Walt a1adfa8d54 Correctly check for string type. 2013-06-29 10:17:41 -05:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Johannes Schönberger 16863535eb Re-enable plots in doc strings and generate PDF images for them 2013-03-13 10:59:26 +01:00
Johannes Schönberger 0324737c47 Fix some doc strings for latex docs 2013-03-12 09:39:42 +01:00
Andreas Mueller 6546460f47 COSMIT some pep8 2012-09-30 15:53:33 +01:00
Tony S Yu 0504392fd5 DOC: Fix doctests in io collection module 2012-09-11 23:36:12 -04:00
Stefan van der Walt b1139c724d DOC: Fix typos in see-also references. 2012-08-13 12:02:32 -07: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
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
Juan Nunez-Iglesias 9cbf2ef369 Simplify alphanumeric_key logic
Thanks to Tony Yu for the suggestion.
2012-07-21 00:51:55 -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
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
Jonathan J. Helmus dceb7b6c7d variable name changes and small fixes 2012-07-20 15:39:40 -04:00
Jonathan J. Helmus 0036dc9775 ImageCollection now supports slicing 2012-07-20 15:09:18 -04:00
Andreas Mueller ee0fd867da COSMIT fix ugly line breaks. 2012-06-29 11:27:23 +02:00
Andreas Mueller f7b3d8062c COSMIT pep8 2012-06-29 11:27:23 +02:00
Andreas Mueller 2b6208cf3e DOC some sphinx and rst fixes 2012-02-21 18:01:22 +01:00
Neil Yager 66befec0ee BUG: Problem importing imread 2011-11-11 12:39:55 +00:00
Nelle Varoquaux 114cf44c77 Renamed scikits.image to skimage 2011-10-18 21:12:27 +02:00