Commit Graph

320 Commits

Author SHA1 Message Date
emmanuelle a5a771a8e4 Modified label function so that background pixels are labeled with 0, and
background=0 by default.

Modified label function so that background pixels are labeled with 0, and
background=0 by default. All tests of _ccomp.pyx pass

Modified a couple of files to be consistent with the new behavior of
measure.label

Modified doctring of label to pass doctest

Modified TODO.txt as well as release notes to mention the new behavior of
label.

Typo in docstring

Typo in docstring

Changed default value of kw argument background in measure.label

Removed unnecessary and outdated comment
2016-02-22 21:19:23 +01:00
Johannes Schönberger 9d9a4b3e0b Fix some remaining TODO items 2016-02-09 11:11:28 +01:00
Steven Silvester b710bd21d2 Use a stacklevel of 2 by default for all warnings 2016-01-30 08:57:46 -06:00
Steven Silvester 5b8fd77b80 Merge pull request #1691 from juliusbierk/active-contour-model
New feature: Active contour model
2015-12-13 14:57:10 -06:00
emmanuelle a16c530322 Some minor PEP8 issues 2015-12-11 17:21:17 +01:00
Juan Nunez-Iglesias 1a05b130e8 Merge pull request #1449 from stefanv/clear_border_non_binary
Allow clear_border to operate on labeled images
2015-12-09 11:18:40 +11:00
emmanuelle bff2ce0bc4 Missing line 2015-12-08 12:27:24 +11:00
emmanuelle bb64e8cfcb Added test for slic segmentation: case where more segments than pixels
are asked for.
2015-12-08 12:27:24 +11:00
Gael Varoquaux 12c173908f BUX: in _slic.pyx slice can has steps=None
int(None) fails, and slice.steps == None is valid. It is equivalent to 1.
2015-12-08 12:27:24 +11:00
Kshitij Saraogi 428db535cd added support for boolean types in segementation 2015-12-02 10:57:07 +05:30
Julius Bier Kirkegaard 320977c8b9 Fixed doctest problem 2015-12-01 12:42:12 +00:00
Julius Bier Kirekgaard ea33891c60 Skip doctest 2015-11-29 14:15:10 +00:00
Julius Bier Kirekgaard 6f1ec347f4 Fixed missing scipy import 2015-11-01 02:03:27 +00:00
Julius Bier Kirekgaard 55e12b6352 py3 fixes and skip test for old scipy. 2015-10-28 19:02:59 +00:00
Juan Nunez-Iglesias 7212fe3e82 Replace semicolon with full stop 2015-10-18 11:41:54 +11:00
Juan Nunez-Iglesias 4816d2ed0f Refine docstring for 'compactness' kwarg in SLIC
Addresses #1745
2015-10-17 13:16:39 +11:00
Julius Bier Kirekgaard 5c20ef7218 pep8 and py3 compliance. more comments 2015-09-09 15:44:35 +01:00
Julius Bier Kirekgaard 8d344d090f Active contour updates. Now works with scipy<0.14 2015-09-05 13:29:59 +01:00
Julius Bier Kirekgaard 94b335fb2e change test names 2015-08-31 21:52:47 +01:00
Julius Bier Kirekgaard fa6815404f spelling corrections and misc. 2015-08-31 21:48:32 +01:00
Julius Bier Kirekgaard 96847f2652 pep8 and other small changes 2015-08-31 20:28:28 +01:00
Julius Bier Kirekgaard ad4948a609 pep8 compliance 2015-08-31 16:37:21 +01:00
Julius Bier Kirekgaard 646c2102d2 Added active contour model 2015-08-31 16:15:08 +01:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Juan Nunez-Iglesias 0d134987f9 Harmonize all ndimage usage across the library
Only two forms remain in use:

- `from scipy import ndimage as ndi`
- `from scipy.ndimage import function`
2015-06-09 15:18:37 +10:00
Johannes Schönberger 0758fc9cd6 Do not acquire GIL for felzenswalb 2015-05-19 22:52:35 -07:00
Johannes Schönberger 2d0b4dc37a Do not acquire GIL for quickshift 2015-05-19 22:43:46 -07:00
Johannes Schönberger 785176b4c2 Do not acquire GIL for slic 2015-05-19 22:40:19 -07:00
Stefan van der Walt 6fc4e11b9a Add in-place operation 2015-05-09 10:46:32 -07:00
Stefan van der Walt 3b0179e4c1 Improve test robustness 2015-05-08 22:26:03 -07:00
Gustav Larsson 9de5a4557c Added test for buffer overflow in slic.
As with all buffer overflows, it is hard to make a test that
consistently triggers tests the behavior. This test does not work for me
through the test_slic.py file, but it works in isolation.
2015-04-20 14:35:57 -05:00
Gustav Larsson 841da2b3f8 Fixed crashing bug in slic.
The enforce connectivity step of slic runs a BFS and puts the
results in coord_list. This coord_list has room for max_size elements,
which is easily overrun if there is a large connected element. This
change limits the BFS to max_size, so that if a connected area is bigger
than max_size, it will be split up instead of the program crashing.
2015-04-20 09:39:38 -05:00
Stefan van der Walt acc1ee0dad Allow clear_border to operate on labeled images 2015-03-24 13:55:37 -07: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
Steven Silvester 09876408fc Fix some sphinx warnings and add to build
Fix some sphinx warnings

Add documentation build to test

Add documentation build to test

Remove change in numpydoc

Remove change in apigen

Add makefile target for html and add to travis script

Add a makefile target for html and add to travis script

Fix more sphinx warnings
2015-02-07 16:40:26 -06:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Juan Nunez-Iglesias 9eed552ee7 Replace em-dash with regular dash in comment 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 7935e51596 Clarify and fix docstrings 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias ac5c0c30a9 Fix incorrect call to mark_boundaries in test 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 9b9730b058 Specify mode for mark_boundary tests 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 6586d1eb3f Test subpixel mark_boundaries 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 307d4b6137 Simplify code for coloring boundaries 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 242dbf9b2b Don't outline boundaries by default
mark_boundaries used to draw outlines by default. This was necessary
partly because of the asymmetric way boundaries were being drawn. Now,
boundaries are either thick or drawn around background or drawn with
subpixel precision, so I suggest that outlines are less needed.
2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias cb2002c367 Allow custom background_label in mark_boundaries 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 257502c099 Prevent unnecessary array copy for RGB images 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 28591cc3ee Allow different modes in mark_boundaries 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias a406f8dd2a Make subpixel find_boundary doctest more readable 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias a55e3346f7 Set up correct type for find_boundaries test 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias fb893c277d Add correct subpixel boundary estimation. 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 9c78fce4cd Remove unused deprecation warning 2015-01-22 11:38:36 +11:00