Commit Graph
62 Commits
Author SHA1 Message Date
David Koeller d4d3eaa1f1 Remove Picture.scale and Picture._rescale from novice module
The scale and rescale function was never used in the novice module.
These functions are extraneous in a novice code, and have no purpose there.

Also updated tests.
2015-07-12 11:47:07 -05:00
David Koeller d9213bedde Fix notebook display bug for novice module
io.Image was previously removed, but the novice Picture still depended on it.
Now moved the relevant functionality back into the Picture class.
2015-07-12 11:07:21 -05:00
Stefan van der Walt 80ef48ccfa Add spacing in novice model to make docs render correctly 2015-04-11 22:18:34 -07:00
Steven Silvester 0859b3662e Avoid creating an int64 array 2015-01-30 21:01:45 -06:00
Steven Silvester 2c635989d2 Force novice.Picture.from_size to return a uint8 image
Force Picure.from_size to return a uint8 image

Remove img_as_ubyte
2015-01-30 19:42:55 -06:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Johannes Schönberger 451d8aa697 Fix novice module with new dtype behavior 2014-12-23 12:44:16 +01:00
Johannes Schönberger 3a1079a180 Misc PEP8 fixes 2014-12-14 02:56:14 +01:00
Johannes Schönberger 739dca0201 Fix novice doc test 2014-04-12 09:57:51 -04:00
Michael Hansen f84cce3238 Convert incoming novice images to ubyte 2014-03-26 08:48:10 -04:00
Michael Hansen aa8cc0af40 Merged with ahojnnes novice 2014-03-19 20:58:44 -04:00
Johannes Schönberger f871c4024f Extract changes by @synesthesiam in PR #797 2014-03-19 17:47:49 -04:00
Michael Hansen 8321c84e63 Merged with master 2014-03-17 08:40:58 -04:00
Neeraj Gangwar 1d133e5c17 made minor changes in syntax
1. merged is_url and file_or_url_context in one import statement
2. changed syntax to check if path is a URL. now more compact
2014-03-13 18:42:12 +05:30
Neeraj Gangwar 0bfdda58e5 removed unnecessary imports from _novice.py 2014-03-12 17:55:54 +05:30
Neeraj Gangwar 7880453d42 changed the method of fetching images in Picture class
using file_or_url_context to get context and calling imread
and imghdr on returned context
2014-03-12 15:57:32 +05:30
Neeraj Gangwar dc85186e19 corrected syntax for error handling while fetching image from
a URL in class Picture
2014-03-12 13:05:53 +05:30
Neeraj Gangwar 70ca1495cb changed urlparse library from six.moves.urllib_parse
to six.moves.urllib.parse
2014-03-12 08:48:23 +05:30
Neeraj Gangwar 2f3bd464b8 added a dummy useragent in Picture class while fetching image
using URL.
2014-03-12 08:00:53 +05:30
Neeraj Gangwar 15893a3ed0 changed the method of checking if a string is URL
1. removed regex code which was used earlier to check if a string is
url. (regex code taken from django)
2. Now checking if a string starts with http(s) or ftp(s).
2014-03-12 00:29:19 +05:30
Neeraj Gangwar 654642c986 changed test url in example for the Picture(object) 2014-03-11 22:35:07 +05:30
Neeraj Gangwar 1fd34b4751 added description and exmaple for new functionality
of fetching images of url
2014-03-11 21:53:47 +05:30
Neeraj Gangwar 9557c8dde1 added a functionality to fetch images from URL in _novice.py 2014-03-11 21:49:21 +05:30
JDWarner 98ff6e5f20 FIX: Specify field index for Python 2.6 compatible use of str.format() 2013-11-20 15:45:54 -06:00
Michael Hansen 1312670d56 Merged with upstream 2013-11-20 14:01:42 -05:00
Michael Hansen 695da41841 Removed extraneous trys for six imports 2013-11-20 14:00:46 -05:00
Michael Hansen f11ef60c35 Fixed import of urlparse and rebase on upstream 2013-10-29 09:43:52 -04:00
Michael Hansen 522778b214 Trying to get imports working with both Python 2 and 3 2013-10-28 10:29:20 -04:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Michael Hansen 1d6531aa04 Fixed Python 3 import errors, added alpha and rgba properties 2013-10-23 16:28:41 -04:00
Michael Hansen 9d91751ed9 Switching to RGBA 2013-10-23 15:44:50 -04:00
Michael Hansen f5c68531ab Novice module can open images from a url 2013-10-22 13:07:16 -04:00
Tony S Yu e794aed012 Add support for non-unit step 2013-10-21 23:02:51 -05:00
Tony S Yu 6ce788a5d3 Add support for negative indexes/slices. 2013-10-21 23:02:51 -05:00
Tony S Yu 8f506be2ea Fix Py3 range incompatibilities 2013-10-21 23:02:51 -05:00
Tony S Yu 20ad4bbca9 Fix the same Py3 incompatibility in a different place 2013-10-21 23:02:51 -05:00
Tony S Yu 555d245a2f Fix display in IPython notebook 2013-10-21 23:02:50 -05:00
Tony S Yu 4682f44d42 Ensure that image shows when not run interactively 2013-10-21 23:02:50 -05:00
Tony S Yu 7ba0540ec3 Simplify docstrings 2013-10-21 23:02:50 -05:00
Tony S Yu 3c33965b99 Add docstring for arrays 2013-10-21 23:02:50 -05:00
Tony S Yu be1d81f3fc Simplify interface 2013-10-21 23:02:49 -05:00
Tony S Yu d177aa6c16 Replace use of elephant pic with Chelsea the cat 2013-10-21 23:02:49 -05:00
Tony S Yu 51c3d23b2e Fix doctests and cleanup reprs 2013-10-21 23:02:49 -05:00
Tony S Yu f1e0197753 Remove PixelGroup and just return a Picture 2013-10-21 23:02:49 -05:00
Tony S Yu 59375f2240 Rename for clarity 2013-10-21 23:02:49 -05:00
Tony S Yu 35a9cd4067 Fix setter for xy_array and reuse. 2013-10-21 23:02:49 -05:00
Tony S Yu 19a9e72ec7 Remove PixelGroup dependence on pic and key attrs 2013-10-21 23:02:49 -05:00
Tony S Yu cedfa8c7d4 Make xy_array public 2013-10-21 23:02:49 -05:00
Tony S Yu a5ad214c4b Move key validation for clarity 2013-10-21 23:02:48 -05:00
Tony S Yu 12e2a2543e Move methods from PixelGroup to Picture parent class 2013-10-21 23:02:48 -05:00