Johannes Schönberger
cc33e53531
Use xvfb rather than xorg
2013-11-03 15:36:47 +01:00
Johannes Schönberger
0f303a2f08
Install Cython via pip
2013-11-03 12:24:05 +01:00
Johannes Schönberger
7bf858c8d1
Install xserver
2013-11-03 12:19:49 +01:00
Johannes Schönberger
bf82a0a9d6
Fix PyQt4 for python 3
2013-11-03 11:53:13 +01:00
Johannes Schönberger
757c081d57
Install Cython from apt
2013-11-03 11:50:18 +01:00
Johannes Schönberger
31b52e9005
Install PyQt4 for doctests
2013-11-03 11:44:25 +01:00
Johannes Schönberger
326557e8aa
Remove unnecessary coverage directive
2013-11-03 11:26:12 +01:00
Johannes Schönberger
80ec4fc183
Install nose from PyPI
2013-11-03 10:37:43 +01:00
Johannes Schönberger
d726a5451c
Fix precision of output in hough_line_peaks doctest
2013-11-03 10:33:20 +01:00
Johannes Schönberger
411de753bd
Remove plotter from doctest and use comparison to np.histogram instead
2013-11-03 10:30:31 +01:00
Johannes Schönberger
256a0bad07
Fix montage2d doctest
2013-11-03 09:55:06 +01:00
Johannes Schönberger
45eae57b4c
Use NORMALIZE_WHITESPACE directive for block_reduce doctest
2013-11-03 09:49:48 +01:00
Johannes Schönberger
41d12463fd
Fix RANSAC doctest
2013-11-03 09:45:33 +01:00
Johannes Schönberger
c7378614d9
Fix block_reduce doctest
2013-11-03 09:40:39 +01:00
Johannes Schönberger
87dcaa4829
Fix hough_line_peaks doctest
2013-11-03 09:36:25 +01:00
Johannes Schönberger
facc8f5c71
Fix watershed doctest
2013-11-03 09:31:54 +01:00
Johannes Schönberger
c7fbd3282b
Fix doctest of remove_small_objects
2013-11-03 09:28:46 +01:00
Johannes Schönberger
dc35d3d1af
Add example for corner_subpix function
2013-11-03 09:23:35 +01:00
Johannes Schönberger
40fc5d203f
Fix corner_subpix function for corners near border
2013-11-03 09:16:45 +01:00
Johannes Schönberger
610f5898af
Fix corner doc tests
2013-11-03 08:51:51 +01:00
Johannes Schönberger
313c444abf
Let travis run doctests
2013-11-03 08:46:33 +01:00
Johannes Schönberger
f4b211fad0
Add make instruction for doctest
2013-11-03 08:46:03 +01:00
Johannes Schönberger
a4720212bb
Merge pull request #801 from stefanv/six_external
...
Make six an external dependency.
2013-11-01 00:00:30 -07:00
Juan Nunez-Iglesias
4e05ebf711
Incorporate @tonysyu's suggestions re:docstrings
2013-11-01 15:10:30 +11:00
Stefan van der Walt
bc3b229ddc
Update pip requirements.
2013-11-01 04:45:16 +02:00
Stefan van der Walt
b03bac033b
Merge pull request #809 from ahojnnes/rank-setup
...
Fix rank filter tests
2013-10-31 10:24:21 -07:00
Juan Nunez-Iglesias
fae2456b49
Allow OverlayPlugin to return the current overlay
2013-10-31 14:52:01 +11:00
Juan Nunez-Iglesias
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
Johannes Schönberger
22273a5160
Fix 16bit rank filter test in python 3.x
2013-10-30 23:07:23 +01:00
Johannes Schönberger
8e695f8734
Add rank filter tests as data dir
2013-10-30 22:41:20 +01:00
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
Tony S Yu
5aec00731a
Fix ColorHistogram to work with Open File
2013-10-28 22:55:07 -05: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
Matthew Trentacoste
133a698339
Merge pull request #1 from stefanv/luv-colorspace
...
Format color conversion docstrings.
2013-10-27 21:26:02 -07:00
Stefan van der Walt
3dd1bc1794
Format color conversion docstrings.
2013-10-27 22:06:16 +02:00
Stefan van der Walt
9c20b1e5ab
Install six from PyPi. Travis version is too old.
2013-10-27 21:28:03 +02:00
Stefan van der Walt
6df21002cd
Add python-six as Travis dependency.
2013-10-27 21:11:52 +02:00
Stefan van der Walt
eb6867cfe2
Make six an external dependency.
2013-10-27 14:06:26 +02: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
Matthew Trentacoste
888ef05b63
Adding note for Luv colorspace to top docstring
2013-10-23 22:23:26 -07:00
Matthew Trentacoste
c05d18a010
docstring changes to correctly format input/output, clarifying XYZ and reference white
2013-10-23 22:21:15 -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
Matthew Trentacoste
44580817fc
Cleaning up docstrings
2013-10-23 12:42:40 -07:00
Matthew Trentacoste
df6a112bc5
flake8-compliant formatting
2013-10-23 00:07:00 -07:00