Commit Graph

1442 Commits

Author SHA1 Message Date
Johannes Schönberger c414d8df07 update contribution for regionprops 2012-05-22 23:28:13 +02:00
Johannes Schönberger 06759d2bdf make all test cases of regionprops work 2012-05-22 23:28:13 +02:00
Johannes Schönberger b04138c39c parameters of ellipse match Matlab results 2012-05-22 23:28:13 +02:00
Johannes Schönberger 8ec52869c7 fix wrong indentation 2012-05-22 23:28:13 +02:00
Johannes Schönberger 87ddbbeabe more constistent way of determining ellipse parameters 2012-05-22 23:28:13 +02:00
Johannes Schönberger 04e444d90f added test cases for regionprops 2012-05-22 23:28:13 +02:00
Johannes Schönberger 19614cc8d7 euler number now behaves like MATLAB implementation 2012-05-22 23:28:13 +02:00
Johannes Schönberger 4eb3028a64 fixed typo and improved example in doc string 2012-05-22 23:28:13 +02:00
Johannes Schönberger 1b2bed7501 renamed regionprops source files for better separation between function name and source file 2012-05-22 23:28:12 +02:00
Johannes Schönberger e993124329 most functionality of regionprops now pure python except for moments 2012-05-22 23:28:12 +02:00
Johannes Schönberger 0027b91e84 added test: labelled image must be of integer type 2012-05-22 23:28:12 +02:00
Johannes Schönberger 6b0c0e1948 changed reference notes in doc string 2012-05-22 23:28:12 +02:00
Johannes Schönberger 658dbec381 removed old description of moments in doc string 2012-05-22 23:28:12 +02:00
Johannes Schönberger e845dc7746 moments and central moments no longer use separate functions 2012-05-22 23:28:12 +02:00
Johannes Schönberger cb673ba516 extended and improved description of properties in doc string 2012-05-22 23:28:12 +02:00
Johannes Schönberger 6905603b98 adapted to PEP8 whitespace conventions 2012-05-22 23:28:12 +02:00
Johannes Schönberger 8c1acfb7f5 added regionprops function 2012-05-22 23:28:12 +02:00
Stefan van der Walt 582aa193c5 Merge pull request #192 from tangofoxtrotmike/master
BUG: feature.hog() fails on non-square images.
2012-05-22 10:54:35 -07:00
tangofoxtrotmike 4d999c313f feature.hog(): use y,x coords consistently, now works on non-square images 2012-05-22 17:35:11 +10:00
Stefan van der Walt 8f43ee7739 BUG: Catch all exceptions, including NotImplementedError, when checking for number of CPUs in multi-processing. 2012-05-21 19:20:20 -07:00
Stefan van der Walt 34505fef46 BUG: Fix FreeImage Py3k compatibility [patch by Almar Klein]. 2012-05-21 18:24:32 -07:00
Stefan van der Walt 4f0a2c74cc Merge pull request #191 from cgohlke/patch-1
ENH: Add new 64-bit metadata types to the FreeImage plugin.
2012-05-21 18:01:12 -07:00
cgohlke 4e87a1dfce Add new 64-bit metadata types to METADATA_DATATYPE (new in FreeImage 3.15.3) 2012-05-19 13:23:32 -07:00
Stefan van der Walt 3917fbb60c Merge pull request #189 from tonysyu/fix-stack-copy
BUG: Revert stackcopy; fixes (M, N, 1) case.
2012-05-16 10:53:18 -07:00
Tony S Yu 048c6c06eb BUG: Fix stackcopy for grayscale image. 2012-05-15 15:56:26 -04:00
Tony S Yu 01d86e3317 DOC: Remove Sphinx extension for inheritence trees. 2012-05-09 18:56:46 -04:00
Stefan van der Walt fc676d6ae0 BUG: Correctly import _feature in Python 3. 2012-05-09 15:42:04 -07:00
Tony S Yu 7326b1949f BUG: fix test images (float images between 0 and 1). 2012-05-09 18:35:38 -04:00
Stefan van der Walt d19d45850f BUG: Fix internal import in template matching. 2012-05-09 12:53:29 -07:00
Stefan van der Walt d5eac3b4e5 Merge pull request #100 from tonysyu/skimage-template
ENH: Add template matching.
2012-05-09 12:50:19 -07:00
Tony S Yu 8a31b76ba8 Add contribution note. 2012-05-08 21:35:03 -04:00
Tony S Yu 3c3c95b406 DOC: Replace template example with alternate example.
And remove other alternate example.
2012-05-08 21:32:09 -04:00
Tony S Yu f3e91020f0 Add new example plot for match_template. 2012-05-08 21:32:09 -04:00
Tony S Yu 8dbf6f4c58 Fix shape unpacking ((height, width), not (w, h)). 2012-05-08 21:32:09 -04:00
Tony S Yu 4c3f8a36ba Fix template example. 2012-05-08 21:32:09 -04:00
Tony S Yu 06bd3ebd6f Add doctest example to match_template. 2012-05-08 21:32:09 -04:00
Tony S Yu a2f91585ef Add test for pad_input = True. 2012-05-08 21:32:08 -04:00
Tony S Yu 193d5abd3c Rename pad_output parameter to pad_input. 2012-05-08 21:32:08 -04:00
Tony S Yu 383ca6220a Set match_template to default to no padding and fix test. 2012-05-08 21:32:08 -04:00
Tony S Yu ad99285bc0 Prevent match_template from returning NaNs. 2012-05-08 21:32:08 -04:00
Tony S Yu 0c1e3541b3 Check that image is larger than template. 2012-05-08 21:32:08 -04:00
Tony S Yu 5e49eb4fb6 Add alternate example for match_template. 2012-05-08 21:32:08 -04:00
Tony S Yu b2006da346 Change flipud/fliplr to array indexing. 2012-05-08 21:32:08 -04:00
Tony S Yu 43ed4b9fb7 Pad input image instead of output. 2012-05-08 21:32:08 -04:00
Tony S Yu 5d79537566 Fix convolution input to get correlation results. 2012-05-08 21:32:07 -04:00
Tony S Yu 7caf85a5c1 Renaming for clarity. 2012-05-08 21:32:07 -04:00
Tony S Yu f21f032bfe Add normalization test and remove unnecessary clipping. 2012-05-08 21:32:07 -04:00
Tony S Yu 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
Tony S Yu 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
Tony S Yu 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