Commit Graph
8051 Commits
Author SHA1 Message Date
Johannes Schönberger 32a8442d61 Refactor harris corner detection, so it returns harris response image 2012-12-09 17:34:10 +01:00
Johannes Schönberger 8c4ba00b12 Move harris file to a combined interest point file 2012-12-09 17:34:10 +01:00
Johannes Schönberger fbf51a9508 Fix dependency check in setup
Previous version failed when there were characters other than digits or dots.
2012-12-09 16:33:17 +01:00
Anders Boesen Lindbo Larsen e5fb8a2a72 Better Sphinx documentation. 2012-12-09 12:53:52 +01:00
Stefan van der Walt 95f7177708 Merge pull request #376 from JDWarner/unify_peak_finder_backend
ENH: Unify peak finder backend.
2012-12-08 20:36:18 -08:00
Josh Warner (Mac) 5cba69a4fa test: add additional tests for 100% coverage of new peak_local_max
Also fix minor bug in label reordering.
2012-12-08 21:12:26 -06:00
Anders Boesen Lindbo Larsen 979a15cd9a PEP8 style corrections. 2012-12-08 22:37:36 +01:00
Steven Silvester 71f505f71c Used the new function names in example and test. 2012-12-08 15:03:11 -06:00
Steven Silvester e91129de53 Renamed functions to equalize_hist/adapthist, with a deprecation warning for equalize 2012-12-08 14:53:34 -06:00
Steven Silvester 9ff0eef53d Merge branch 'adapthist' of github.com:blink1073/scikits-image into adapthist
* 'adapthist' of github.com:blink1073/scikits-image:
  Cleaned up adapthist func to use LAB for all RGB->required rest result change
  Removed sys.path hack in test, fixed spelling of import in __init__.py
  Translated clahe C code to python, added to list of contributors.
  Passed all tests with full coverage, PEP8 and Pylint performed.
  Improved support for color images using lab transform.
  Replaced generic ACM license with the Graphics Gems IV license.
  Pep8 fixes.
  Added Notes to the docstring.
  Tests pass and example works on build.
  Initial commit of adapthist modifications.

Conflicts:
	CONTRIBUTORS.txt
	doc/examples/plot_equalize.py
	skimage/exposure/_adapthist.py
	skimage/exposure/tests/test_exposure.py
	skimage/setup.py
2012-12-08 14:47:18 -06:00
Steven Silvester 08ef1e9b75 Rebased to master, incorporated view_as_blocks, cleaned up interpolate method and example 2012-12-08 14:29:36 -06:00
Anders Boesen Lindbo Larsen 2eb03c0fc9 Add dense DAISY feature description. 2012-12-08 18:26:13 +01:00
Steven Silvester b8844beb79 Cleaned up adapthist func to use LAB for all RGB->required rest result change 2012-12-07 17:25:07 -06:00
Steven Silvester 7f86b0c400 Removed sys.path hack in test, fixed spelling of import in __init__.py 2012-12-07 17:25:06 -06:00
Steven Silvester 94af01cdbd Translated clahe C code to python, added to list of contributors. 2012-12-07 17:25:04 -06:00
Steven Silvester 269929333b Passed all tests with full coverage, PEP8 and Pylint performed. 2012-12-07 17:23:40 -06:00
Steven Silvester c7c4db6e3c Improved support for color images using lab transform. 2012-12-07 17:22:41 -06:00
Steven Silvester 20f4cee5da Replaced generic ACM license with the Graphics Gems IV license. 2012-12-07 17:22:41 -06:00
Steven Silvester 715271bde9 Pep8 fixes. 2012-12-07 17:22:41 -06:00
Steven Silvester ea850757c8 Added Notes to the docstring. 2012-12-07 17:22:41 -06:00
Steven Silvester 9eeb990898 Tests pass and example works on build. 2012-12-07 17:22:40 -06:00
Steven Silvester c6d0acfdab Initial commit of adapthist modifications. 2012-12-07 17:22:33 -06:00
Josh Warner (Mac) 4f68f1cd36 doc: fix and clarify peak_local_max docstring 2012-12-03 20:23:01 -06:00
Johannes Schönberger 50c0399aa7 Merge pull request #379 from cpsaltis/fix_rotate
Fix resize argument handling in rotate.
2012-12-03 14:48:52 -08:00
Tony S Yu 55b4a1e70e Merge pull request #383 from stefanv/windowserror
BUG: WindowsError not defined under Linux.
2012-12-03 10:01:08 -08:00
Stefan van der Walt 68c2ab205e BUG: WindowsError not defined under Linux. 2012-12-03 08:49:35 -08:00
Tony S Yu 099b94efa1 Merge pull request #375 from ahojnnes/hough-peak-example
Add example for hough_peaks function
2012-12-03 06:35:47 -08:00
Christos Psaltis 298abe1ac0 Add test for resize option in rotate 2012-12-03 15:54:26 +02:00
Johannes Schönberger 49e06c9755 Add title to hough peak detection example plot 2012-12-03 14:37:26 +01:00
Johannes Schönberger 989d1de598 Merge pull request #380 from tonysyu/mark-boundaries-regression
Make black the default boundary color for mark_boundaries.
2012-12-02 23:20:01 -08:00
Sergey Karayev 6953785eab added rgb2lab test 2012-12-02 22:51:16 -08:00
Tony S Yu bf28a38f6e ENH: Make black the default boundary color for mark_boundaries.
This improves visibility in light-colored image regions. Note also that the new behavior matches the behavior from the 0.7 release.
2012-12-02 16:02:27 -05:00
Steven Silvester 2e1729a9fb Cleaned up adapthist func to use LAB for all RGB->required rest result change 2012-12-01 23:46:52 -06:00
Sergey Karayev afd1eed22f Merge pull request #1 from amueller/xyz_fix
FIX quickshift nosetest with different xyz color conversion
2012-12-01 15:20:21 -08:00
Christos Psaltis 22f94d8707 Fix resize argument handling in rotate.
It used to have exactly the opposite effect that it supposed to.
2012-12-01 12:30:40 +02:00
Andreas Mueller b5d1e9f209 FIX quickshift nosetest with different xyz color conversion 2012-11-30 15:36:01 +01:00
Sergey Karayev 43eb33d26b flake8 on colorconv.py and removed unneeded .copy() 2012-11-30 01:30:59 -08:00
Juan Nunez-Iglesias c5e047ff0e Add join_segmentations example to the gallery 2012-11-30 15:25:00 +11:00
Sergey Karayev 5108d8c346 Fixed RGB<->XYZ conversion.
Now correctly follows the algorithm from EasyRGB.
Also fixed a XYZ<->Lab conversion issue by adding
a .copy().
2012-11-29 12:06:01 -08:00
Juan Nunez-Iglesias b906082034 Add testing functions for join and relabel 2012-11-28 12:48:13 +11:00
Juan Nunez-Iglesias dc377970f5 Add functions to join and relabel segmentations
The join of two segmentations is the segmentation in which two voxels
are in the same segment if and only if they are in the same segment in
both input segmentations.
2012-11-28 12:22:14 +11:00
Josh Warner (Mac) 98ce475113 style: initialize out at beginning of function
* remove API compatibility comment
* remove unnecessary `del maskim`
2012-11-25 23:09:06 -06:00
Josh Warner (Mac) 45a91aa9c5 doc: deprecated string and docstring formatting fixes in is_local_maximum 2012-11-25 22:56:45 -06:00
Josh Warner (Mac) d2262227d9 BUG - rank_order now imported.
Also changed (peak.py):
  * Standardized documentation as requested.
  * Removed `threshold` as an optional kwarg.
  * Removed extra line break incorrect by PEP8 standards.

Also changed (watershed.py):
  * Added @deprecated decorator and import statement
2012-11-24 17:24:14 -06:00
Stefan van der Walt a77923fe4c Merge pull request #373 from luispedro/imread_io_plugin
ENH: Add imread io plugin.
2012-11-24 11:07:52 -08:00
Luis Pedro Coelho 38f699471e TST Remove unneeded test
Per stefanv's comment on github, this was testing functionality higher
up in skimage.io
2012-11-24 19:04:55 +00:00
Luis Pedro Coelho 1f84c5e35f DOC Add myself to CONTRIBUTORS.txt 2012-11-24 19:04:43 +00:00
Luis Pedro Coelho 10ce9b89ab RFCT Use skimage.utils.convert for type conversion 2012-11-24 19:04:16 +00:00
Luis Pedro Coelho 6ebc43bad8 ENH Add imread io plugin
This relies on imread (https://github.com/luispedro/imread) which
supports a few microscopy formats otherwise hard to read (LSM and
MetaMorph STK) as well as basic ones.
2012-11-24 19:04:01 +00:00
Josh Warner (Mac) e7288f9140 BUG - Dtype conversion to Boolean in a new code path not included in current tests. 2012-11-20 01:17:42 -06:00