Commit Graph

5928 Commits

Author SHA1 Message Date
François Boulogne 5ce5f283d0 delete duplicated import 2013-06-20 22:23:04 +02:00
François Boulogne 33bbda17c1 s/int/long memory view 2013-06-20 22:17:23 +02:00
François Boulogne d23469de80 use memoryview 2013-06-20 21:10:47 +02:00
François Boulogne 73f6585d28 Hough transform for ellipses 2013-06-20 16:08:53 +02:00
Tony S Yu 43074f662f Merge pull request #590 from sciunto/python3fix
few Python3 fixes
2013-06-20 04:40:54 -07:00
Tony S Yu 28c8a9b93d Merge pull request #593 from ahojnnes/rebase-workflow
Rebase workflow
2013-06-20 04:33:25 -07:00
François Boulogne 3926f1873d use items/values for python2/3 compat 2013-06-20 11:16:23 +02:00
Johannes Schönberger d7843529b5 Merge pull request #4 from tonysyu/rebase-workflow-edits
Tweak Sphinx rendering of contribution page
2013-06-19 20:46:25 -07:00
Tony S Yu 5efe571bbd Tweak Sphinx rendering of contribution page 2013-06-19 21:24:47 -05:00
Tony S Yu 20401d3e12 Change color definitions from ini file to python module
This simplifies the code and allows users to use either `color_dict` or module
variables, e.g., `rgb_colors.white`.
2013-06-19 19:31:47 -05:00
Josh Warner (Mac) 20ae0a1ca2 FEAT: Generalized n-dimensional array padding
This PR exposes NumPy 1.8+ padding functionality to all
users of scikit-image, regardless of their personal NumPy
version.

The improved (much better scaling with dimensionality)
version introduced in NumPy 1.8 is used.
2013-06-19 09:10:06 -05:00
Ankit Agrawal 566006bdaf Removing hard-coding in BRIEF code 2013-06-18 03:18:38 +08:00
Ankit Agrawal a1df85d511 Allowing arbitrary descriptor sizes in BRIEF 2013-06-18 01:07:07 +08:00
Johannes Schönberger 752e860d3d Use long parameter version --force rather than -f 2013-06-17 16:40:28 +02:00
Johannes Schönberger 8e4c11cf48 Add additional advice about rebasing 2013-06-17 16:39:35 +02:00
Johannes Schönberger 1eb841d116 Fix typo 2013-06-17 16:16:13 +02:00
Johannes Schönberger b5fbca3f00 Change branch name for consistency across guidelines 2013-06-16 21:26:18 +02:00
Johannes Schönberger fa72a20cdc Refactor contribution workflow 2013-06-16 21:18:39 +02:00
Ankit Agrawal d67f7008cf First quick implementation of BRIEF Feature descriptor 2013-06-16 01:54:55 +08:00
François Boulogne cc249baa6c fix iteritems for python3 compat 2013-06-13 14:06:23 +02:00
François Boulogne 7cf20736b9 workaround for itervalues 2013-06-13 13:58:21 +02:00
François Boulogne 5908542421 fix import urllib2 for python3 2013-06-13 13:26:33 +02:00
François Boulogne 71601a2bde fix path import viewers 2013-06-13 13:17:57 +02:00
Johannes Schönberger 79a5ab0e12 Merge pull request #589 from sciunto/configparser
import configparser for python3
2013-06-12 14:27:22 -07:00
François Boulogne 9042fcd85c import configparser for python3 2013-06-12 22:34:04 +02:00
Johannes Schönberger 2ac42c4619 Merge pull request #587 from sciunto/import
MIN: fix unused import
2013-06-12 13:23:28 -07:00
Josh Warner 026ca77cfa Merge pull request #588 from sciunto/range
FIX: cast range to list for python3 compatibility
2013-06-12 13:22:34 -07:00
François Boulogne 755ba9e605 MIN: remove unnecessary brackets 2013-06-12 22:08:43 +02:00
François Boulogne 00f387ed81 minor contrib. 2013-06-12 22:08:07 +02:00
François Boulogne cf4b83b76f cast range to list for python3 2013-06-12 22:03:25 +02:00
Johannes Schönberger 2ed9fc9f4d Merge pull request #586 from sciunto/print
MIN: use print() instead of print
2013-06-12 12:57:13 -07:00
François Boulogne 93f92e6a83 fix blank print for python2 2013-06-12 21:40:53 +02:00
Johannes Schönberger 37a76c8c41 Merge pull request #585 from ankit-maverick/typos
Correcting typo in the reference section of adjust_sigmoid
2013-06-12 12:40:15 -07:00
François Boulogne e258e05468 MIN: fix unused import 2013-06-12 21:36:28 +02:00
François Boulogne eb9de1d7eb MIN: use print() instead of print 2013-06-12 21:16:23 +02:00
Ankit Agrawal 3e544d7fac Adding author and name of the paper in reference section of adjust_sigmoid 2013-06-12 18:11:40 +08:00
Ankit Agrawal 2c0e20f972 Correcting typo in the reference section of adjust_sigmoid. 2013-06-12 16:32:15 +08:00
Ankit Agrawal 884ac317c8 Correcting typo in the reference section of adjust_sigmoid 2013-06-12 16:31:13 +08:00
Johannes Schönberger f07467b176 Merge pull request #505 from ankit-maverick/gammaCorrect
Implementation of Pixelwise Image correction methods
2013-06-11 10:21:09 -07:00
Johannes Schönberger 8c2c69a2f4 Merge pull request #583 from josteinbf/radon-example-axes-fix
Radon transform example: Correct axis labels
2013-06-10 12:46:07 -07:00
Jostein Bø Fløystad 89e6215241 Radon transform example: Remove semicolons. 2013-06-09 21:32:38 +02:00
Johannes Schönberger 61d7a0b658 Merge pull request #570 from stefanv/bento_hookfile
BLD: Remove reference to Bento HookFile.
2013-06-09 12:19:57 -07:00
Jostein Bø Fløystad fcec46eb0d Radon transform example: Correct axis labels 2013-06-09 19:29:53 +02:00
Ankit Agrawal 04625ebabf Final stylistic changes in exposure.py 2013-06-10 00:32:22 +08:00
Tony S Yu 0a8ff1b364 Fix docstring for CollectionViewer slider. 2013-06-09 05:38:08 -05:00
Tony S Yu afd1b1b835 Fix display of overlay plugin when original image is updated 2013-06-08 19:24:50 -05:00
Tony S Yu a6293fd84b Add example of connecting plugins to CollectionViewer 2013-06-08 19:11:33 -05:00
Tony S Yu cc2f1854b5 Fix plugin interaction with CollectionViewer
* Signal updates to original image when image changed in CollectionViewer.
* Update plugin arguments for the filter.
* Also fixes image updates when opening a new image from the file menu.
2013-06-08 19:06:23 -05:00
Stefan van der Walt f20286b696 Merge pull request #581 from ankit-maverick/subtract
STY: Replacing every occurence of ``substract*`` with ``subtract*``.
2013-06-06 21:47:41 -07:00
Ankit Agrawal 8ecadf175c Replacing every occurence of substract* with subtract* 2013-06-07 11:16:26 +08:00