Commit Graph

369 Commits

Author SHA1 Message Date
emmanuelle b66fa13dfe Removed obsolete Image class from io submodule. 2015-05-01 20:51:12 +02:00
Steven Silvester 7fbf2ab3f9 Merge pull request #1460 from jni/fix-pil-imsave
Allow keyword arguments to imsave for PIL plugin
2015-04-02 19:42:04 -05:00
Steven Silvester 62e82ccf49 Do not read in the whole array 2015-03-31 20:54:57 -05:00
Juan Nunez-Iglesias af1f567108 Add temporary_file context manager
This provides writeable filenames that are cleaned up when the context
is exited.
2015-03-31 19:31:45 +11:00
Steven Silvester ad8c94fcaf Fix handling of non-gif and tiff files 2015-03-30 21:41:44 -05:00
Juan Nunez-Iglesias b6f2125e71 Allow keyword arguments to imsave for PIL plugin
Certain formats allow additional arguments, such as `compress=` for
TIFF or `quality=` for JPEG. Without this patch, the plugin simply
does not allow these arguments to be passed.
2015-03-31 00:24:23 +11:00
Steven Silvester e531e57124 Only index tif and gif files in collection 2015-03-29 21:54:35 -05:00
Steven Silvester 9ef99d0bb1 Fix freeimage collection test 2015-03-23 19:33:57 -05:00
Steven Silvester 73b1942751 Do not attempt to use _frame_index for exotic load_patterns 2015-03-23 15:35:17 -05:00
Steven Silvester caea879bfc More specific test in freeimage 2015-03-21 09:31:34 -05:00
Steven Silvester a51d49abe6 Always use _find_images() 2015-03-21 09:31:05 -05:00
Steven Silvester 4344817c70 Remove debug error raise 2015-03-20 19:35:17 -05:00
Steven Silvester 80555a2bdb Add a note to the docstring 2015-03-20 19:14:25 -05:00
Steven Silvester 45f21d3941 Fix handling of ImageCollection indexing and add test 2015-03-20 19:11:29 -05:00
Steven Silvester 0e61374a89 Add a helper function to check for low contrast
Add a helper function to check for low contrast

Add a check for low contrast when using imsave

Use the low contrast helper in imshow and make sure warnings are always shown

Clean up parameter names and add doctests

Remove unnecessary warning context

Remove unnecessary warning context

Add dtype ranges for 64bit types

Update tests with new warnings

Fix doctest logic

Fix doctest logic

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types

Relax assertion for 32bit builds

Add a low contrast test with multiple dtypes

Add a low contrast test with multiple dtypes

Fix check for color images

Fix color check again

Add support for int32 types
2015-03-09 21:34:58 -05:00
Antony Lee 10af2b21ee Use relative imports to plugins.
Otherwise e.g. skivi fails to start.
2015-03-05 16:17:57 -08:00
Jonathan Helmus 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
Tony S Yu 977ec17d8a Fix numpy 1.9 warnings about array.fromstring 2015-02-16 22:41:28 -06:00
Tony S Yu 7da811993a Fix compatibility with PIL 2015-02-16 22:02:52 -06:00
Steven Silvester fa226ad807 Update the README with some warning hints
Update the readme with some warning hints

Tweak README

Tweak README

Fix preferred plugins test

Pep8 fix

Remove imshow from PIL plugin

Fix spelling

Tweak readme
2015-02-07 16:40:54 -06:00
Steven Silvester 5ccdd36bc3 Remove imshow from PIL plugin
Do not provide imshow, show in PIL plugin to prevent conflicts

Make the sphinx install quiet

Fix local linka

Fix literal blocks

Fix another local link

Fix richardson-lucy link

Assert world dominance
2015-02-07 16:40:44 -06:00
Tim Seifert 3748557ac9 fix for concatenate test 2015-02-04 22:59:19 -06:00
Tim Seifert 4bdde3d2ae load correct _frame_index 2015-02-04 12:24:20 -06:00
Steven Silvester d9f5aa9104 Compare the images in LAB space 2015-02-01 10:05:52 -06:00
Steven Silvester d8f6a6697b Do not add alpha channel to CMYK images 2015-02-01 10:05:40 -06:00
Steven Silvester 3728c61615 Reinstate run_module_suite 2015-01-31 21:56:22 -06:00
Steven Silvester ca0ae43272 Add test for cmyk and use relative imports 2015-01-31 20:34:28 -06:00
Steven Silvester a188380ba8 Add handling of CMYK images 2015-01-30 19:53:26 -06:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Steven Silvester 87998d6518 Update docstring and create test module setup function 2015-01-15 18:57:18 -06:00
Juan Nunez-Iglesias 61d9812cd8 Don't create superfluous ip variable 2015-01-15 23:31:51 +11:00
Juan Nunez-Iglesias 5d115209b5 Create new figure for each imshow test 2015-01-15 23:07:09 +11:00
Juan Nunez-Iglesias 7b2dbcb15b Expand the docstring for imshow 2015-01-15 22:39:50 +11:00
Juan Nunez-Iglesias c6dff6942d Don't create new plot automatically
This behavior is a bit too magical and may interfere with creation of
interactive ImageCollection browsers, for example.
2015-01-15 22:26:55 +11:00
Juan Nunez-Iglesias e472009090 Add test for signed images 2015-01-15 22:26:17 +11:00
Juan Nunez-Iglesias 2bdd239496 Overhaul imshow to clarify flow 2015-01-15 22:25:41 +11:00
Juan Nunez-Iglesias 30c522e706 Use different colormaps depending on input image 2015-01-15 20:16:24 +11:00
Juan Nunez-Iglesias 400c3fd202 Rename ax to ax_im in mpl imshow plugin 2015-01-15 15:44:55 +11:00
Juan Nunez-Iglesias 9fe4f33793 Add tests for nonstandard images 2015-01-14 20:29:15 +11:00
Juan Nunez-Iglesias 176889933f Add tests for io.imshow mpl plugin 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias 984e22b47a Replace Axes with AxesImage where relevant 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias fab4ff2305 Fix incorrect call to colorbar 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias c68c8e5468 Improve mpl imshow plugin docstring 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias fac8fde9dc Overhaul matplotlib imshow plugin
- images are displayed within their native dtype range,
- unless they are outside of their range (e.g. a float image with
  values greater than 1) or they are of an unsupported dtype (e.g.
  a uint64 image), in which case the dynamic range of the display
  corresponds to the image range,
- which is also done for images with extremely low contrast for their
  native range (e.g. float images in [1e-7, 5e-7].

In the latter two cases, a colorbar is also displayed and a warning is
raised.

Finally, we return the axes object on which the image is plotted, to
enable further plotting in the matplotlib new OO style.
2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias 8f4d0247b5 Add docstring to matplotlib imshow plugin
The image is now named as an argument, and the axes are returned, in
keeping with matplotlib convention.
2015-01-14 20:13:32 +11:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Steven Silvester 2d3ada19e5 Allow for no exceptions to be raised and cleanup
Allow for no exceptions to be raised

Add some helpful comments

Remove doctest skips

Remove TODO note

Cleanup and skip failing doctest
2014-12-23 16:51:18 -06:00
Steven Silvester c0a0490eed Fix handling of multiple warnings and update tests
Fix handling of multiple warnings

Update all test __init__ files

Update segmentation pkg

Update the color pkg

Update the exposure pkg

Update the filters pkg

Update the io pkg

Update the measure pkg

Update morphology package

Restructure test setup function

Add expected_warnings to __all__

Update restoration pkg.

Remove explicit filter check since it is done elsewhere

Fix the image test helpers

Update the transform pkg

Fix util pkg

Update viewer pkg
2014-12-23 16:51:06 -06:00
Steven Silvester 1b905d4cef More cleanup and updating of tests
Clean up setup_test and add a teardown_test method

Implement new setup/teardown in novice tests

Fix warning handling in pil_plugin

Update rank tests
2014-12-23 16:50:50 -06:00
Steven Silvester 782ba46a4c Handle more warnings
Punt on the issue of warnings with the minimum build

Handle warnings in measure pkg

Fix the rank filter test by forcing a random seed in the function

Compare as boolean in imread test

Import loadmat in test_setup to avoid warning

Use a setup method for imread plugin test

Revoke unintended changes

Fix indentation to appease jni

More indentation fixes

Fix unintentional comment out
2014-12-23 16:49:59 -06:00