Commit Graph

95 Commits

Author SHA1 Message Date
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
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
Juan Nunez-Iglesias 62ce6f3ab5 Add test for ImageCollection.concatenate 2012-07-20 15:35:03 -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
Andreas Mueller 1251f77d6a COSMIT minor pep8 2012-06-29 11:27:23 +02: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
Tony S Yu 9bcda27336 Skip test that fails for PIL < 1.1.7 2012-06-24 22:25:44 -04:00
Stefan van der Walt 0a30a2046e ENH: Allow resetting the plugin state. 2012-06-24 17:14:38 -07:00
Stefan van der Walt 7c19250810 BUG: Use PIL as the default image loader. 2012-06-24 17:00:36 -07:00
Stefan van der Walt 417776f776 Merge pull request #196 from tonysyu/fix-plugin-init
BUG: Check all io functions when loading of default plugins.
2012-06-24 16:56:57 -07:00
Stefan van der Walt 37d1fd4723 DOC: Provide correct link for tifffile plugin. 2012-06-24 16:52:22 -07:00
Tony S Yu 2ec05f3271 Refactor how PIL is set as default for imread. 2012-06-24 19:38:01 -04:00
Stefan van der Walt 8141f39a2b BUG: Fix PIL test on big endian. 2012-06-11 00:37:48 -07:00
Tony S Yu b038677e70 Fix: check all io functions when loading of default plugins.
Previously, the first available plugin was loaded and the plugin search quit---even if that plugin didn't provide all io functions. Loop over functions instead to ensure all io funcs have a plugin (if available).
2012-05-31 00:27:15 -04:00
James Turner 3c83eb8966 Readability improvement suggested by tonysyu 2012-05-29 11:36:42 -04:00
James Turner cb44e508f3 Allow for type of hdu.size changing in PyFITS 3.1 2012-05-28 19:46:39 -04:00
Stefan van der Walt 8f43ee7739 BUG: Catch all exceptions, including NotImplementedError, when checking for number of CPUs in multi-processing. 2012-05-21 19:20:20 -07:00
Stefan van der Walt 34505fef46 BUG: Fix FreeImage Py3k compatibility [patch by Almar Klein]. 2012-05-21 18:24:32 -07:00
cgohlke 4e87a1dfce Add new 64-bit metadata types to METADATA_DATATYPE (new in FreeImage 3.15.3) 2012-05-19 13:23:32 -07:00
Stefan van der Walt 52f35313a7 BUG: Fix plugin import on systems without PIL or FreeImage. 2012-05-07 14:06:25 -07:00
Stefan van der Walt 9c13bab887 BUG: Ensure that the appropriate I/O plugin is used in the test suite. 2012-05-07 13:48:56 -07:00
Stefan van der Walt 57bf9d1c67 ENH: Add freeimage as fallback io plugin, to allow buildbot to read test images. 2012-03-03 14:25:05 -08:00
Stefan van der Walt e99f18be5a BUG: Fix imports for Python 3.2. 2012-03-03 11:18:16 -08:00
Stefan van der Walt 02edb162fd Merge pull request #157 from tonysyu/fix-plugin-call
FIX: Check plugin is loaded before checking its functions.
2012-03-02 11:22:31 -08:00
Tony S Yu 3c91aab3a0 FIX: Check plugin is loaded before checking its functions. 2012-02-28 00:07:07 -05:00
Tony S Yu 5e7f08ef8f Fix test when tifffile plugin is not available. 2012-02-26 10:38:22 -05:00
cgohlke 161e42e053 Fix conversion of bytes to str on Python 3 2012-02-25 20:33:17 -08:00
cgohlke 1f7f234264 Fix invalid Python 3 syntax 2012-02-25 20:00:39 -08:00
cgohlke 99a8db9d54 Restore previous io plugins 2012-02-25 19:30:58 -08:00
zachrahan c9a14db5c4 Merge pull request #149 from zachrahan/tifffile-plugin
ENH: add tifffile plugin, tifffile tests, beef up freeimage tests
2012-02-21 16:18:34 -08:00
Zach Pincus 026fae0e97 BUG: Fix tests 2012-02-21 19:17:55 -05:00
Zach Pincus b80ef2a660 Fix copy/paste error 2012-02-21 18:17:34 -05:00