Commit Graph

177 Commits

Author SHA1 Message Date
Steven Silvester 2355c17e3c Add mask option to exposure.equalize_hist with test.
Remove print and fix comparision to None

Update test to make it clear there is a difference

Fix mask logic and `equalize_hist` in `__all__`.

Fix handling of mask and tweak mask test

Another run at travis

Update travis to avoid conflict
2014-08-31 21:15:01 -05:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
Tony S Yu ee3b9f2d66 Remove orphaned import 2014-07-17 20:50:39 -05:00
Tony S Yu d9a39d44eb Remove cast and rescale and adjust test values to match 2014-07-16 23:24:03 -05:00
Tony S Yu c24adec714 Add adapt_rgb decorator and helpers.
This applies `adapt_rgb` to `equalize_adapthist` and removes the
special-casing of RGB images in that function. Note that tests of
`adapt_rgb` fail because some type conversion and intensity scaling
were added to pass tests for `equalize_adapthist`.
2014-07-16 23:13:04 -05:00
blink1073 94bbb58274 Minor cleanup of adapthist module 2014-07-16 14:06:08 -05:00
blink1073 70a3760bca Remove unused deprecation import. 2014-07-12 19:43:57 -05:00
blink1073 0392299fae Refactor to use np.pad, naming changes, update test. 2014-07-12 19:12:53 -05:00
blink1073 a924e55b52 Fix handling of border pixels and update tests 2014-07-12 19:12:53 -05:00
Tony S Yu 5cafbd95e6 Add tests for intensity_range and rename parameter 2014-07-12 19:12:53 -05:00
blink1073 cc68b0c392 Start removing optional edge pixel handling 2014-07-12 19:10:32 -05:00
blink1073 2bdfcc7d5e Fix failing tests and turn module level testing back ony 2014-07-12 19:10:32 -05:00
blink1073 ba010a3191 Update adapthist tests, add test for alpha channel and rgb mode handling. 2014-07-12 19:10:32 -05:00
blink1073 909f23baab Switch to HSV, refactor equalize_adapthist, fix #757, cleanup docstring 2014-07-12 19:10:31 -05:00
blink1073 95a208eec5 Add test for adapthist modes 2014-07-12 19:10:31 -05:00
blink1073 9f7119b1c0 Change 'trim' to 'crop' 2014-07-12 19:10:31 -05:00
blink1073 9fa39e564a Update docstring 2014-07-12 19:10:31 -05:00
blink1073 61fb831d31 Implement a mode enum 2014-07-12 19:10:31 -05:00
blink1073 196205956e Set the unused portion of the image to 0 2014-07-12 19:10:31 -05:00
Tony S Yu 4c000c4d89 Use normal deprecation warning 2014-07-11 17:01:54 -05:00
Tony S Yu 879c2c7f36 Add tests for intensity_range and rename parameter 2014-07-11 16:30:18 -05:00
Tony S Yu b066a143b9 Clarify docstrings 2014-06-17 23:08:03 -05:00
Tony S Yu 8e539cc12a Clarify docstrings 2014-06-17 23:08:03 -05:00
Tony S Yu ec9198c58e Edit wording of docstrings 2014-06-17 23:08:03 -05:00
Tony S Yu 423207e07c Make intensity_range a public function 2014-06-17 23:08:03 -05:00
Tony S Yu 9b110d6c6e Tweak range definition in rescale_intensity 2014-06-17 23:08:02 -05:00
Josh Warner (Mac) 8663e23f4a FIX: Use //= instead of /= to fix deprecation warnings in adapthist 2014-05-08 20:45:19 -05:00
Johannes Schönberger 8e95ea0ea4 Fix deprecation warnings 2014-04-11 10:49:51 -04:00
Johannes Schönberger 3d50a03c56 Remove deprecated skimage.exposure.exposure 2014-04-11 10:05:50 -04:00
François Boulogne 92b9ebc0e9 MAINT: remove 2 weird lines 2014-03-14 20:28:30 -04:00
Johannes Schönberger ef63523ab0 Move denoise functions to restoration submodule 2014-03-13 19:39:54 -04:00
Johannes Schönberger 107f1d607c Move phase unwrapping algorithms to restoration submodule 2014-03-13 18:50:39 -04:00
Johannes Schönberger bfd693cd43 Merge pull request #908 from cgohlke/patch-2
Define M_PI (not part of C89)
2014-03-11 07:14:00 -04:00
jaimefrio e6fc72011f BUG: wrong search for pivot in quicker_sort
This PR corrects an error in the search for the existence of a distinct
pivot for sorting in the `quicker_sort` routines. This could lead to
`quicker_sort` wrongly believing that all items in a subarray are equal and
hence require no sorting.

While this doesn't explain #835 and #902, it may be related.
2014-03-11 00:48:10 -07:00
cgohlke 44f26ce9ee Define M_PI (not part of C89) 2014-03-10 20:57:33 -07:00
cgohlke a3067c572a Define M_PI (not part of C89) 2014-03-10 20:56:27 -07:00
Juan Nunez-Iglesias d652a9ce9a Merge pull request #897 from tonysyu/named-rescale_intensity-params
Add string inputs for range parameters of `rescale_intensity`

This supports common ranges for scientific cameras: 10, 12, and 14-bit uint.
2014-02-24 18:04:06 +11:00
Tony S Yu 28d6787a87 Add tests for uint12 and uint14 limits 2014-02-23 23:13:13 -06:00
Johannes Schönberger 181d030952 Remove six copy in _shared as it is a required dependency 2014-02-23 20:42:40 -05:00
Tony S Yu 7b104fdf14 Add string inputs for range parameters of rescale_intensity 2014-02-23 14:36:31 -06:00
Stefan van der Walt cff007827c Merge pull request #825 from ahojnnes/coverage
MRG: Increase test coverage
2013-12-03 00:29:15 -08:00
Johannes Schönberger 5b3c21a4d4 Add test for neggative gamma parameter 2013-11-22 12:33:21 +01:00
Johannes Schönberger 0a2ed35253 Add test for negative input image 2013-11-22 12:30:49 +01:00
Jostein Bø Fløystad ccbd3bfced unwrap: Do not include debug symbols in extension builds. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad 37b5a946c8 unwrap tests: PEP8 fixes. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad 8ad3d1df17 unwrap: Simplify code after completing float->double. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad 593a7d63ce unwrap: Change 1D unwrapper from float to double. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad cd5cc84aa9 unwrap: Change 3D wrapper code from float to double. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad d0ccbe71c1 unwrap: Change 3D C code from float to double. 2013-11-22 10:45:07 +01:00
Jostein Bø Fløystad 9091d2759a unwrap: Change 2D wrapper code from float to double. 2013-11-22 10:45:07 +01:00