Commit Graph

5886 Commits

Author SHA1 Message Date
Johannes Schönberger 9ee87498ba PEP8 fixes and rearranged images in plot 2014-09-02 19:20:25 -04:00
Johannes Schönberger 2bfa7b6f3c Merge pull request #1127 from Brittix1023/windowed_histogram
Windowed histogram
2014-09-02 19:00:09 -04:00
Geoffrey French c518f78ff7 Fixed mistake in generic.py 2014-09-02 20:17:43 +01:00
Geoffrey French 5342299572 PEP8 compliance and doc formatting fixes. 2014-09-02 19:16:41 +01:00
Tony S Yu 2b98d85cf9 Merge pull request #1065 from blink1073/multi_linetool_drawing
Multi linetool drawing
2014-09-01 21:06:50 -05:00
Stefan van der Walt 914afee076 Merge pull request #1113 from jucoste/move_canny
Move canny from filter to feature
2014-09-02 01:07:20 +01:00
Geoffrey French e6bda5accd Fix to skimage.filter.rank.windowed_histogram docstring.
Better explanation of technique in plot_windowed_histogram example, along with (hopefully correct) citations.
Relevant additions to release_dev.txt and CONTRIBUTORS.txt.
2014-09-01 23:41:03 +01:00
Geoffrey French bf02a92ee3 Small fix to windowed_histogram doctoring. 2014-09-01 23:04:24 +01:00
Geoffrey French a90096555b Docstring and comment improvements and fixes in plot_windowed_histogram.
Readability improvement to skimage/io/__init__.py
2014-09-01 22:59:59 +01:00
Geoffrey French 9f5a6fddbf Fixed comment in plot_windowed_histogram. 2014-09-01 22:46:12 +01:00
Geoffrey French 0936522064 Improved plot_windowed_histogram doctoring, removed unnecessary imports and removed an internal testing line. 2014-09-01 22:44:45 +01:00
Geoffrey French b9ac11da3f Exchanged array output parameter for pointer and Py_ssize_t in kernel functions for slight speedup. 2014-09-01 22:39:41 +01:00
Geoffrey French 29763582f5 Fixed Python 3 error in plot_windowed_histogram caused by use of incorrect division operator. Also tweaked the similarity computation a little. 2014-09-01 20:29:17 +01:00
Steven Silvester 7ac6323210 Fix failing tests 2014-09-01 13:30:07 -05:00
Johannes Schönberger b8c58872a6 Merge pull request #1129 from stefanv/log_leftovers
Remove leftovers of old logger
2014-09-01 13:50:30 -04:00
Stefan van der Walt 85439b173a Merge pull request #1115 from JDWarner/enh_marching_cubes
ENH: Simplify `marching_cubes` for maintainability
2014-09-01 17:32:26 +01:00
Stefan van der Walt 1d99966804 Remove leftovers of old logger 2014-09-01 17:16:13 +01:00
Steven Silvester 1740392110 Add on_scroll behavior and allow line to change width. 2014-09-01 10:28:28 -05:00
blink1073 7864adbc0c Make other suggested style changes 2014-09-01 10:04:14 -05:00
blink1073 778f62de6a Updates to get all tools tested and working 2014-09-01 10:04:08 -05:00
blink1073 1775e959d6 Switch plugins to use new tool api 2014-09-01 09:59:03 -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
Juan Nunez-Iglesias 725c199018 Merge pull request #1096 from ahojnnes/regionprops-speedup
Speed up image moments and and central moments computation.
2014-08-31 23:48:11 -05:00
Johannes Schönberger 23083636fe Replace pow() with iterative multiplication 2014-08-31 22:51:32 -04:00
Johannes Schönberger 4f1adee2ec Make moments functions C functions and reuse centralized moments 2014-08-31 22:51:32 -04:00
Johannes Schönberger 8d2fdaa8f5 Speedup moments function 2014-08-31 22:51:32 -04:00
Johannes Schönberger cdf7ad12bc Speedup moments_central function 2014-08-31 22:51:32 -04:00
Johannes Schönberger 3f7735dccb Merge pull request #1109 from blink1073/add-exposure-mask
Add mask option to exposure.equalize_hist with test.
2014-08-31 22:41:50 -04:00
Steven Silvester 2355c17e3c Add mask option to exposure.equalize_hist with test.
Remove print and fix comparision to None

Update test to make it clear there is a difference

Fix mask logic and `equalize_hist` in `__all__`.

Fix handling of mask and tweak mask test

Another run at travis

Update travis to avoid conflict
2014-08-31 21:15:01 -05:00
Johannes Schönberger 4102fd97d3 Merge pull request #1128 from blink1073/fix-travis
Fix travis build for python 3.2
2014-08-31 18:10:02 -04:00
Geoffrey French da93619e59 Fixed some issues with the new windowed_histogram function in filter.rank.
It used to be able to output uint8 histogram, whose max pixel counts of 255 could easily overflow. Addressed by limiting the output type to float.
Normalized histograms are now generated, otherwise behaviour is unpredictable at boundaries or when pixels are not permitted by a mask.
The new optional n_bins parameter allows the caller to specify the size of the histogram generated. Having it fixed to image.max()+1 could result in feature vectors being shorter than desired just due to a value not being used in an image.
An example has been added to the docs, that demonstrates the application of windows histograms in object matching; a single coin is extracted and found by chi squared histogram matching.
2014-08-31 22:25:45 +01:00
Steven Silvester e8e23fa154 Fix typo in spacer declaration 2014-08-31 11:03:30 -05:00
Steven Silvester e8987b582f Fix matplotlib install, make installs verbose, add spacers 2014-08-31 10:56:41 -05:00
Geoffrey French 7ebb2388d2 Fixed some test failures and added a test for windowed_histogram. 2014-08-31 16:22:35 +01:00
Stefan van der Walt 997172d5ec Merge pull request #1124 from blink1073/master
Fix import when not built (closes gh-1108)
2014-08-31 16:07:25 +01:00
Geoffrey French d63d89497b Modified rank filters package so that the _core function in core.pyx outputs to a 3D image, permitting the generation of images with arbitrary size feature vector pixels. Implemented windowed_histogram that generates a windowed histogram of an image. 2014-08-31 16:04:38 +01:00
Steven Silvester a85a8bcd39 Fix #1108 2014-08-31 09:50:25 -05:00
Julien Coste f8a0f27265 hack to avoid circular import when import canny 2014-08-31 15:21:46 +01:00
Geoffrey French f87db0a1ec Fixes a bug in _update_doc in skimage/io/__init__.py that will attempt to compute max of empty list if no plugins are found. 2014-08-31 15:12:01 +01:00
Stefan van der Walt c30db5915a Merge pull request #1121 from Cadair/doc_theme_tweaks
Website font readability improvements.
2014-08-31 15:06:38 +01:00
Stuart Mumford f1a6d2dbf1 Website font readability improvements.
Increase font size by 1%
 Increase character spacing
 Increase font size in code snippets to website standard
2014-08-31 14:53:43 +01:00
Stefan van der Walt 517f9e0740 Merge pull request #1116 from rebeccaroisin/inplace_addition
Speed-up through in-place addition (closes gh-1089)
2014-08-31 13:44:30 +01:00
Julien Coste f86b6212bc Canny is now deprecated and will be in api_changes in v0.13 2014-08-31 12:46:16 +01:00
Julien Coste 936211bbcb move import to avoid infinte recursion (filter import peak that import feature that import filter) 2014-08-31 12:15:47 +01:00
Julien Coste bfcc27587a fix import in filter.__init__ 2014-08-31 11:59:32 +01:00
Julien Coste 218eb4e89e fix import inside documentation and update TODO 2014-08-31 11:48:34 +01:00
Rebecca 812b23d41f making in-place addition modification suggested in issue #1089 2014-08-31 11:37:35 +01:00