Commit Graph

4273 Commits

Author SHA1 Message Date
cgohlke 4d46bc0912 TST: Fix ValueError: Buffer dtype mismatch, expected 'intp_t' but got 'long' 2013-10-10 21:51:56 -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
Kemal Eren bdafd1e3d6 ENH: optimized label2rgb() 2013-10-07 16:47:01 -07: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 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
François Boulogne bac7ede8b2 PEP8 2013-10-02 18:12:01 +02:00
Stefan van der Walt 27d1a5e70a Merge pull request #750 from ahojnnes/misc
Misc cleanups.
2013-10-02 08:57:33 -07:00
Johannes Schönberger 2459ca14a0 Fix deprecated function name in example 2013-10-02 17:57:20 +02:00
Johannes Schönberger ee24f1c2c5 Improve example of warp function to show all available options 2013-10-02 17:45:05 +02:00
Johannes Schönberger 40f5e78353 Add support for matrix as inverse_map 2013-10-02 17:33:17 +02:00
François Boulogne 055e820e72 MINOR: some comments 2013-10-02 17:25:17 +02:00
François Boulogne 7299753602 FIX: broken test (thanks unittest!) 2013-10-02 17:25:17 +02:00
François Boulogne 296f8dad20 MINOR: doctrings + various improvements 2013-10-02 17:25:17 +02:00
François Boulogne 9ceb489ba8 DOC: add bezier_curve 2013-10-02 17:25:17 +02:00
François Boulogne 1548364b65 ADD: bezier_curve 2013-10-02 17:25:16 +02:00
François Boulogne 5c423475e6 PEP8 2013-10-02 17:25:16 +02:00
François Boulogne 0467b92034 PEP8 2013-10-02 17:25:16 +02:00
François Boulogne 718989edc5 FIX: division for value 2013-10-02 17:25:16 +02:00
François Boulogne 088b2995a9 DOC: split non-AA/AA 2013-10-02 17:25:16 +02:00
François Boulogne d998166ede MAINT: val in [0,1] 2013-10-02 17:25:15 +02:00
François Boulogne a4f1704d6e MAINT: bezier_segment is private 2013-10-02 17:25:15 +02:00
François Boulogne 1a0f137679 Anti-aliasing 2013-10-02 17:25:15 +02:00
François Boulogne 90335efdda Implement line_aa 2013-10-02 17:25:15 +02:00
François Boulogne bf31517843 DOC: remove wu in methods 2013-10-02 17:24:22 +02:00
François Boulogne 2606494828 MAINT: put AA method in draw.*_aa 2013-10-02 17:24:22 +02:00
François Boulogne dcf02235a4 DOC: fix refs 2013-10-02 17:23:37 +02:00
François Boulogne 62240c1f11 TEST: fix unittest 2013-10-02 17:23:37 +02:00
François Boulogne 62dbd7b9b9 TEST: fix returned tuple 2013-10-02 17:23:37 +02:00
François Boulogne 4c14e86952 DOC: update return according to wu's method 2013-10-02 17:23:37 +02:00
François Boulogne 36e23b106f TEST: add unittest and check with travis 2013-10-02 17:23:37 +02:00