c0a350cbcc
Merge remote-tracking branch 'origin/master' into v0.12.x
2016-03-08 01:30:18 -08:00
caa2d220b6
Changed docsting sections order
2016-03-08 01:35:48 +03:00
4839ae40e5
Release version 0.12.2
2016-03-07 12:38:38 -08:00
dfffc55c36
Added inpaint to module init
2016-03-07 23:36:26 +03:00
a064e3d8a2
Merge branch 'master' into v0.12.x
...
Conflicts:
bento.info
skimage/__init__.py
2016-03-07 12:34:28 -08:00
6ecee1d56f
Merge pull request #1985 from stefanv/remove_lena
...
Remove lena image from test suite
2016-03-07 07:33:23 -06:00
cc4dbc0314
Merge pull request #1986 from stefanv/cython_version_check
...
Warn if user tries to build with older Cython version
2016-03-07 13:14:25 +01:00
ccc35c1ed0
Release v0.12.1
2016-03-07 01:44:26 -08:00
e1c2ea29dd
Warn if user tries to build with older Cython version
2016-03-07 01:38:22 -08:00
18da19e7b9
Remove left-over mentions in test docstrings of lena
2016-03-07 00:39:39 -08:00
78c0abeb17
Fix 2.6 compatibility
2016-03-07 00:37:26 -08:00
89136157bb
Remove lena image from test suite.
...
Results from the morphology module were compared against output from the
corresponding MATLAB functions, as applied to the lena test image. This image
does not conform to the Debian Free Software Guidelines and had to be removed.
The output is now tested against results generated with the current version of
scikit-image (0.12.0), which is known to be correct due to the comparison
described above.
2016-03-06 23:16:11 -08:00
d8c18a9f15
Update version to 0.13dev
2016-03-06 18:25:28 -08:00
d5f4f32162
Modified bento.info and skimage/__init__.py with 0.12.0
2016-03-05 17:41:51 +01:00
6fb9bf0f83
Merge pull request #1981 from pradyumnanpk/bilateral_filter-enhancement
...
FIX: Scale bilateral filter win_size with sigma
2016-03-04 14:34:40 -06:00
29fa9e3047
Merge pull request #1937 from stefanv/test_parallel_fail
...
Raise at least one error for parallel tests.
2016-03-04 13:47:19 -06:00
16ed4ed865
Corrected a grammatical error in deprecated message. No functional change.
2016-03-04 09:29:32 -07:00
f069aada3c
Supports skimage_range. Displays deprecated warning when used. Two test cases to test this functionality.
2016-03-04 08:34:47 -07:00
0ccff88945
Fix ORB test
...
In a previous PR, the scales were incorrectly copy-pasted.
2016-03-03 17:49:58 -08:00
729328ed6d
Merge pull request #1905 from stefanv/novice_undo
...
Add comparison and reset capability to novice module
2016-03-03 18:38:17 -06:00
428cc3daeb
Casted ceil to int such that win_size is an int.
2016-03-03 12:27:23 -07:00
ecf90e1cca
Added the chnage to comments
2016-03-03 12:01:57 -07:00
9f3fc737ba
sigma_range is renamed to sigma_color and win_size scales with sigma_spatial
2016-03-03 12:00:15 -07:00
7caf88f6ee
Fix assertion in novice test for older numpy versions
...
For older versions of numpy, `assert_equal(a, b)` failed for arbitrary objects
`a` and `b` even if they had ``__eq__`` defined. This is now fixed, but the
test is changed to use ``assert_true(a == b)`` to be backward compatible.
2016-03-02 18:59:27 -08:00
9e9207c718
Catch known Matplotlib warnings
...
`tight_layout` is not supported on all backends, so Matplotlib may raise a
warning, saying it is falling back to the Agg backend. Since we use the
'Template' backend in our tests, this warning pops up from time to time.
2016-03-02 18:54:14 -08:00
453efe974d
Ensure array data is always uint8
2016-03-02 17:20:19 -08:00
a8057ed941
Add reset and compare to novice module
...
- Reset restores the image to the original.
- Compare displays the original and the modified image side-by-side.
2016-03-02 16:22:24 -08:00
3ffca2fdbd
Extend plugins with imshow_collection
...
A first implementation is made for Matplotlib.
2016-03-02 16:22:24 -08:00
7a2c80e70f
Fix spacing for inline comments
2016-02-25 17:24:29 -08:00
f6618ef8b2
Clean up profile-line docstring
2016-02-24 17:38:21 -08:00
7f5b9327fa
Update docstring for profile_line
2016-02-24 16:54:22 -08:00
5457b94132
Merge pull request #1951 from jmetz/update_peak_local_max_exclude_border
...
Updated exclude_border to not use min_distance
2016-02-24 12:19:39 +01:00
4244bb17a8
Fix: missing colon on additional tests of exclude_border values
2016-02-24 02:27:14 +00:00
488866cfe5
Added additional tests of exclude_border values
2016-02-24 02:06:09 +00:00
20d4e7dde8
Finally fixed issue:
...
Issue Was with remnant of min_distance logic (i.e. `footprint is not
None`
2016-02-24 01:36:21 +00:00
c0e3dcc69f
Reverted tests to boolean exclude_border
2016-02-24 00:02:41 +00:00
7b23b83d21
Updated test_peak for new exclude_border
2016-02-23 22:24:36 +00:00
25d15c603d
Updated default value to be backwards compatible
2016-02-23 22:17:28 +00:00
dc9c887319
Raise at least one error for parallel tests.
...
Ideally, we should grab all exceptions raised and let the user see them. For
now, at least make sure that the primary test passes.
2016-02-23 10:59:14 -08:00
b5efe5ed94
Merge pull request #1956 from emmanuelle/label_zero
...
New handling of background pixels for measure.label
2016-02-23 10:10:56 +11:00
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
926af0ff53
BUG: fix the conversion from .pyx.in to .pyx files
...
It got botched sometime around reviewing/merging/rebasing of gh-1924
2016-02-22 15:01:03 +00:00
5e6c98ac01
Added backwards compatibility for exclude_border
2016-02-22 10:06:40 +00:00
44150989ee
WIP
2016-02-21 16:50:21 +01:00
fc70f73064
STY: more tweaks in response to review comments
2016-02-20 17:29:13 +00:00
ba328e7531
MAINT: address review comments
...
Use recommended idioms in the .py wrapper
2016-02-20 17:29:13 +00:00
2bc8538f9f
MAINT: address review comments
...
* typos in comments
* handle the corner case of width-1 2D image
* vanity
* change up leftover <= to correct ==
2016-02-20 17:29:13 +00:00
dc702a83ee
TST: skel3d: redo 3D test images
...
Remove ad-hoc images from morphology/tests/data folder.
Add a FIJI generated image to skimage/data.
The image was generated via
>>> img = binary_blobs(32, 0.05, n_dim=3, seed=1234)
>>> img = img.astype(np.uint8)*255
>>> img = img[:-2, ...]
then saved as a sequence of png frames, read into FIJI as an image sequence,
and skeletonized via Plugins -> Skeletonize (2D/3D).
2016-02-20 17:29:13 +00:00
d832739300
TST: skel3d: remove 2D test images
2016-02-20 17:29:13 +00:00
64bb1775be
TST: inline a two-hole image
2016-02-20 17:29:13 +00:00
Stefan van der Walt