Commit Graph

4298 Commits

Author SHA1 Message Date
Johannes Schönberger 5dcb2d9fcc Merge pull request #776 from tonysyu/update-api-doc
Add hough_circles change to API doc
2013-10-12 08:45:25 -07:00
Tony S Yu e7b36b56ee Add hough_circles change to API doc 2013-10-12 10:06:33 -05:00
Juan Nunez-Iglesias 78410e059c Merge pull request #769 from tonysyu/consistent-color-labels
Add support for consistent color labels for sparse labels.
Fix: input label array was being modified if it contained negative labels.
2013-10-11 17:44:01 -07:00
Juan Nunez-Iglesias 7400e34523 Merge pull request #774 from ahojnnes/shape-plot
Add anti-aliased circle and line to the shapes example.
2013-10-11 16:26:59 -07:00
Tony S Yu dec0c4a721 Merge pull request #6 from stefanv/tonysyu-consistent-color-labels
Test whether labels are left alone in label2rgb.
2013-10-11 14:22:06 -07:00
Johannes Schönberger 90d4fb2823 Improve shape plot 2013-10-11 19:24:52 +02:00
Stefan van der Walt dca255648f Merge pull request #759 from jni/supress-umf
Suppress error message during failed UmfpackContext import.
2013-10-11 09:57:30 -07:00
Stefan van der Walt 3328a6efce Merge pull request #773 from ahojnnes/scipy-0.13rc
Euler number bug in Scipy-0.13rc1
2013-10-11 09:47:30 -07:00
Stefan van der Walt a9995b6a70 Test whether labels are left alone in label2rgb. 2013-10-11 18:44:30 +02:00
Johannes Schönberger 394d904e17 Merge pull request #768 from cgohlke/patch-2
TST: use BytesIO to save images into file-like object
2013-10-11 08:39:23 -07:00
Johannes Schönberger 4e9cb03aeb Add missing perimeter function to __all__ 2013-10-11 17:37:26 +02:00
Johannes Schönberger f10c362b1a Fix euler number bug for scipy-0.13 2013-10-11 17:34:47 +02:00
Josh Warner 5c73432101 Merge pull request #770 from cgohlke/patch-3
BUG: Fix ValueError: Buffer dtype mismatch, expected 'long' but got...
2013-10-11 00:13:53 -07:00
Johannes Schönberger 3546b55b69 Merge pull request #771 from cgohlke/patch-4
TST: Fix ValueError: Buffer dtype mismatch, expected 'intp_t' but got...
2013-10-11 00:06:06 -07:00
Johannes Schönberger 26c1fbd214 Merge pull request #767 from cgohlke/patch-1
BUG: basestring not defined on PY3
2013-10-11 00:03:25 -07:00
cgohlke 4d46bc0912 TST: Fix ValueError: Buffer dtype mismatch, expected 'intp_t' but got 'long' 2013-10-10 21:51:56 -07:00
cgohlke 458556723d BUG: Fix ValueError: Buffer dtype mismatch, expected 'long' but got 'long long'
on win-amd64
2013-10-10 21:48:29 -07:00
Tony S Yu c519f60285 Add support for consistent color labels for sparse labels. 2013-10-10 23:26:02 -05:00
cgohlke be3be537e6 TST: use BytesIO to save images into file-like object
StringIO does not work on Python 3
2013-10-10 21:22:40 -07:00
cgohlke ea357a4464 BUG: basestring not defined on PY3 2013-10-10 21:16:14 -07:00
Johannes Schönberger e3c7ad0113 Merge pull request #764 from jni/example-py3
Update join_segmentation example for float images
2013-10-09 14:22:43 -07:00
Juan Nunez-Iglesias 6cf12ac0d8 Fix join_segmentations example using img_as_float
data.coins() returns a ubyte image in Python 2.7.x but a float32 image
in Python 3.x. This ensures that the image always has the same type for
the rest of the example.
2013-10-09 09:28:38 +00:00
Juan Nunez-Iglesias cede721624 Merge pull request #761 from kemaleren/optimized_colorlabel
color.label2rgb() is much faster.
2013-10-09 00:22:50 -07:00
Kemal Eren 4db1e1b83c handle case when there are no labels 2013-10-07 23:17:52 -07:00
Johannes Schönberger 57e93d8e13 Merge pull request #762 from jni/update-slic-example
Update SLIC in example to most recent interface
2013-10-07 23:05:14 -07:00
Kemal Eren 794176b7c4 fixed error in label2rgb() when label is a binary array 2013-10-07 20:53:48 -07:00
Juan Nunez-Iglesias bfe70fe091 Update SLIC in example to most recent interface
SLIC has been updated a few times since this example was created,
adding support for grayscale images (so converting to RGB is no longer
necessary) and changing the keyword "ratio" to "compactness". This
commit brings the example up to date.
2013-10-08 14:18:45 +11:00
Juan Nunez-Iglesias 0680f59fe1 Add change in random_walker default mode to TODO 2013-10-08 13:28:39 +11:00
Juan Nunez-Iglesias bfaf89e2f3 Deprecate default mode 'bf' in random_walker 2013-10-08 13:23:50 +11:00
Kemal Eren bdafd1e3d6 ENH: optimized label2rgb() 2013-10-07 16:47:01 -07:00
Juan Nunez-Iglesias fb86bac350 Add comment and links explaining Umfpack import 2013-10-07 13:33:17 +11:00
Juan Nunez-Iglesias 248ac46dae Remove unused imports in random_walker source 2013-10-07 13:25:13 +11:00
Johannes Schönberger edfa25f4a0 Merge pull request #709 from sciunto/wu
Wu's anti-aliased circle + aa line + bezier curve + unittest
2013-10-06 09:08:42 -07:00
Johannes Schönberger 535c141e3b Merge pull request #755 from jni/rename-relabel
Rename `relabel_from_one`
2013-10-06 01:49:57 -07:00
Juan Nunez-Iglesias fc15f75f8d Monkey-patch UmfpackContext __del__
By putting the failing statement in a try: except: clause, the
exception is caught and the error message is silenced.

See
https://groups.google.com/d/msg/scikit-image/FrM5IGP6wh4/1hp-FtVZmfcJ
and
http://stackoverflow.com/questions/13977970/ignore-exceptions-printed-to-stderr-in-del/13977992?noredirect=1#comment28386412_13977992
2013-10-05 14:27:51 +10:00
Juan Nunez-Iglesias a15312e3c8 Only raise umfpack warning if cg mode is used 2013-10-04 15:21:50 +10:00
Juan Nunez-Iglesias a9afb241cc Rename deprecated relabel_from_one in docstring example 2013-10-03 16:23:30 +10:00
Juan Nunez-Iglesias a8488bfecd Remove deprecated use of relabel_from_one 2013-10-03 16:14:30 +10:00
Juan Nunez-Iglesias bfab493133 Add new tests for relabel_sequential 2013-10-03 16:11:52 +10:00
Juan Nunez-Iglesias 37f66f769b Add relabel_sequential to __init__ import 2013-10-03 16:09:27 +10:00
Juan Nunez-Iglesias 1843829917 Add relabel_sequential, deprecate relabel_from_one 2013-10-03 16:08:29 +10:00
Johannes Schönberger 547c0bb7d8 Merge pull request #752 from sciunto/pep
Pep8 and other misc cosmetics.
2013-10-02 09:30:01 -07:00
François Boulogne a1373269e6 DOC: fix indent 2013-10-02 18:28:14 +02:00
François Boulogne 4a7d2e8429 PEP8 2013-10-02 18:14:21 +02:00
François Boulogne 8f20fff3f8 PEP8: fix indentation 2013-10-02 18:14:21 +02:00
François Boulogne 90db96f3eb DOC: add missing import 2013-10-02 18:14:21 +02:00
François Boulogne 628d484942 DOC: no import numpy in doc 2013-10-02 18:14:21 +02:00
François Boulogne 2e2a82ab30 MAINT: matplotlib is in requierements.txt 2013-10-02 18:14:20 +02:00
François Boulogne f82db28565 MAINT: unused import 2013-10-02 18:14:20 +02:00
François Boulogne 741d6fda95 PEP8: comparison 2013-10-02 18:14:20 +02:00