5a89ef61a6
DOC: Replace use of gen_rst with plot2rst extension.
2012-05-15 00:52:30 -04:00
01d86e3317
DOC: Remove Sphinx extension for inheritence trees.
2012-05-09 18:56:46 -04:00
fc676d6ae0
BUG: Correctly import _feature in Python 3.
2012-05-09 15:42:04 -07:00
7326b1949f
BUG: fix test images (float images between 0 and 1).
2012-05-09 18:35:38 -04:00
d19d45850f
BUG: Fix internal import in template matching.
2012-05-09 12:53:29 -07:00
d5eac3b4e5
Merge pull request #100 from tonysyu/skimage-template
...
ENH: Add template matching.
2012-05-09 12:50:19 -07:00
8a31b76ba8
Add contribution note.
2012-05-08 21:35:03 -04:00
3c3c95b406
DOC: Replace template example with alternate example.
...
And remove other alternate example.
2012-05-08 21:32:09 -04:00
f3e91020f0
Add new example plot for match_template.
2012-05-08 21:32:09 -04:00
8dbf6f4c58
Fix shape unpacking ((height, width), not (w, h)).
2012-05-08 21:32:09 -04:00
4c3f8a36ba
Fix template example.
2012-05-08 21:32:09 -04:00
06bd3ebd6f
Add doctest example to match_template.
2012-05-08 21:32:09 -04:00
a2f91585ef
Add test for pad_input = True.
2012-05-08 21:32:08 -04:00
193d5abd3c
Rename pad_output parameter to pad_input.
2012-05-08 21:32:08 -04:00
383ca6220a
Set match_template to default to no padding and fix test.
2012-05-08 21:32:08 -04:00
ad99285bc0
Prevent match_template from returning NaNs.
2012-05-08 21:32:08 -04:00
0c1e3541b3
Check that image is larger than template.
2012-05-08 21:32:08 -04:00
5e49eb4fb6
Add alternate example for match_template.
2012-05-08 21:32:08 -04:00
b2006da346
Change flipud/fliplr to array indexing.
2012-05-08 21:32:08 -04:00
43ed4b9fb7
Pad input image instead of output.
2012-05-08 21:32:08 -04:00
5d79537566
Fix convolution input to get correlation results.
2012-05-08 21:32:07 -04:00
7caf85a5c1
Renaming for clarity.
2012-05-08 21:32:07 -04:00
f21f032bfe
Add normalization test and remove unnecessary clipping.
2012-05-08 21:32:07 -04:00
94262bc8d6
Tweak example to reduce confusion.
...
Set background 1 so that the template has values equally-above and -below the mean image value. This change makes the template results left-right symmetric, which may reduce confusion.
2012-05-08 21:32:07 -04:00
5682d27eb0
Rewrite normalization algorithm.
...
This is a major revision that removes the `method` parameter of `match_template` and uses a new normalization method.
Note that the example result is different with this new normalization.
2012-05-08 21:32:07 -04:00
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
Tony S Yu