Commit Graph

5928 Commits

Author SHA1 Message Date
Neil Yager 3ddfdbdb9c Updates based on review comments 2011-10-17 08:32:19 +01:00
Andreas Mueller 6ac1927518 try to load only plugins that have both imread and imshow 2011-10-16 19:40:28 +02:00
Andreas Mueller d0041a8c74 [ENH] include matplotlib's imread 2011-10-16 19:40:25 +02:00
Andreas Mueller 9545f85f18 removed debugging code 2011-10-16 19:40:22 +02:00
Andreas Mueller 22a424bc50 this depends on the plugin used 2011-10-16 19:40:19 +02:00
Andreas Mueller d9a3a46fb2 gracefully ignore absent plugins 2011-10-16 19:40:11 +02:00
emmanuelle 0cfc440b5d Merge pull request #62 from tonysyu/fix_morph_symmetry
Fix morph symmetry
2011-10-16 05:46:47 -07:00
Tony S Yu 1cc0f36d15 Reformat doctests so that tests pass
I believe the dtype print out was changed to a string in a recent version of numpy, so this change may actually break the doctest for older versions.
2011-10-15 12:44:26 -04:00
Tony S Yu 9e81cecbb6 Specify that input arrays to grey morphology filters must be uint8 2011-10-15 12:40:06 -04:00
Tony S Yu c7c0798d1c Add examples to grey morphology docstrings 2011-10-15 12:37:25 -04:00
Tony S Yu 8735204565 Improve docstrings in grey morphology module 2011-10-15 11:57:01 -04:00
Tony S Yu 65b6b6bed7 Minor fix to docstring 2011-10-15 04:27:35 -04:00
Tony S Yu b0376721eb Replace flip parameter in erode/dilate with shift_x and shift_y
This change allows morphological open/close and white/black tophat to correctly use rectangular structuring element that has one even-numbered dimension. Note: dilate and erode functions flip the definitions of x/y and width/height, but it does so consistently so it doesn't really matter.
2011-10-15 04:23:37 -04:00
Tony S Yu 6366da861a Add tests for rectangular structuring elements
These tests fail.
2011-10-15 04:19:04 -04:00
Tony S Yu 9ce5ee7d71 Move test functions to test class 2011-10-15 03:59:41 -04:00
Tony S Yu ac2714d3c8 Fix morphological open/close for square structuring elements with even sides.
This also fixes rectangular selems with even sides, but not rectangular selems with one odd and one even side.
2011-10-15 03:34:30 -04:00
Tony S Yu fb92bfcf71 Add tests for correct behavior of square structuring elements 2011-10-15 03:32:59 -04:00
Tony S Yu 4f4f219788 Reuse open/close operations for white/black tophat 2011-10-15 03:01:27 -04:00
Tony S Yu b6e470dbd1 Remove unnecessary if-block.
This looks like it was a copy-paste error.
2011-10-15 02:57:32 -04:00
Tony S Yu 9adbca13e7 Add parameter to flip structuring element about its origin
This parameter only affects structuring elements (selem) with even-numbered sides, since an odd-numbered selem is centered about its origin. Note the selem isn't actually flipped, but shifted (i.e. I assume a selem that is symmetric in *shape*)
2011-10-14 11:00:10 -04:00
Neil Yager fb81057774 Added a new unit test 2011-10-14 12:53:06 +01:00
Neil Yager 3d2613cdfa Added unit tests to skeletonization 2011-10-13 14:35:37 +01:00
Neil Yager 8ad8946900 Added more objects to skeletonize demo 2011-10-13 09:51:27 +01:00
Neil Yager c120708feb Merge remote-tracking branch 'upstream/master' into neil_yager-skeletonize
* upstream/master:
  Remove print statements
  Remove print statements
  Update URL in package description
  Fix print statements missed by 2to3
  Fix: don't run all scikits tests when running scikits.image.test()
  DOC: Rewash the git docs.
  DOC: Use correct repo URL in gitwash.
  DOC: Add gitwash as a submodule.
  Remove empty gitwash directory in order to fix submodule.
  DOC: Update contributors.
  BUG: Fix scikits.image.test.
2011-10-13 08:29:58 +01:00
Neil Yager 74bde135c9 Added skeleonize example 2011-10-13 08:29:32 +01:00
Stefan van der Walt 8c16be159b Merge pull request #58 from cgohlke/patch-3
PKG: Update URL in package description.
2011-10-12 15:46:01 -07:00
Stefan van der Walt 57745f5e84 Merge pull request #59 from cgohlke/patch-2
Remove print statements from tests
2011-10-12 15:42:19 -07:00
cgohlke 8024cc9798 Remove print statements 2011-10-12 15:29:56 -07:00
cgohlke cc84603b1a Remove print statements 2011-10-12 15:25:41 -07:00
cgohlke b708d931c2 Update URL in package description 2011-10-12 15:01:31 -07:00
Stefan van der Walt 0c54aee1f8 Merge pull request #56 from cgohlke/patch-1
Fix: don't run all scikits tests when running scikits.image.test()
2011-10-12 14:15:28 -07:00
cgohlke a609bd6416 Fix print statements missed by 2to3 2011-10-12 14:09:29 -07:00
cgohlke 98290218f0 Fix: don't run all scikits tests when running scikits.image.test() 2011-10-12 14:06:09 -07:00
Stefan van der Walt b381d59c67 DOC: Rewash the git docs. 2011-10-12 13:45:56 -07:00
Stefan van der Walt 69a10b62c3 DOC: Use correct repo URL in gitwash. 2011-10-12 13:44:59 -07:00
Stefan van der Walt 603216e4a7 DOC: Add gitwash as a submodule. 2011-10-12 13:41:17 -07:00
Stefan van der Walt 05f780b887 Remove empty gitwash directory in order to fix submodule. 2011-10-12 13:39:18 -07:00
Stefan van der Walt 771c905227 DOC: Update contributors. 2011-10-12 13:24:35 -07:00
Stefan van der Walt 8ba2518333 BUG: Fix scikits.image.test. 2011-10-12 13:04:53 -07:00
Neil Yager 772c469ec1 Initial revision of skeletonization 2011-10-12 13:38:36 +01:00
Stefan van der Walt 677c768bb1 Remove OpenCV wrappers for 0.4 release. 2011-10-11 19:38:15 -07:00
Stefan van der Walt 38e50ba498 Merge npy -> npz transition. 2011-10-11 19:34:44 -07:00
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
Stefan van der Walt 1f101ceb6f Merge pull request #53 from cgohlke/patch-1
Fix ImportError on Python 3
2011-10-11 18:36:27 -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