Commit Graph

4322 Commits

Author SHA1 Message Date
Vighnesh Birodkar 66caaa5b9f Corrected testing code 2015-06-07 00:40:05 +05:30
Vighnesh Birodkar 2cc4066097 2d images converted to 3d before removing seams 2015-06-06 22:42:18 +05:30
Vighnesh Birodkar cf98558196 pep8 changes 2015-06-06 21:51:36 +05:30
Vighnesh Birodkar c332fd5363 docstring change 2015-06-06 21:46:50 +05:30
Vighnesh Birodkar 12fb4cbb86 Removed debug print and corrected formatting 2015-03-30 13:22:22 +05:30
Vighnesh Birodkar 1f570a145f Formatting changes 2015-03-30 13:22:22 +05:30
Vighnesh Birodkar 29ec5ee3ec Added example and test 2015-03-30 13:22:22 +05:30
Vighnesh Birodkar d30ed25968 Added implementation and doc string 2015-03-30 13:22:22 +05:30
Steven Silvester eed18b803f Another random warning guard 2015-03-29 15:36:25 -05:00
Steven Silvester adac822ee9 Fix setup to allow installing from PyPI
≈
Fix setup to allow installing from PyPi
Another attempt at fixing the setuptools problem

Fix pip incantation

Fix typo

Try updating setuptools too

Try upgrading pip and setuptools after venv install

Rule out install_requires as the source of the problem

Try just requiring the ones that can be built from source

Use explicit install_requires and move version checks to after setup runs

Clean up installation for PyPI compatiblity

Dead end commit

Fix travis to match new installation procedure

Put build_versions check after install

Fix travis syntax

Switch to lower-case cython in version check

Another attempt

Another fix

Fix syntax error

Make header executable

Build inplace on py27

Fix finding of source code version in sphinx

Fix travis syntax

Import setuptools after install

Fix the version check in sphinx

Work around setuptools bug in 2.7

Fix handling of Cython requirement and update release notes

Switch to one Appveyor build and update build method

Add cython back to install_requires

Remove debug lines

Another try for appveyor install

Another attempt at setuptools and Appveyor

Do not let intermittent apt-get failures crash the build

Fix typo

Another appveyor attempt

More fixes for setuptools and Appveyor

Yet another setuptools/appveyor attempt

Put requirements.txt back in order

Fix typo

Fix readlines function call

Try not using a venv for python 2.7

Fix syntax

Try the provided venv for py27

Remove --user

Remove debug info

Another try for python27 fix

Try again

Do not use install_requires with numpy/scipy

Try just avoiding scipy

Try removing scipy (numpy was before)

Avoid both scipy and numpy

Fix qt install on 27

Fix qt install on 27 agin

Revert the scripts to their previous condition

Revert file permission changes

Undo changes to requirements.txt
2015-03-29 15:36:11 -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
Eric Dill 8af43739c4 TST: Barn-door testing of SaveButtons clicks
The canny_simple.py demo in viewer_examples/plugins has a save
button that raises an AttributeError in PIL because the button
click is passing 'False' to the SaveButtons.save_to_file function
when it expects a filename or None.
2015-03-19 08:35:57 -04:00
Steven Silvester 6051ff215c Merge pull request #1430 from arve0/document_measure.label
import from _label instead of _ccomp
2015-03-14 22:00:45 -05:00
Juan Nunez-Iglesias 0d3d5f1319 Update See Also to References
"See Also" is apparently reserved by sphinx-numpydoc for pointers to
other code functions, rather than documentation.
2015-03-15 12:21:18 +11:00
Juan Nunez-Iglesias 2f62cf9d2e Clarify 'low-contrast' in docstring 2015-03-15 12:21:18 +11:00
arve0 6fceaa2f75 import from _label instead of _ccomp 2015-03-14 23:22:15 +01:00
arve0 f737ac4496 move docstring from viewer.widgets.core to viewer.widgets 2015-03-14 20:26:36 +01: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
Johannes Schönberger 47a4418140 Use np.inf instead of float('inf') 2015-03-08 19:37:53 -04:00
Johannes Schönberger d6a737bf86 Update doctest for new estimator API 2015-03-08 13:13:46 -04:00
Johannes Schönberger eb6c3ede38 Fix RANSAC for invalid model estimation and confidence corner case
Previously, estimators did not return whether the model estimation
was successful. RANSAC now tests whether the estimation was
successful and skips invalid models.

When the confidence/stop_probability of RANSAC was set to 1,
the iteration was falsely terminated early instead of running for
the maximum number of iterations.
2015-03-06 23:47:08 -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
Stefan van der Walt d6870c6de7 Merge pull request #1066 from msarahan/PhaseCorrelation
Add subpixel shift registration
2015-03-02 08:30:45 -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
Josh Warner (Mac) ea02a4e348 FIX: Ignore exception if attempted deletion fails (fixes #817) 2015-02-28 17:11:31 -06:00
Josh Warner 23f1a88578 Merge pull request #1391 from ahojnnes/eigvals-fix
FIX: Hessian matrix eigvals computation
2015-02-24 12:36:03 -06:00
Jeremy Metz 28d0691d9e Minor modification to docstring 2015-02-24 12:39:09 +00:00
Jeremy Metz 06b2a50f22 Merge branch 'master' into threshold_li 2015-02-24 12:25:49 +00:00
Jeremy Metz 09bb2c319c Moved contribution statement to CONTRIBUTORS.txt
* Amended docstring
2015-02-24 10:23:47 +00:00
Johannes Schönberger 84bcb583d7 Fix Hessian matrix eigvals 2015-02-23 22:32:04 -05:00
Steven Silvester 6ddec9bd85 Merge pull request #1376 from jmetz/threshold_li
Li thresholding port from imagej
2015-02-23 12:55:16 -05:00
Jeremy Metz 2bc9e82465 Minor stylistic changes, removed lena test 2015-02-23 16:40:38 +00:00
Jeremy Metz 3cbae84360 PEP8 fixes, License file added, tests added
* Added 7 tests (3 in TestSimpleImage, 4 as separate functions)
* Added ImageJ license file
* Updated Li code
  * threshold set from image instead of fixed at 0.5
  * subtract min to handle -ve images (as log is integral part of alg.)
2015-02-23 11:22:12 +00:00
Michael Sarahan 71a89697f0 improve test coverage. Use SciPy's fourier_shift for examples. 2015-02-21 11:33:37 -08:00
Michael Sarahan cf09b0c5ef Incorporate fixes for complex images 2015-02-20 20:55:46 -08:00
arve0 3acae2274f move CollectionViewer update_image to parent class 2015-02-20 13:09:25 +01:00
Josh Warner 4644bdd347 Merge pull request #874 from emmanuelle/nlm_denoise
FEAT: NL-means denoising
2015-02-19 16:53:58 -06:00
arve0 2308ba0617 fix typo artist.remove -> artists.remove 2015-02-18 22:19:31 +01:00
Jeremy Metz 5eef38bba5 Removed nbins input (from use with histogram input) 2015-02-17 14:55:27 +00:00
Jeremy Metz 979d7515f0 Cleaned up comments, removed unnecessary vars 2015-02-17 14:45:31 +00:00
Jeremy Metz 2970de33ee Initial draft of Li thresholding (comments left in) 2015-02-17 14:36:58 +00:00
Juan Nunez-Iglesias 0ec4016926 Merge pull request #1375 from tonysyu/fix/pil-compatibility
Fix compatibility with PIL
2015-02-17 17:18:26 +11: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