Michael Hansen
f11ef60c35
Fixed import of urlparse and rebase on upstream
2013-10-29 09:43:52 -04:00
Michael Hansen
7d4544f203
Merge branch 'master' of https://github.com/scikit-image/scikit-image
2013-10-29 09:43:22 -04:00
Johannes Schönberger
cfeb040126
Merge pull request #807 from josteinbf/regionprops-label-sequence
...
Bug: Fix label sequence in regionprops.
2013-10-29 05:17:22 -07:00
Jostein Bø Fløystad
eff276c99b
Bug: Fix label sequence in regionprops.
...
Closes gh-806.
2013-10-29 11:58:59 +01:00
Tony S Yu
3ac124b277
Merge pull request #802 from jni/allow-rgb-save
...
Modify mpl_image_to_rgba to allow RGB input image
2013-10-28 21:49:45 -07:00
Michael Hansen
522778b214
Trying to get imports working with both Python 2 and 3
2013-10-28 10:29:20 -04:00
Juan Nunez-Iglesias
e45aee3369
Modify mpl_image_to_rgba to allow RGB input image
...
mpl_image_to_rgba produces a image of shape (M, N, 3, 4) when the input
image is already RGB. This is understandably confusing for downstream
processes, and this commit fixes it.
2013-10-28 18:29:46 +11:00
Stefan van der Walt
d5776656a8
Merge pull request #796 from ahojnnes/warp-fix
...
Fix bug in homography detection
2013-10-25 01:40:41 -07:00
Michael Hansen
1d6531aa04
Fixed Python 3 import errors, added alpha and rgba properties
2013-10-23 16:28:41 -04:00
Michael Hansen
9d91751ed9
Switching to RGBA
2013-10-23 15:44:50 -04:00
Michael Hansen
f5c68531ab
Novice module can open images from a url
2013-10-22 13:07:16 -04:00
Johannes Schönberger
36cfd6d17c
Merge pull request #600 from tonysyu/novice-package
...
Novice module
2013-10-22 04:05:38 -07:00
Tony S Yu
e794aed012
Add support for non-unit step
2013-10-21 23:02:51 -05:00
Tony S Yu
6ce788a5d3
Add support for negative indexes/slices.
2013-10-21 23:02:51 -05:00
Tony S Yu
8f506be2ea
Fix Py3 range incompatibilities
2013-10-21 23:02:51 -05:00
Tony S Yu
20ad4bbca9
Fix the same Py3 incompatibility in a different place
2013-10-21 23:02:51 -05:00
Tony S Yu
5a7e191f7b
Fix Python 3 incompatibility
2013-10-21 23:02:51 -05:00
Tony S Yu
0b2103b72c
Remove extra newline
2013-10-21 23:02:51 -05:00
Tony S Yu
555d245a2f
Fix display in IPython notebook
2013-10-21 23:02:50 -05:00
Tony S Yu
4682f44d42
Ensure that image shows when not run interactively
2013-10-21 23:02:50 -05:00
Tony S Yu
7ba0540ec3
Simplify docstrings
2013-10-21 23:02:50 -05:00
Tony S Yu
1093139d62
Rename image for clarity.
2013-10-21 23:02:50 -05:00
Tony S Yu
3c33965b99
Add docstring for arrays
2013-10-21 23:02:50 -05:00
Tony S Yu
68c188050b
Remove old image reference
2013-10-21 23:02:50 -05:00
Tony S Yu
6ca30b0897
Speed up doctest
2013-10-21 23:02:50 -05:00
Tony S Yu
be1d81f3fc
Simplify interface
2013-10-21 23:02:49 -05:00
Tony S Yu
d177aa6c16
Replace use of elephant pic with Chelsea the cat
2013-10-21 23:02:49 -05:00
Tony S Yu
51c3d23b2e
Fix doctests and cleanup reprs
2013-10-21 23:02:49 -05:00
Tony S Yu
f1e0197753
Remove PixelGroup and just return a Picture
2013-10-21 23:02:49 -05:00
Tony S Yu
59375f2240
Rename for clarity
2013-10-21 23:02:49 -05:00
Tony S Yu
35a9cd4067
Fix setter for xy_array and reuse.
2013-10-21 23:02:49 -05:00
Tony S Yu
19a9e72ec7
Remove PixelGroup dependence on pic and key attrs
2013-10-21 23:02:49 -05:00
Tony S Yu
cedfa8c7d4
Make xy_array public
2013-10-21 23:02:49 -05:00
Tony S Yu
a5ad214c4b
Move key validation for clarity
2013-10-21 23:02:48 -05:00
Tony S Yu
12e2a2543e
Move methods from PixelGroup to Picture parent class
2013-10-21 23:02:48 -05:00
Tony S Yu
b50d46b333
Change PixelGroup to inherit from Picture
2013-10-21 23:02:48 -05:00
Tony S Yu
e83003c45d
Simplify indexing
2013-10-21 23:02:48 -05:00
Tony S Yu
72c1f6855a
Rename for clarity
2013-10-21 23:02:48 -05:00
Tony S Yu
7999e3f95e
Refactor and add error tests
2013-10-21 23:02:48 -05:00
Tony S Yu
450d04d2b3
Simplify private docstrings
2013-10-21 23:02:48 -05:00
Tony S Yu
b8443bd1e2
Remove unnecessary try-except.
2013-10-21 23:02:47 -05:00
Tony S Yu
7c1de57928
Simplify data access and add tests
2013-10-21 23:02:47 -05:00
Tony S Yu
a951232702
Remove from_path and from_array methods
...
Having these methods and the constructor arguments is a bit redundant.
2013-10-21 23:02:47 -05:00
Tony S Yu
8869724b51
Remove color and size from Picture.__init__
...
Also rename `from_color` to `from_size`.
2013-10-21 23:02:47 -05:00
Tony S Yu
3619e6f2f2
Rename image to array
2013-10-21 23:02:47 -05:00
Tony S Yu
c5bfed26cd
Fix validation bug and add test
2013-10-21 23:02:47 -05:00
Tony S Yu
9385e73586
Clean up testing
2013-10-21 23:02:47 -05:00
Tony S Yu
f47c5a7be7
Switch argument order for clarity
2013-10-21 23:02:47 -05:00
Tony S Yu
087d422ebc
Rename novice package as per convention
2013-10-21 23:02:46 -05:00
Tony S Yu
266c28ba6b
Reuse colors from skimage.color.
...
This change greatly reduces the number of available colors, which is probably
a good thing.
2013-10-21 23:02:46 -05:00
Michael Hansen