Commit Graph

3749 Commits

Author SHA1 Message Date
Josh Warner 0295d54235 Merge pull request #656 from josteinbf/doc-makefile
ENH: Increase configurability of doc/Makefile
2013-07-15 06:58:30 -07:00
Jostein Bø Fløystad 8796262b0b doc: Allow specifying python binary. 2013-07-15 14:01:10 +02:00
Jostein Bø Fløystad 7e9ae43ae9 docs: Makefile respects variables from environment. 2013-07-15 13:57:35 +02:00
Johannes Schönberger dc27babee2 Merge pull request #546 from jni/3d-slic
Add support for 3D images in SLIC segmentation
2013-07-14 23:50:38 -07:00
Juan Nunez-Iglesias 8736a66504 Fix typo using assert_raises in test_colorconv.py 2013-07-13 09:49:38 +10:00
Juan Nunez-Iglesias 858f7411d7 Complete test_regular_grid coverage 2013-07-13 01:34:51 +02:00
Juan Nunez-Iglesias 6221ce6e3b Add test coverage for guess_spatial_dimensions() 2013-07-13 01:27:17 +02:00
Juan Nunez-Iglesias f0ecc4d00d Rename regular_grid.py 2013-07-12 18:28:11 +02:00
Juan Nunez-Iglesias e80dd18d7e Add tests for 'regular_grid()' 2013-07-12 18:26:11 +02:00
Johannes Schönberger f11d5a1c8d Merge pull request #652 from josteinbf/local-binary-pattern-example
examples: Avoid python3-specific syntax.
2013-07-12 04:17:15 -07:00
Jostein Bø Fløystad 09cfe0b929 examples: Avoid python3-specific syntax.
from __future__ import ... is ineffective when the example script is
exec-ed by sphinx, resulting in a SyntaxError when running under
python2.

Fixes gh-649.
2013-07-12 12:52:26 +02:00
Stefan van der Walt 8927147e2c Merge pull request #645 from josteinbf/iradon-sart-docstring
iradon_sart: Format docs correctly.
2013-07-10 05:51:17 -07:00
Johannes Schönberger a50892460c Merge pull request #648 from stefanv/ransac_faulty_cast
Fix casting in ransac example.
2013-07-10 04:33:23 -07:00
Stefan van der Walt 89c9b6161d Fix casting in ransac example. 2013-07-10 12:45:22 +02:00
Stefan van der Walt 8c4b31e28c Merge pull request #646 from ahojnnes/travis-bento
Let travis-ci check bento.info.
2013-07-10 03:39:39 -07:00
Jostein Bø Fløystad 4d307f5315 iradon_sart: Fix docstring typo. 2013-07-09 11:44:28 +02:00
Jostein Bø Fløystad 1cc42bd943 iradon_sart: Reformat references. 2013-07-09 11:44:03 +02:00
Johannes Schönberger 0156593fb6 Let travis-ci check bento.info 2013-07-08 20:50:44 +02:00
Johannes Schönberger dd9f6a16ab Merge pull request #643 from stefanv/bento_fixes
Fix Bento build.
2013-07-08 11:41:09 -07:00
Stefan van der Walt 5f62ad55a0 Merge pull request #614 from tonysyu/doc/local-binary-pattern
Add explanation to LBP example.
2013-07-08 06:52:15 -07:00
Jostein Bø Fløystad 18a06a0add iradon_sart: Format docs correctly. 2013-07-08 14:50:06 +02:00
Juan Nunez-Iglesias 48d78c09d9 Improve doc for regular_grid.py 2013-07-08 14:41:42 +02:00
Stefan van der Walt 1b4cf9f76d Fix Bento build. 2013-07-08 13:14:08 +02:00
Stefan van der Walt 47a0cd1a3f Merge pull request #642 from sciunto/convex_hull_ex
Doc: Convex hull example. Improvement.
2013-07-08 03:41:22 -07:00
François Boulogne acdfd8bc71 simplify modification image + comment 2013-07-07 12:21:34 +02:00
François Boulogne 7048a9c995 add original picture 2013-07-07 12:05:30 +02:00
Emmanuelle Gouillart f3b1b39158 Merge pull request #635 from josteinbf/radon-cleanup
Clean up radon and iradon to improve readability
2013-07-06 12:14:25 -07:00
Jostein Bø Fløystad bea50aa608 iradon: use util.pad for sinogram padding. 2013-07-06 20:55:54 +02:00
Jostein Bø Fløystad b3746b9090 iradon: Cleanup by locating related code in one place. 2013-07-06 20:55:54 +02:00
Jostein Bø Fløystad 643a1bc1f5 iradon: Add test for cubic interpolation. 2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad b90ba783ef iradon: Only allow interpolation methods working well.
Of the interpolation methods provided by scipy.interpolate.interp1d,
only cubic has been found to work well with the tests in skimage (other
methods are either identical to linear or nearest, or they produce bad
reconstructions).
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad 2be327815e radon: Use numpy.interp/scipy.interpolate.
Scipy supports all interpolation kinds (nearest, linear) we need, while
numpy supports only linear interpolation. The numpy interpolation is
substantially faster, so this is used even though it complicates the
code slightly.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad 5955e4e612 iradon: Reduce code duplication. 2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad ac460a9777 iradon: Use util.pad for array padding.
This depends on util.pad accepting 0s in pad_width, which has a proposed
solution in gh-634.
2013-07-06 20:55:53 +02:00
Jostein Bø Fløystad 237fb989b0 radon: Use util.pad for array padding. 2013-07-06 20:55:53 +02:00
Josh Warner 6edd707a1b Merge pull request #637 from sciunto/minorfix
STYLE : PEP8 + import fix in hough_transform tests
2013-07-06 11:06:48 -07:00
Emmanuelle Gouillart 15ed7bdf59 Merge pull request #584 from josteinbf/iradon-algebraic
SART algorithm for tomography reconstruction
2013-07-06 10:24:24 -07:00
Josh Warner bf26ce7fae Merge pull request #640 from sciunto/missingdoc
DOCFIX: add docstrings to Cython grayscale dilate/erode & make them private funcs
2013-07-06 07:16:09 -07:00
François Boulogne cf3efba3c1 use previous import 2013-07-06 16:12:09 +02:00
François Boulogne de9d2662b1 MIN: fix pep8 2013-07-06 14:45:54 +02:00
François Boulogne f316abbfbe DOC: add doctrings 2013-07-06 14:34:55 +02:00
François Boulogne e74b971335 erode & dilate -> private functions 2013-07-06 14:30:17 +02:00
François Boulogne 2dfeab83df PEP8 + import 2013-07-06 13:49:01 +02:00
Tony S Yu 516d6efa5d Fix Python 3 incompatibility (also, some wording tweaks) 2013-07-06 00:55:51 -05:00
Josh Warner e5e0c73755 Merge pull request #634 from josteinbf/arraypad-zeros
arraypad: allow padding with zero entries (i.e. no padding).
2013-07-05 07:33:10 -07:00
Jostein Bø Fløystad 794a4d7dae arraypad: allow padding with zero entries (i.e. no padding). 2013-07-05 14:29:09 +02:00
Jostein Bø Fløystad 553767122b Add SART to contributors. 2013-07-05 13:36:55 +02:00
Jostein Bø Fløystad 3cdfeccc7a iradon_sart: flip signs to reflect changes to radon.
The changes to radon were introduced in gh-596.
2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad af47941435 iradon_sart: fix comment spelling. 2013-07-05 13:14:39 +02:00
Jostein Bø Fløystad f2790d658c iradon_sart: redefine projection center.
This reflects the bugfixes related to issue gh-592 implemented in
gh-596.
2013-07-05 13:14:39 +02:00