3acae2274f
move CollectionViewer update_image to parent class
2015-02-20 13:09:25 +01:00
2308ba0617
fix typo artist.remove -> artists.remove
2015-02-18 22:19:31 +01:00
52895c2cc4
Fix invalid relative import
2015-01-22 07:39:08 -05:00
ee5c6fbeb2
Use relative imports in skimage files
2015-01-22 07:36:48 -05:00
9b16b35d96
Merge pull request #1318 from blink1073/pyqt5
...
Update viewer for PyQt5 compatibility
2015-01-21 13:27:40 -08:00
d714d0bcbc
Separate qt version check from has_qt flag
2014-12-30 21:01:23 -06:00
14a2b5d8f3
fixed Qt5 compat
2014-12-30 17:57:19 +01:00
51ab675d3c
Fix lingering merge issue
2014-12-27 11:11:36 -06:00
f89ab053e1
Merge pull request #1314 from SalvatoreScaramuzzino/RectTool_docs
...
Rect tool docs
2014-12-27 11:01:08 -06:00
67fadc0ed8
Fix mock Qt objects again
2014-12-27 10:54:19 -06:00
42b330e562
Add QWidget to the mock Qt
2014-12-27 10:54:19 -06:00
8da175d70e
Add dummy Qt properties
2014-12-27 10:54:19 -06:00
c3ade4416f
Instantiate QtCore dummy class
2014-12-27 10:54:18 -06:00
7474db1f0d
Another fix for dummy Signal
2014-12-27 10:54:18 -06:00
6d445776c9
Fix the dummy Signal
2014-12-27 10:54:18 -06:00
11c6a9f86a
Fix another viewer import
2014-12-27 10:54:18 -06:00
2eee1faaff
Fix import error in viewer.utils.core
2014-12-27 10:54:18 -06:00
6f57873526
Do not use ImportError behaviour in viewer
...
Conflicts:
skimage/viewer/tests/test_tools.py
2014-12-27 10:54:13 -06:00
8d40cbd1d2
Allow viewer package to import without Qt
2014-12-27 10:52:30 -06:00
68508576f6
Remove debug raise
2014-12-27 10:52:30 -06:00
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
ecc582193a
Try using matplotlib cleanup decorator
2014-12-26 20:55:44 -06:00
a7a84bbcde
Draw the canvas when creating the ax to avoid RuntimeError
2014-12-26 20:14:41 -06:00
f898bd0209
Style fixes
2014-12-26 11:26:30 -06:00
ac52af7d83
removed numpy import and spaces
2014-12-26 12:12:15 +01:00
d28ae513ca
Travis auto-build Doctest skipped to avoid window opening
2014-12-26 10:37:03 +01:00
c0a0490eed
Fix handling of multiple warnings and update tests
...
Fix handling of multiple warnings
Update all test __init__ files
Update segmentation pkg
Update the color pkg
Update the exposure pkg
Update the filters pkg
Update the io pkg
Update the measure pkg
Update morphology package
Restructure test setup function
Add expected_warnings to __all__
Update restoration pkg.
Remove explicit filter check since it is done elsewhere
Fix the image test helpers
Update the transform pkg
Fix util pkg
Update viewer pkg
2014-12-23 16:51:06 -06:00
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
f72882fbd2
Import scipy before turning on warnings
2014-12-23 16:49:19 -06:00
79c648b14c
Accommodate upcoming changes to RectangleSelector API
2014-12-23 16:48:37 -06:00
0debedd82c
Handle more warnings and reset io plugins as needed
...
Reset plugins prior to running collections test
Handle warnings in morphology pkg
Add __init__ for morpohology tests
Handle warnings for novice pkg
Handle warnings for restoration pkg
Handle warnings for segmentation pkg
Handle warnings for _shared pkg
Handle warnings for transform pkg
Handle warnings for util pkg
Handle warnings in viewer module
2014-12-23 16:48:16 -06:00
ad96b911ab
... added in indented code
2014-12-22 20:49:44 +01:00
5401d00b62
deleted ">>>" in body of print_the_rect function
2014-12-22 12:13:10 +01:00
04b998199a
try to format properly a function in examples of RectTool
2014-12-22 11:25:00 +01:00
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
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
655aca6fed
Raise an error that was suppressed to please Travis-CI
2014-12-15 02:22:22 +02:00
7f8cd65675
Fix docstring markup errors
2014-12-15 02:21:34 +02:00
78a7b7307a
Rename and deprecate filter module to prevent shadowing of built-in keyword
2014-11-10 12:53:50 +02:00
5c2189550a
removed typo that caused test error
2014-11-07 16:04:54 +02:00
1b217f971e
replacing lena in examples and most tests
2014-11-07 16:01:23 +02:00
0fabb0c3ab
Fix comment typo
2014-10-11 18:28:36 -05:00
725c376d78
Make sure we disconnect all the signals
2014-10-11 14:34:55 -05:00
72292f73c0
Use a manual hack to remove the canvas events for old MPL
2014-10-11 09:15:10 -05:00
532e460172
Disconnect the events manually
2014-10-11 07:21:32 -05:00
0c35d13203
Add a try/catch for RectangleTool.disconnect_events
2014-10-11 05:12:04 -05:00
d9e169c518
Fix PIL tests, move helpers to _shared, fix widgets test
2014-10-09 20:18:21 -05:00
d16904cfbc
Merge pull request #1175 from blink1073/update-setup
...
Update build requirements and instructions
2014-10-09 18:27:22 +02:00
124db3274f
Fix error in viewer test when mpl is present but not qt.
2014-10-04 15:58:28 -05:00
d1d7af0efd
Merge pull request #1180 from stefanv/doc/widget_callback
...
Add more complete documentation for widget callback
2014-09-30 04:26:47 -05:00
arve0