Commit Graph

3561 Commits

Author SHA1 Message Date
Stefan van der Walt 84615478e4 Fix function code. 2013-06-29 10:17:41 -05:00
Stefan van der Walt b04c3282bf Fix zip. 2013-06-29 10:17:41 -05:00
Stefan van der Walt a1adfa8d54 Correctly check for string type. 2013-06-29 10:17:41 -05:00
Stefan van der Walt 9a38a59a25 Remove is_str and replace by isinstance(..., six.string_types). 2013-06-29 10:16:42 -05:00
Stefan van der Walt 70d21f23a2 Add six compatibility module. 2013-06-29 10:16:42 -05:00
Stefan van der Walt 2ef6f0ae73 Remove 2to3. 2013-06-29 10:16:42 -05:00
Tony S Yu c61e0434e4 Merge pull request #613 from adamw523/master
support for saving to file-like object in imsave
2013-06-28 14:47:26 -07:00
Adam Wisniewski a95824c36f Merge pull request #1 from tonysyu/pr/613
Minor cleanups to test
2013-06-28 14:19:09 -07:00
Tony S Yu 397e7c1ade Clean up test. 2013-06-28 16:08:11 -05:00
Adam Wisniewski 362d915399 support for saving to file-like object in imsave 2013-06-28 16:18:01 -04:00
Stefan van der Walt 2e80b819d0 Merge pull request #612 from applio/master
Fix test which relied on dtype of input image.
2013-06-28 11:41:13 -07:00
Davin Potts 0586817962 Modified test_rank.test_compare_autolevels and test_rank.test_compare_8bit_vs_16bit to correct for assumption that data.camera() would always be loaded as ubyte (or ints at least) when using matplotlib as backend (which caused data.camera() to load as float32). 2013-06-28 12:17:28 -05:00
Josh Warner 173fec01c7 Merge pull request #575 from tonysyu/feature/viewer-linking
Linked image viewers and docked plugins
2013-06-28 08:32:34 -07:00
Johannes Schönberger 6d5c8cb299 Merge pull request #604 from JDWarner/fix_sitk_tests
FIX: prepend `np.testing.` to assert_* statements
2013-06-27 13:39:26 -07:00
Josh Warner (Mac) 82c987cb15 FIX: prepend np.testing. to assert_* statements
Resolve a simple namespace problem, eliminating 15 errors in
tests Travis doesn't catch because Travis doesn't build SimpleITK
2013-06-27 15:13:21 -05:00
tonysyu c826935d9e Change default Slider update_on value to 'release'
Image filtering is usually slow, so updating on move was usually a bad idea.
2013-06-26 11:23:12 -05:00
tonysyu ed7c75d4c6 Raise ImageViewer to front on start.
Currently only works for main window, does not work for linked viewers.
2013-06-26 11:00:24 -05:00
Tony S Yu cae693cb69 Change QApp default to previous behavior. 2013-06-25 23:24:06 -05:00
Tony S Yu dae0156230 Make histogram threshold adjustable 2013-06-25 23:20:12 -05:00
Tony S Yu e305677de5 Fix PyQt4 segfault caused by PySide fix.
I guess PySide saves the QApplication internally, while PyQt4 doesn't.
Saving the QApplication as a global prevents it from getting garbage
collected. Saving the QApplication as an instance variable in the
ImageViewer also works, but that might prevent the ImageViewer from getting
garbage collected in an interactive session. (weakref doesn't seem to work here.)
2013-06-25 23:15:42 -05:00
tonysyu c4299c4637 Fix execution in IPython with qt backend.
New QApplication and event-loop implementation stolen shamelessly from
IPython. Strangely, running the viewer at the IPython prompt will
open an orphan Matplotlib figure window, but running a script using
`%run` does not.

Only tested on PySide (not PyQt4).
2013-06-25 14:37:01 -05:00
Stefan van der Walt 4c39d2693a Merge pull request #601 from ahojnnes/corner-eps
BUG: Fix division by zero bug in corner detectors.
2013-06-23 15:42:16 -07:00
Johannes Schönberger c9b2bd0aae Fix division by zero bug in corner detectors 2013-06-23 23:39:20 +02:00
Stefan van der Walt 113267bd4d Merge pull request #577 from JDWarner/add_pad
ENH: Generalized N-dimensional array padding.
2013-06-22 20:51:51 -07:00
Stefan van der Walt 0a727e3367 Merge pull request #485 from tonysyu/image_label2rgb
ENH: Add `label2rgb`.
2013-06-22 20:24:20 -07:00
Johannes Schönberger 360f5b55e3 Merge pull request #597 from sciunto/hough_ellipse
Hough transform for ellipses
2013-06-21 12:47:50 -07:00
Johannes Schönberger d8d5e30920 Merge pull request #598 from sciunto/fix_import
Fix import + pep8
2013-06-21 12:45:51 -07:00
François Boulogne 8aad4d6e94 fix missing space 2013-06-21 19:13:18 +02:00
François Boulogne a165cf3dca pep8 2013-06-20 23:28:49 +02:00
François Boulogne 77d7b25b52 fix import testing 2013-06-20 23:26:10 +02:00
François Boulogne a9f962695e add spaces for travis (pep8) 2013-06-20 23:12:16 +02:00
François Boulogne 84bff08601 fix import testing 2013-06-20 23:08:39 +02:00
François Boulogne 5c3eef0d86 delete comment 2013-06-20 22:53:32 +02:00
François Boulogne 6f6d207eb2 fix import 2013-06-20 22:53:13 +02:00
François Boulogne b9572e8c68 remove commented lines 2013-06-20 22:47:08 +02:00
François Boulogne 0a4fcdad0a fix imports 2013-06-20 22:46:37 +02:00
François Boulogne 5ce5f283d0 delete duplicated import 2013-06-20 22:23:04 +02:00
François Boulogne 33bbda17c1 s/int/long memory view 2013-06-20 22:17:23 +02:00
François Boulogne d23469de80 use memoryview 2013-06-20 21:10:47 +02:00
François Boulogne 73f6585d28 Hough transform for ellipses 2013-06-20 16:08:53 +02:00
Tony S Yu 43074f662f Merge pull request #590 from sciunto/python3fix
few Python3 fixes
2013-06-20 04:40:54 -07:00
Tony S Yu 28c8a9b93d Merge pull request #593 from ahojnnes/rebase-workflow
Rebase workflow
2013-06-20 04:33:25 -07:00
François Boulogne 3926f1873d use items/values for python2/3 compat 2013-06-20 11:16:23 +02:00
Johannes Schönberger d7843529b5 Merge pull request #4 from tonysyu/rebase-workflow-edits
Tweak Sphinx rendering of contribution page
2013-06-19 20:46:25 -07:00
Tony S Yu 5efe571bbd Tweak Sphinx rendering of contribution page 2013-06-19 21:24:47 -05:00
Tony S Yu 20401d3e12 Change color definitions from ini file to python module
This simplifies the code and allows users to use either `color_dict` or module
variables, e.g., `rgb_colors.white`.
2013-06-19 19:31:47 -05:00
Josh Warner (Mac) 20ae0a1ca2 FEAT: Generalized n-dimensional array padding
This PR exposes NumPy 1.8+ padding functionality to all
users of scikit-image, regardless of their personal NumPy
version.

The improved (much better scaling with dimensionality)
version introduced in NumPy 1.8 is used.
2013-06-19 09:10:06 -05:00
Johannes Schönberger 752e860d3d Use long parameter version --force rather than -f 2013-06-17 16:40:28 +02:00
Johannes Schönberger 8e4c11cf48 Add additional advice about rebasing 2013-06-17 16:39:35 +02:00
Johannes Schönberger 1eb841d116 Fix typo 2013-06-17 16:16:13 +02:00