753e999a7a
Minor cleanup
...
* Rename some variables.
* Delete some old comments.
* Move some variable initializations to the top of the function.
2012-05-08 21:32:07 -04:00
883dd24cdb
Fix bug when indexing into summed-area table.
2012-05-08 21:32:07 -04:00
2e8fcef89b
Simply equation in docstring of match_docstring.
2012-05-08 21:32:06 -04:00
a87bcb2d73
DOC: demonstrate where the template is matched in an image.
2012-05-08 21:32:06 -04:00
cbdea0d36e
Add pad_output argmument to match_template.
2012-05-08 21:32:06 -04:00
3c7ae849b9
Remove unnecessary truncation at boundary.
2012-05-08 21:32:06 -04:00
545bdab985
Refactor template matching.
...
* Change Cython function to take names of correlation method instead of numbers representing the methods.
* Use alternate formula for `template_norm` of 'norm-corr' method, but note that both formulas need to be checked for correctness.
* Add note that `match_template` output has a different shape than the input image. This needs to be fixed before merging.
* Change 'Sigma' to 'Sum' in docstring to avoid confusion with standard deviation.
* Other minor changes for readability.
2012-05-08 21:32:06 -04:00
8c816109c9
Remove OpenCV version of match_template
2012-05-08 21:32:06 -04:00
425a4ea707
Use feature.peak_local_max instead of custom peak detection.
2012-05-08 21:32:06 -04:00
9d3072d3f8
Fix type errors in match_template by casting inputs to float32.
2012-05-08 21:32:06 -04:00
2a00e24b12
Change _template.match_template variables to float.
...
Template and image in test are converted to float32 before passing to `match_template`. This change is temporary: `match_template` should convert these variables internally.
2012-05-08 21:32:06 -04:00
e8461e22dd
Move template matching to feature subpackage
2012-05-08 21:32:05 -04:00
01d66fc501
Reorganize example so that all plotting code is at the end
2012-05-08 21:28:50 -04:00
e6098e140b
Replace assert statement with plot to show matches
2012-05-08 21:28:50 -04:00
12b39dae5c
Fix assert failure in example
2012-05-08 21:28:50 -04:00
acc35c843b
Add comment about code duplication.
2012-05-08 21:28:50 -04:00
6272c312c4
Simplify _template.pyx using integral_image from transform subpackage.
...
Remove `integral_images` and `integral_image_sqr` from _template.pyx in favor of calls to `skimage.transform.integral_image`.
This change required `match_template` arguments ("image" and "template") to be changed from float to double.
After this change, the template test runs about 25% slower.
2012-05-08 21:28:50 -04:00
2b368aecb1
Remove unused integral_image function in _template.pyx
2012-05-08 21:28:50 -04:00
56611198e4
PEP8: add spacing around operators
2012-05-08 21:28:50 -04:00
4ab4213749
Change OpenCV import to make it an optional dependency
2012-05-08 21:28:50 -04:00
d43049da71
Wrap long lines
2012-05-08 21:28:49 -04:00
49349a07c6
Fix copy-paste bug
2012-05-08 21:28:49 -04:00
19f1021f60
Clean up docstrings
2012-05-08 21:28:49 -04:00
ae85fa8b15
Wrap long lines
2012-05-08 21:28:49 -04:00
f8e0478542
Remove dependency on math module
2012-05-08 21:28:49 -04:00
b79a8dd437
Update setup file to new repo and fix typos
2012-05-08 21:28:49 -04:00
f6b279bff7
Fix whitespace
2012-05-08 21:28:49 -04:00
424a2b8e52
Remove unused imports
2012-05-08 21:28:49 -04:00
23311a0993
Convert template matching Pull Request to skimage
...
This commit takes the template matching implementation from holtzhau/template (Pull Request #13 ) and converts the code to use the new package name (scikits.image --> skimage).
2012-05-08 21:28:49 -04:00
085af1d9e5
Merge pull request #184 from stefanv/fast_coordinate_map
...
Implement fast image warping.
2012-05-08 18:03:07 -07:00
4524f994e8
ENH: Better formulation of _stackcopy.
2012-05-08 16:21:53 -07:00
4296597cdf
BUG: Temporary workaround for shape offset parameter in radon transform.
2012-05-08 15:43:09 -07:00
59b65fdada
Merge pull request #164 from cournape/bento_build
...
PKG: Add Bento support.
2012-05-08 12:32:54 -07:00
54dc1bb59c
STY: Minor cleanups.
2012-05-08 12:26:26 -07:00
feb3e920b1
TST: Increase radon transform threshold to make test more robust.
2012-05-07 14:14:31 -07:00
52f35313a7
BUG: Fix plugin import on systems without PIL or FreeImage.
2012-05-07 14:06:25 -07:00
9c13bab887
BUG: Ensure that the appropriate I/O plugin is used in the test suite.
2012-05-07 13:48:56 -07:00
f1ac4f9a09
STY: Move swirl to _warp_zoo so we can add more transforms later.
2012-05-04 12:19:15 -07:00
a5d8593408
STY: Cleanups after Tony's review.
2012-05-04 12:16:05 -07:00
a8e96f9b57
BUG: Fix Python 3 syntax error.
2012-05-03 18:13:55 -07:00
0cede58828
Merge pull request #182 from tonysyu/threshold-example
...
DOC: Add example for adaptive thresholding.
2012-05-03 15:30:25 -07:00
01c7d036aa
Merge pull request #186 from holtzhau/radon_fixes
...
BUG: Fixed padding in radon, iradon. Tests for small images.
2012-05-03 15:27:37 -07:00
03aa64da39
Merge pull request #187 from tonysyu/morph-cleanup
...
ENH: Grey morphology cleanup.
2012-05-03 15:15:38 -07:00
dc6c3d0222
Rename test module to match module.
2012-05-03 17:45:36 -04:00
9358d785c3
Add __all__ to grey module.
2012-05-03 17:44:08 -04:00
136a020088
Remove unused variable.
2012-05-03 17:42:39 -04:00
0edefedc50
Replace import * with import grey.
2012-05-03 17:35:11 -04:00
8fb597b141
Fix dtype compatibility for functions in morphology.grey
...
Cast input images using ``img_as_ubyte``. Note, tests don't currently pass for integer arrays (test skipped).
2012-05-03 16:22:00 -04:00
284753a7a4
Make test module runnable.
2012-05-03 16:21:59 -04:00
cfa9bbfc40
Rename greyscale morphology functions.
...
Remove "greyscale" prefix on functions in ``morphology.grey``. To avoid confusion (and name clashes), ``greyscale_open`` and ``greyscale_close`` were renamed ``opening`` and ``closing`` (instead of ``open`` and ``close``). As a bonus, these names match scipy.ndimage.
2012-05-03 16:21:59 -04:00
Tony S Yu