Commit Graph

1196 Commits

Author SHA1 Message Date
Josh Warner 8c08a4d468 Merge pull request #1798 from kevin-keraudren/seamcarving-typos
DOC: Fix typos in seam carving example
2015-12-05 11:49:53 -06:00
Steven Silvester 219d08ad7b Fix errant docstring 2015-12-05 10:35:11 -06:00
Kevin Keraudren 817b090c7c text improvement in seam carving example, added some newlines between plt.imshow() and """PLOT2RST""" 2015-12-05 14:23:23 +00:00
Kevin Keraudren bed6f6069b small text improvement in seam carving example 2015-12-05 00:05:18 +00:00
Kevin Keraudren a0c5270e94 text improvement in seam carving example. 2015-12-04 23:54:52 +00:00
Kevin Keraudren e6c60ca890 fixed typos in seam carving example. 2015-12-04 23:10:53 +00:00
Josh Warner 07f18c6067 Merge pull request #1797 from ahojnnes/entr-ex
DOC: Improvements to entropy example
2015-12-04 17:09:12 -06:00
Johannes Schönberger a1d162a4f9 Use more common syntax to assign axis variables 2015-12-04 18:00:38 -05:00
Johannes Schönberger 99484e3a77 Merge pull request #1795 from kevin-keraudren/ransac-linemodel3D
Adding LineModel3D for RANSAC, unit test and example.
2015-12-04 17:58:52 -05:00
Kevin Keraudren 0bdf4251c6 documentation updates; added "3D" to example title 2015-12-04 22:25:13 +00:00
Johannes Schönberger 0e38481ade Improvements to entropy example 2015-12-04 12:45:15 -05:00
Johannes Schönberger bc7e9588e9 Merge pull request #1676 from odebeir/sprint_add_entropy_example
add entropy example
2015-12-04 11:37:47 -05:00
Kevin Keraudren 6a2961fdee we now have the old LineModel with params (dist, theta), and the new LineModelND with params (origin, direction). 2015-12-03 22:03:10 +00:00
Kevin Keraudren 040a53456d Merged LineModel3D with LineModel in order to form a unified model.
- model.params holds the legacy params (2D representation),
 - model.new_params holds the true ND line representation.

The proposed LineModel behaves identically as the implementation in master in the 2D case. In the 3D case, it behaves similarly to the previously proposed LineModel3D, as long as new_params is used instead of params. This implementation thus takes advantage that the 2D case is a special case of the ND general model.
2015-12-02 08:58:16 +00:00
Kevin Keraudren c1c0d18ba1 reformatting code to wrap at 80 characters per line 2015-12-01 14:32:25 +00:00
Kevin Keraudren a606a53875 Adding LineModel3D for RANSAC, unit test and example. 2015-12-01 12:17:22 +00:00
Stefan van der Walt d187840f19 Merge pull request #1746 from sciunto/piwik
DOC: test piwik with piwik.sciunto.org
2015-11-02 16:13:43 -08:00
Emmanuelle Gouillart 856e199cc2 Merge pull request #1704 from MartinSavc/example_subplots_share_axes
Example subplots share axes
2015-11-01 22:26:39 +01:00
Stefan van der Walt a93f30278a Ensure gallery pages are always generated 2015-10-23 22:49:22 -07:00
François Boulogne 605a0270b8 DOC: test piwik with piwik.sciunto.org 2015-10-13 05:38:16 -04:00
martin 4e364c6087 reverted subplot creation to preferred matplotlib style 2015-10-12 18:09:47 +02:00
martin be39c35325 changed subplot creation to preferred matplotlib style 2015-10-12 17:52:43 +02:00
martin 629d6d6abc changed subplot creation to preferred matplotlib style 2015-10-12 17:48:30 +02:00
martin f8e632c6b1 changed subplot creation to preferred matplotlib style 2015-10-12 17:44:02 +02:00
martin 0ffa83113a changed subplot creation to preferred matplotlib style 2015-10-12 17:38:08 +02:00
martin d42b06e69e changed subplot creation to preferred matplotlib style 2015-10-12 16:15:39 +02:00
martin c65b095ec7 added parameters for axes sharing to plt.subplots 2015-10-12 15:58:57 +02:00
martin e7f5dff215 added parameters for axes sharing to plt.subplots 2015-10-12 15:58:57 +02:00
martin ada92ae75e replaced subplots with individual subplot calls
share axes for the related images in subplost 221 and 223
2015-10-12 15:58:57 +02:00
martin bb081ebd0a added sharex, sharey and adjustable parameters to subplots 2015-10-12 15:58:57 +02:00
martin 9fa9c0387c adding axes sharing to displays of related images
for better interaction

sharing achieved by setting sharex and sharey, and
setting the axes 'adjustable' parameter to 'box-forced'
2015-10-12 15:58:57 +02:00
martin 8ff6d2d8e3 changed adjustable parameter of axes to 'box-forced'
this fixes the size of axes around an image for shared axes
2015-10-12 15:58:57 +02:00
martin 681be3fc58 adding shared axes to examples with multiple plots 2015-10-12 15:58:57 +02:00
François Boulogne 811f13c1d6 MAINT: use with to close the file
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
Steven Silvester 9371ae7aa5 Merge pull request #1724 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-21 21:16:22 -05:00
François Boulogne 14588366e5 MAINT: use with to close the file 2015-09-21 21:47:06 -04:00
Steven Silvester 05d0202712 Add notes on how to deploy docs on Travis 2015-09-19 21:19:48 -05:00
François Boulogne 341039fec7 DOC: favicon path relative to source/ 2015-09-17 05:22:01 -04:00
François Boulogne b1c1bdf564 DOC: activate favicon in config 2015-09-16 21:42:33 -04:00
Steven Silvester f20e2c3c1a Fix PYTHON executable and html script 2015-09-15 08:45:03 -05:00
Steven Silvester d2c4ccba59 Build from the right directory and add api to latex command 2015-09-15 07:32:33 -05:00
Steven Silvester da3da0bc29 Add api docs and gallery on Windows build and build docs on Appveyor 2015-09-14 21:35:43 -05:00
Joshua Warner 04fb2e35e7 FIX: Point Windows batch file at source subdir. 2015-09-14 20:08:43 -05:00
Steven Silvester 3345e95a53 Merge pull request #1699 from jwiggins/use-ccache
Enable ccache and Sphinx cache on Travis
2015-09-13 10:31:31 -05:00
John Wiggins 4fe753fd45 Use the current python version for the python intersphinx reference 2015-09-13 12:53:54 +02:00
John Wiggins 7e4c1d2b36 Allow a cache directory to be passed to the docs Makefile 2015-09-07 18:33:55 +02:00
Olivier Debeir 86542c5916 English corrections in entropy example 2015-09-07 09:44:47 +02:00
Emmanuelle Gouillart 33646e0a60 Merge pull request #1690 from sciunto/favicon
[DOC] add favicon
2015-09-06 11:29:45 +02:00
François Boulogne 6094be05f9 [DOC] use favicon generated from skimage-branding 2015-09-06 08:14:17 +02:00
Stefan van der Walt ea6cb117c3 Merge pull request #1697 from blink1073/deploy-docs
Deploy docs on master builds
2015-09-05 22:45:47 -07:00