Commit Graph

72 Commits

Author SHA1 Message Date
Steven Silvester f442fe231a Allow plot plugin to have tools 2015-06-20 06:51:39 -05:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Stefan van der Walt 9b16b35d96 Merge pull request #1318 from blink1073/pyqt5
Update viewer for PyQt5 compatibility
2015-01-21 13:27:40 -08:00
Steven Silvester f89ab053e1 Merge pull request #1314 from SalvatoreScaramuzzino/RectTool_docs
Rect tool docs
2014-12-27 11:01:08 -06:00
Steven Silvester 65c1d4eec6 Update viewer for PyQt5 compatibility
Conflicts:
	skimage/viewer/tests/test_plugins.py
	skimage/viewer/tests/test_tools.py
2014-12-27 10:52:27 -06:00
salvatore ac52af7d83 removed numpy import and spaces 2014-12-26 12:12:15 +01:00
salvatore d28ae513ca Travis auto-build Doctest skipped to avoid window opening 2014-12-26 10:37:03 +01:00
Steven Silvester 4680f30466 Add a test setup helper function
Add a function to set up a skimage test

Switch to new test helper function

Import local packages that raise warnings in test setup function

More fixes to doctests

Fix regionprops doc test

Try and fix the test_rank failure.

Remove no longer needed RectangleSelector shim

Skip more doctests in _regionprops

Try importing another scipy subpackage
2014-12-23 16:49:20 -06:00
Steven Silvester 79c648b14c Accommodate upcoming changes to RectangleSelector API 2014-12-23 16:48:37 -06:00
salvatore ad96b911ab ... added in indented code 2014-12-22 20:49:44 +01:00
salvatore 5401d00b62 deleted ">>>" in body of print_the_rect function 2014-12-22 12:13:10 +01:00
salvatore 04b998199a try to format properly a function in examples of RectTool 2014-12-22 11:25:00 +01:00
salvatore a01a5ed023 Added an example of use of CanvasTools.RectTool to allow generation of docs.
RectTool is used to write rectangles over an image (lena).
This example also can be useful for set_color explanation using both [RGB] and single value color setting

from previous commit indented code in examples is formatted properly.
2014-12-20 23:54:06 +01:00
salvatore 5b71cd9481 Added an example of use of CanvasTools.RectTool to allow generation of docs.
RectTool is used to write rectangles over an image (lena).
This example also can be useful for set_color explanation using both [RGB] and single value color setting
2014-12-20 00:39:33 +01:00
Steven Silvester 0fabb0c3ab Fix comment typo 2014-10-11 18:28:36 -05:00
Steven Silvester 725c376d78 Make sure we disconnect all the signals 2014-10-11 14:34:55 -05:00
Steven Silvester 72292f73c0 Use a manual hack to remove the canvas events for old MPL 2014-10-11 09:15:10 -05:00
Steven Silvester 532e460172 Disconnect the events manually 2014-10-11 07:21:32 -05:00
Steven Silvester 0c35d13203 Add a try/catch for RectangleTool.disconnect_events 2014-10-11 05:12:04 -05:00
Stefan van der Walt 63c92537b1 Also add handle style to ThickLineTool 2014-09-30 06:18:03 +02:00
Stefan van der Walt b4a6571715 Allow modification of LineTool handle style 2014-09-29 17:13:07 +02:00
Steven Silvester 7ac6323210 Fix failing tests 2014-09-01 13:30:07 -05:00
Steven Silvester 1740392110 Add on_scroll behavior and allow line to change width. 2014-09-01 10:28:28 -05:00
blink1073 778f62de6a Updates to get all tools tested and working 2014-09-01 10:04:08 -05:00
blink1073 2d9d8bb94c Refactor blit manager and event manager to viewer 2014-09-01 09:59:01 -05:00
blink1073 1799846be9 Remove unused parameter from docstring 2014-09-01 09:58:59 -05:00
blink1073 410f3926e4 Push handling of line tools to axes level for better coordination. 2014-09-01 09:58:57 -05:00
blink1073 d9a85a167e Move handling of blit behavior to axes object. 2014-09-01 09:58:55 -05:00
Steven Silvester 72f6a8c056 Make suggested changes to build update and use travis_retry for all installs. 2014-08-11 17:01:53 -05:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
blink1073 0b73d69144 Address travis failures 2014-07-16 20:39:37 -05:00
blink1073 9576df45f8 Add tests for all of viewer subpackage, with necessary file mods 2014-07-16 19:38:23 -05:00
Stefan van der Walt 9446f6b71a Use more recent NoNorm API 2014-06-15 15:03:46 +02:00
blink1073 c70040c236 Add a shape property that gracefully accomodates a new image size 2014-02-08 22:12:38 -06:00
Johannes Schönberger fb1c1d39f0 Fix misspelled sections 2013-11-09 23:01:58 +01:00
François Boulogne 2e2a82ab30 MAINT: matplotlib is in requierements.txt 2013-10-02 18:14:20 +02:00
Tony S Yu 6cef8727a0 Minor fixes
- Use absolute imports so __main__ examples work
- PEP8: 2 blank lines
2013-06-29 10:56:03 -05:00
Stefan van der Walt f0506f1293 Fix imports under Python 3. 2013-06-29 10:17:42 -05:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Tony S Yu 9c4eb3a6fc Use print function for python 3 compatibility 2012-12-26 22:21:24 -08:00
Tony S Yu df916713f5 ENH: Add PaintTool and LabelPlugin 2012-12-26 22:03:59 -08:00
Tony S Yu 6c1b969b21 BUG: Fix clean up of canvastools
NOTE: The rectangle tool doesn't seem to clean up properly.
2012-12-26 21:39:39 -08:00
Tony S Yu ea0821ff93 BUG: Validate mouse interaction
Fixes error messages when mouse moved out of axes, plus a few other issues
2012-12-15 09:28:41 -05:00
Tony S Yu 244e68c232 BUG: fix end_points setter when given a tuple
Dragging of end points was broken.
2012-12-15 09:27:07 -05:00
Tony S Yu 6704285859 BUG: Fix MRO bug when matplotlib not installed 2012-12-14 10:01:52 -05:00
Tony S Yu 2532c659ec BUG: Fix error when matplotlib is not available 2012-12-13 23:40:33 -05:00
Tony S Yu 1a199b4405 ENH: Improve end_points setter 2012-12-13 22:25:53 -05:00
Tony S Yu 78e1efefcb ENH: Add setter for extents property 2012-12-13 21:52:32 -05:00
Tony S Yu 34de6d323a BUG: Fix line thickness change call back 2012-12-13 21:21:36 -05:00
Tony S Yu 25b9f5d5aa BUG: Fix LineTool example after change to call signature
x, y parameters were removed for simplicity, but example wasn't updated
2012-12-13 21:12:35 -05:00