f4b211fad0
Add make instruction for doctest
2013-11-03 08:46:03 +01:00
a4720212bb
Merge pull request #801 from stefanv/six_external
...
Make six an external dependency.
2013-11-01 00:00:30 -07:00
4e05ebf711
Incorporate @tonysyu's suggestions re:docstrings
2013-11-01 15:10:30 +11:00
bc3b229ddc
Update pip requirements.
2013-11-01 04:45:16 +02:00
b03bac033b
Merge pull request #809 from ahojnnes/rank-setup
...
Fix rank filter tests
2013-10-31 10:24:21 -07:00
fae2456b49
Allow OverlayPlugin to return the current overlay
2013-10-31 14:52:01 +11:00
7774a76eea
Add plugin return values for ImageViewer
...
The model supported is that plugins can return an overlay, some data,
or both. Each plugin therefore returns an `(overlay, data)` tuple in
which each element can be `None`.
To allow return values, the plugin need only override the `output`
method defined in the base Plugin class.
See discussions here:
https://groups.google.com/d/msg/scikit-image/0nkJM-WguXA/iqogBABa748J
and here:
https://github.com/scikit-image/scikit-image/pull/805
2013-10-31 14:51:06 +11:00
22273a5160
Fix 16bit rank filter test in python 3.x
2013-10-30 23:07:23 +01:00
8e695f8734
Add rank filter tests as data dir
2013-10-30 22:41:20 +01:00
f11ef60c35
Fixed import of urlparse and rebase on upstream
2013-10-29 09:43:52 -04:00
7d4544f203
Merge branch 'master' of https://github.com/scikit-image/scikit-image
2013-10-29 09:43:22 -04:00
cfeb040126
Merge pull request #807 from josteinbf/regionprops-label-sequence
...
Bug: Fix label sequence in regionprops.
2013-10-29 05:17:22 -07:00
eff276c99b
Bug: Fix label sequence in regionprops.
...
Closes gh-806.
2013-10-29 11:58:59 +01:00
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
5aec00731a
Fix ColorHistogram to work with Open File
2013-10-28 22:55:07 -05:00
522778b214
Trying to get imports working with both Python 2 and 3
2013-10-28 10:29:20 -04:00
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
133a698339
Merge pull request #1 from stefanv/luv-colorspace
...
Format color conversion docstrings.
2013-10-27 21:26:02 -07:00
3dd1bc1794
Format color conversion docstrings.
2013-10-27 22:06:16 +02:00
9c20b1e5ab
Install six from PyPi. Travis version is too old.
2013-10-27 21:28:03 +02:00
6df21002cd
Add python-six as Travis dependency.
2013-10-27 21:11:52 +02:00
eb6867cfe2
Make six an external dependency.
2013-10-27 14:06:26 +02:00
d5776656a8
Merge pull request #796 from ahojnnes/warp-fix
...
Fix bug in homography detection
2013-10-25 01:40:41 -07:00
888ef05b63
Adding note for Luv colorspace to top docstring
2013-10-23 22:23:26 -07:00
c05d18a010
docstring changes to correctly format input/output, clarifying XYZ and reference white
2013-10-23 22:21:15 -07:00
1d6531aa04
Fixed Python 3 import errors, added alpha and rgba properties
2013-10-23 16:28:41 -04:00
9d91751ed9
Switching to RGBA
2013-10-23 15:44:50 -04:00
44580817fc
Cleaning up docstrings
2013-10-23 12:42:40 -07:00
df6a112bc5
flake8-compliant formatting
2013-10-23 00:07:00 -07:00
9d9d16d2a4
renaming machineEps to eps to match convention
2013-10-22 23:52:12 -07:00
36e56e2639
Removing unneeded division checking code
2013-10-22 23:33:38 -07:00
57eb69465c
Adding references regarding Lab and Luv spaces to docstring
2013-10-22 23:29:51 -07:00
8093999731
Luv colorspace conversions
...
Adding XYZ <--> Luv, RGB <-->
Adding test functions to mirror Lab tests
2013-10-22 23:26:49 -07:00
f5c68531ab
Novice module can open images from a url
2013-10-22 13:07:16 -04:00
36cfd6d17c
Merge pull request #600 from tonysyu/novice-package
...
Novice module
2013-10-22 04:05:38 -07:00
e794aed012
Add support for non-unit step
2013-10-21 23:02:51 -05:00
6ce788a5d3
Add support for negative indexes/slices.
2013-10-21 23:02:51 -05:00
8f506be2ea
Fix Py3 range incompatibilities
2013-10-21 23:02:51 -05:00
20ad4bbca9
Fix the same Py3 incompatibility in a different place
2013-10-21 23:02:51 -05:00
5a7e191f7b
Fix Python 3 incompatibility
2013-10-21 23:02:51 -05:00
0b2103b72c
Remove extra newline
2013-10-21 23:02:51 -05:00
555d245a2f
Fix display in IPython notebook
2013-10-21 23:02:50 -05:00
4682f44d42
Ensure that image shows when not run interactively
2013-10-21 23:02:50 -05:00
7ba0540ec3
Simplify docstrings
2013-10-21 23:02:50 -05:00
1093139d62
Rename image for clarity.
2013-10-21 23:02:50 -05:00
3c33965b99
Add docstring for arrays
2013-10-21 23:02:50 -05:00
68c188050b
Remove old image reference
2013-10-21 23:02:50 -05:00
6ca30b0897
Speed up doctest
2013-10-21 23:02:50 -05:00
be1d81f3fc
Simplify interface
2013-10-21 23:02:49 -05:00
d177aa6c16
Replace use of elephant pic with Chelsea the cat
2013-10-21 23:02:49 -05:00
Johannes Schönberger