Commit Graph

314 Commits

Author SHA1 Message Date
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
arve0 d7a80f55f3 add reset button to crop plugin 2015-05-07 10:14:38 +02:00
arve0 690a839de8 add button class 2015-05-04 12:12:18 +02:00
Eric Dill 8af43739c4 TST: Barn-door testing of SaveButtons clicks
The canny_simple.py demo in viewer_examples/plugins has a save
button that raises an AttributeError in PIL because the button
click is passing 'False' to the SaveButtons.save_to_file function
when it expects a filename or None.
2015-03-19 08:35:57 -04:00
arve0 f737ac4496 move docstring from viewer.widgets.core to viewer.widgets 2015-03-14 20:26:36 +01:00
Jonathan Helmus 78a0eb6b98 Implement appveyor builds
Implement Appveyor builds

initial test

Updated appveyor.yml

New nosetest call

With conda update conda

with pillow

without pillow

TST: Change case sensitivive JPG extension

Revert "TST: Change case sensitivive JPG extension"

This reverts commit 2deed7cc63736f7c6f0387bd37df4c6643c32847.

Trying with Python 2.7

Trying with version env

Trying again with variables

Testing on all Python versions

don't allow failures

Allow failure

Do not actually use tests

Ignore failing tests

Removed Python 2.6 test

Testing only Python 2.6

Testing out more sklearn like AppVeyor CI

Added install to pip

Add artifacts

Enabled all permutations

Disable 2.6, add PIL

Python 2.6, 2.7 only with PIL

Testing with variable dependencies

Allow failure with IF ELSE

With Python 3.4

Scikit-learn like appveyor CI

Fixing paths

Undo path fix

path fix single line

path fix single line 2

Using Miniconda

More path fixes

New wheelhouse link

Added pillow to requirements.txt

Added networkx to requirements.txt

Add testing of 32/64-bit Python 2.7 and 3.4 to matrix

Debugging Cython compile

Retry with all 4 builds

Updated install.ps1 file

Updated based on latest python-appveyor-demo

Debugging pip install

Specify numpy 1.8.1 until whl is uploaded to rackspace

Use skimage-wide requirements.txt file

Minor comment change to trigger build

Install wheel and then install from WHEELHOUSE

Install six from pip

Install networkx from pip

Install pyparsing from pip

Install pytz from pip

Try using just find-links

Install the binary dependencies first, then the rest

Add pillow to the install list

Fix appveyor.yml syntax

Fix requirements.txt syntax

Fix requirements.txt syntax again

Fix appveyor call to initial install

Fix appveyor call to initial install again

Fix appveyor call to initial install yet again

Install wheel

Install wheel first

Install wheel and nose in the appveyor requirements.txt

Fix Python3 version to match python ftp site

Only use cleanup decorator if available

Add debug info to multiimage test

More debugging information

Fix handling of path separators on Windows

Add another warning guard

Fix warning handling for non-windows

Do not use TkAgg as it may be causing alloc error

Clean up echo command

Allow for unclosed file warning

Fix spacing in echo command
2015-02-28 19:57:45 -06:00
arve0 3acae2274f move CollectionViewer update_image to parent class 2015-02-20 13:09:25 +01:00
arve0 2308ba0617 fix typo artist.remove -> artists.remove 2015-02-18 22:19:31 +01:00
Johannes Schönberger 52895c2cc4 Fix invalid relative import 2015-01-22 07:39:08 -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 d714d0bcbc Separate qt version check from has_qt flag 2014-12-30 21:01:23 -06:00
Phil Schaf 14a2b5d8f3 fixed Qt5 compat 2014-12-30 17:57:19 +01:00
Steven Silvester 51ab675d3c Fix lingering merge issue 2014-12-27 11:11:36 -06: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 67fadc0ed8 Fix mock Qt objects again 2014-12-27 10:54:19 -06:00
Steven Silvester 42b330e562 Add QWidget to the mock Qt 2014-12-27 10:54:19 -06:00
Steven Silvester 8da175d70e Add dummy Qt properties 2014-12-27 10:54:19 -06:00
Steven Silvester c3ade4416f Instantiate QtCore dummy class 2014-12-27 10:54:18 -06:00
Steven Silvester 7474db1f0d Another fix for dummy Signal 2014-12-27 10:54:18 -06:00
Steven Silvester 6d445776c9 Fix the dummy Signal 2014-12-27 10:54:18 -06: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 6f57873526 Do not use ImportError behaviour in viewer
Conflicts:
	skimage/viewer/tests/test_tools.py
2014-12-27 10:54:13 -06:00
Steven Silvester 8d40cbd1d2 Allow viewer package to import without Qt 2014-12-27 10:52:30 -06:00
Steven Silvester 68508576f6 Remove debug raise 2014-12-27 10:52:30 -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 ecc582193a Try using matplotlib cleanup decorator 2014-12-26 20:55:44 -06:00
Steven Silvester a7a84bbcde Draw the canvas when creating the ax to avoid RuntimeError 2014-12-26 20:14:41 -06:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -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 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
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 f72882fbd2 Import scipy before turning on warnings 2014-12-23 16:49:19 -06:00
Steven Silvester 79c648b14c Accommodate upcoming changes to RectangleSelector API 2014-12-23 16:48:37 -06:00
Steven Silvester 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
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
Stefan van der Walt 655aca6fed Raise an error that was suppressed to please Travis-CI 2014-12-15 02:22:22 +02:00
Stefan van der Walt 7f8cd65675 Fix docstring markup errors 2014-12-15 02:21:34 +02:00
Stefan van der Walt 78a7b7307a Rename and deprecate filter module to prevent shadowing of built-in keyword 2014-11-10 12:53:50 +02:00
Rebecca 5c2189550a removed typo that caused test error 2014-11-07 16:04:54 +02:00
Rebecca 1b217f971e replacing lena in examples and most tests 2014-11-07 16:01:23 +02:00
Steven Silvester 0fabb0c3ab Fix comment typo 2014-10-11 18:28:36 -05:00