Commit Graph
554 Commits
Author SHA1 Message Date
Stefan van der Walt 8a06fb79cf Fix another instance of an .npy file. 2011-10-11 19:21:06 -07:00
Stefan van der Walt 1aa7af64a9 Merge npz fixes from Christoph Gohlke. 2011-10-11 19:03:35 -07:00
Stefan van der Walt c60d490a99 Use .npz test data in opencv tests. 2011-10-11 19:03:27 -07:00
Stefan van der Walt ece0363264 Replace .npy files by .npz. Smaller, and avoids pickling problems on Python 3. 2011-10-11 19:03:08 -07:00
cgohlke b15e7df14b Fix: use npz instead of npy format for matlab-output files 2011-10-11 17:23:30 -07:00
cgohlke 02b31756ff Fix: use npz instead of npy format for matlab-output files 2011-10-11 17:19:53 -07:00
cgohlke fb66138f9e Fix ImportError on Python 3 2011-10-11 17:12:06 -07:00
Stefan van der Walt f332b177fb Merge pull request #51 from cgohlke/patch-8
Fix watershed failures on Python 3
2011-10-10 18:41:27 -07:00
cgohlke 7c586cfeff Edited scikits/image/morphology/__init__.py via GitHub 2011-10-10 16:10:39 -07:00
cgohlke 17ff626bf6 Edited scikits/image/draw/draw.py via GitHub 2011-10-10 16:09:43 -07:00
cgohlke 09e0ecdf96 Edited scikits/image/morphology/watershed.py via GitHub 2011-10-10 16:09:12 -07:00
cgohlke 58226e3fca Fix Python 3 import error 2011-10-10 16:08:13 -07:00
cgohlke be02b9a651 Fix Python 3 import error 2011-10-10 16:07:24 -07:00
cgohlke b57bd821f0 Fix Python 3 import error 2011-10-10 16:06:03 -07:00
cgohlke 7f07f825e8 Fix watershed failures on Python 3 2011-10-10 14:35:21 -07:00
Stefan van der Walt 0fe16b54ac Merge pull request #50 from cgohlke/patch-7
Fix `AttributeError: 'function' object has no attribute 'func_name'`
2011-10-10 14:12:10 -07:00
cgohlke d6a55c8b7b Fix AttributeError: 'function' object has no attribute 'func_name' on Python 3 2011-10-10 14:01:19 -07:00
cgohlke 5d6fcf06c4 Work around AttributeError: 'module' object has no attribute 'BufferedIOBase' on Python 2.7+, Windows 2011-10-10 13:52:55 -07:00
Stefan van der Walt 4336361c34 Merge pull request #47 from cgohlke/patch-4
Fix ValueError in _hough_transform on win-amd64
2011-10-10 13:23:56 -07:00
cgohlke f83076f722 Fix TypeError: must use keyword argument for key function on Python 3 2011-10-10 13:19:46 -07:00
cgohlke 9a24de9b81 Fix ValueError on win-amd64 2011-10-10 13:07:50 -07:00
Stefan van der Walt d22da55cdc BUG: Untabify video.py. 2011-10-10 13:01:23 -07:00
Riaan van den Dool 022aac779f GDAL plugin added. 2011-10-10 11:52:07 +02:00
Stefan van der Walt 246be6c8e2 BUG: Use integer image values as expected in tv denoise test. 2011-10-09 16:37:40 -07:00
Stefan van der Walt e2accfb500 BUG: Fix watershed tests. 2011-10-09 16:31:07 -07:00
Stefan van der Walt b41398d83a Merge video I/O. 2011-10-09 16:20:56 -07:00
Stefan van der Walt 744b8d7668 Qt-based image reading.
Conflicts:
	scikits/image/io/__init__.py
2011-10-09 16:14:21 -07:00
Stefan van der Walt 131a361b60 Merge pull request #10 from holtzhau/video-io
Video I/O.
2011-10-09 16:06:15 -07:00
Stefan van der Walt 12ab1a0aa4 Merge pull request #12 from holtzhau/hough
Probabilistic Hough transform.
2011-10-09 16:03:03 -07:00
Stefan van der Walt 463e1d2f2d Merge furhter improvements to histogram of gradients.
Conflicts:
	CONTRIBUTORS.txt
	scikits/image/feature/hog.py
2011-10-09 15:54:52 -07:00
Stefan van der Walt 55072134b8 BUG: Add 'draw' and 'feature' sub-modules. 2011-10-09 15:41:46 -07:00
Stefan van der Walt 5db89d365e ENH: Use new draw module to construct HOG image. 2011-10-09 15:41:12 -07:00
Stefan van der Walt 8b522cfa70 Add drawing module with Bresenham line. 2011-10-09 15:41:12 -07:00
Brian HoltandStefan van der Walt 0bf8ecc65a use sat_sum for performance improvement 2011-10-09 15:41:12 -07:00
Brian HoltandStefan van der Walt da6c93bac4 replaced arctan with arctan2 2011-10-09 15:41:12 -07:00
Brian HoltandStefan van der Walt 20a7892b5d replaced gradient operation with np.diff 2011-10-09 15:41:11 -07:00
Brian HoltandStefan van der Walt 945ede743d pep8 + addressing some of Stefan's comments 2011-10-09 15:41:11 -07:00
Brian HoltandStefan van der Walt d0bbb525a8 Initial implementation of Histograms of Oriented Gradients 2011-10-09 15:40:24 -07:00
emmanuelle 724733f1d6 ENH: give a short definition of rank order in docstring 2011-10-08 19:31:25 +02:00
Emmanuelle Gouillart 7d420da594 Docstring for rank_order
TODO: write a graphical example using rank_order (reassigning labels
in segmented objects, for example)
2011-10-07 16:07:35 +02:00
Emmanuelle Gouillart 1c5e05442e Renamed fast_watershed to watershed. 2011-10-07 16:05:27 +02:00
emmanuelle 393bd94bca ENH: watershed docstring 2011-10-06 23:26:47 +02:00
emmanuelle a07fc6d172 New example for the gallery: watershed
Removed the See also part in watershed's docstrings, as it made the doc
compilation crash...
2011-10-06 23:15:27 +02:00
emmanuelle 738dcfde15 Import is_local_maximum in __init__.py 2011-10-06 09:12:17 +02:00
emmanuelle 2b4854a977 Added the is_local_maximum function, that is useful to determine
markers for the watershed.
2011-10-06 09:04:47 +02:00
emmanuelle f0702fb938 Removed unnneeded code to compute strides 2011-10-05 21:37:05 +02:00
emmanuelle 656962cbc9 Initial integration of CellProfiler's watershed module 2011-10-05 21:13:46 +02:00
Stefan van der Walt de38b5f93c PKG: Do not build Cython files on clean. 2011-10-05 10:58:09 -07:00
andyandStefan van der Walt fc612a830e pep8 2011-10-04 11:56:23 -07:00
andyandStefan van der Walt 7448ba2529 null_plugin gets imread as promised in __ini__.py of plugins 2011-10-04 11:56:17 -07:00