Commit Graph

41 Commits

Author SHA1 Message Date
Steven Silvester 4b2692b7c0 Cleanup 2016-01-30 15:56:19 -06:00
Steven Silvester b710bd21d2 Use a stacklevel of 2 by default for all warnings 2016-01-30 08:57:46 -06:00
Josh Warner 17b882aae5 Merge pull request #1565 from blink1073/viewer-ax
ENH: Allow viewer plot plugin to have tools.
2015-07-12 15:24:55 -05:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Steven Silvester f442fe231a Allow plot plugin to have tools 2015-06-20 06:51:39 -05:00
Phil Schaf 14a2b5d8f3 fixed Qt5 compat 2014-12-30 17:57:19 +01:00
Steven Silvester 11c6a9f86a Fix another viewer import 2014-12-27 10:54:18 -06:00
Steven Silvester 2eee1faaff Fix import error in viewer.utils.core 2014-12-27 10:54:18 -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
Steven Silvester a7a84bbcde Draw the canvas when creating the ax to avoid RuntimeError 2014-12-26 20:14:41 -06:00
Stefan van der Walt 655aca6fed Raise an error that was suppressed to please Travis-CI 2014-12-15 02:22:22 +02:00
Steven Silvester 124db3274f Fix error in viewer test when mpl is present but not qt. 2014-10-04 15:58:28 -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
Johannes Schönberger 06498c3c59 Warn about matplotlib backend in skimage.viewer 2014-03-26 19:06:06 -04:00
Stefan van der Walt f0506f1293 Fix imports under Python 3. 2013-06-29 10:17:42 -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
Tony S Yu cae693cb69 Change QApp default to previous behavior. 2013-06-25 23:24:06 -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
François Boulogne 3926f1873d use items/values for python2/3 compat 2013-06-20 11:16:23 +02:00
François Boulogne cc249baa6c fix iteritems for python3 compat 2013-06-13 14:06:23 +02:00
Tony S Yu afd1b1b835 Fix display of overlay plugin when original image is updated 2013-06-08 19:24:50 -05:00
Johannes Schönberger 255ac68999 Avoid import of matplotlib QT lib if QT is not installed 2013-05-29 20:17:17 +02:00
Tony S Yu 124e38751c Fix RequiredAttrs definition.
The example in python's descriptor tutorial creates a singleton so multiple,
instances share the same attribute. This update fixes the issue based on [1].

[1] http://stackoverflow.com/questions/8718052/where-does-a-python-descriptors-state-go
2013-05-28 23:34:52 -05:00
Tony S Yu 3baa7fe8f3 Fix file open dialog for PySide 2013-05-19 22:58:04 -05:00
tonysyu c7fa6206cf Add PySide compatibility for save dialogs 2013-05-17 17:12:52 -05:00
Tony S Yu a5d42a3940 Add skimage.viewer.qt wrapper.
This allows the viewer to use either PyQt4 or PySide as the toolkit.
2013-05-17 16:22:17 -05:00
Tony S Yu d3edd350f9 ENH: Add open and save menu actions 2012-12-23 16:19:03 -08:00
Tony S Yu 15b1ad4929 STY: Remove commented out code 2012-12-10 21:30:25 -05:00
Tony S Yu 0428f821e5 BUG: Fix background update when canvas resized 2012-12-10 21:18:50 -05:00
Tony S Yu ef2bb54c45 Fix figure canvas creation.
Avoid use of matplotlib's pyplot functions for creating figure canvases. In particular, key press events were ignored by the canvas.
2012-12-09 20:51:18 -05:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Tony S Yu fe41023370 STY: Refactor initialization of QApplication. 2012-09-04 22:07:25 -04:00
Tony S Yu be33941701 Change error to warning so that autodoc doesn't fail. 2012-08-25 12:11:46 -04:00
Tony S Yu b14514e018 BUG: Fix nosetest and autodoc errors when PyQt4 not available
nose and autodoc imports the viewer modules so all PyQt4 imports must be wrapped in a try-except block. In addition, any classes derived from PyQt4 must be proxied since the class definition are run on import. This is really hacky.
2012-08-25 12:06:03 -04:00
Tony S Yu 54af4176dd ENH: Add RequiredAttr to raise warnings when attr not set. 2012-08-03 20:45:01 -04:00
Tony S Yu 539b12dc2c STY: Refactor MatplotlibCanvas from ImageCanvas and PlotCanvas. 2012-07-27 21:57:46 -04:00
Tony S Yu 9d1df0c3ce Make alpha value to ClearColormap adjustable. 2012-07-22 22:11:33 -04:00
Tony S Yu 86b428952d ENH: Allow Plugin.add_widget to hook into Plugin attributes.
The `ptype` parameter of widget can now be set to 'plugin'. When this is the case, the plugin will set a plugin attribute whenever the widget is updated.

As an example, this commit adds a ComboBox widget which is hooked into the overlay color of the OverlayPlugin.
2012-07-22 13:24:41 -04:00
Tony S Yu 1903ed892d API change: switch order of image viewer and callback arguments. 2012-07-20 14:45:32 -05:00
Tony S Yu c27119b0cd ENH: Add image viewer based on Qt and Matplotlib 2012-07-20 14:03:47 -05:00