Commit Graph

75 Commits

Author SHA1 Message Date
Stefan van der Walt cd48712329 Merge branch 'master' of git://github.com/sccolbert/scikits.image into chris 2010-06-24 17:38:49 -07:00
Stefan van der Walt 3c14b965d6 Allow PIL plugin to read grey-level images with alpha layer. 2010-06-08 21:25:14 -06:00
Stefan van der Walt bd7a15ebaf Add imshow to PIL plugin. 2010-06-08 21:25:14 -06:00
Stefan van der Walt 01dca4ef5f Found shorthand for constructing dtype str (thanks, Zach!). 2010-05-14 15:54:05 +02:00
Stefan van der Walt 13199840cd In freeimage plugin, set DummyArray to writable, use correct dtype. 2010-05-14 15:11:57 +02:00
Stefan van der Walt 81b3359590 Use c_void_p to handle (*BYTE) in freeimage plugin. 2010-05-14 14:16:01 +02:00
Stefan van der Walt 0320815b9e Fix freeimage loading via array interface. 2010-05-14 13:53:11 +02:00
Stefan van der Walt 49c03eb448 Try to load both libfreeimage and libFreeImage. 2010-05-14 13:52:41 +02:00
Stefan van der Walt 9c20fd0720 In freeimage plugin, use array_interface for array construction. 2010-05-13 23:05:44 +02:00
Stefan van der Walt d082774977 Add ctypes API for freeimage plugin for use on 64-bit platforms. 2010-05-13 22:28:00 +02:00
Stefan van der Walt 46d3c26a1b In freeimage plugin, fix order of parameters to 'write'. Provide colour images to 'write' as CxMxN arrays. 2010-05-13 17:25:47 +02:00
Stefan van der Walt 0063993965 Wrap long lines in freeimage plugin. 2010-05-13 16:07:27 +02:00
Stefan van der Walt 794402bbb2 Add imread and imsave wrappers to freeimage plugin. 2010-05-13 16:04:03 +02:00
Stefan van der Walt bb9ee08612 Add description file for freeimage plugin. 2010-05-13 16:03:40 +02:00
Stefan van der Walt 91ca44b3a8 Add Zachary's freeimage wrapper. Fix Ctypes loader to use NumPy. 2010-05-13 16:03:15 +02:00
sccolbert 19b5973c44 worked on prettying up scivi. 2009-12-02 20:11:49 +01:00
Stefan van der Walt 0011fd17c6 io: Remove unneccesary import. 2009-11-12 22:34:58 +02:00
Stefan van der Walt 0f604fa07e io: Add null-plugin to simplify testing. 2009-11-12 22:34:19 +02:00
sccolbert 152c6209c8 finished the lut tables 2009-11-10 05:12:23 +01:00
Stefan van der Walt d8709bd0c0 io: Add imsave using PIL. 2009-11-08 23:49:51 +02:00
Stefan van der Walt d9f624959f io: Throw exception when qt plugin can't be loaded. 2009-11-08 22:08:42 +02:00
Stefan van der Walt c539a02b20 io: Fix one more instance of cdivision. 2009-11-08 22:02:15 +02:00
Stefan van der Walt 6c1bbc0297 Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io 2009-11-08 20:30:07 +02:00
sccolbert 625291f361 added division decorators to cython. Improved how data gets chunked up. 2009-11-08 18:35:07 +01:00
Stefan van der Walt 2ac29d6fa8 Merge branch 'threadingio' of git://github.com/sccolbert/scikits.image into io 2009-11-08 11:07:57 +02:00
sccolbert a6de1409e0 added try except to deal with missing multiprocessing. 2009-11-08 09:13:40 +01:00
Stefan van der Walt 67e0cb03ea Merge branch 'io' of git://github.com/sccolbert/scikits.image into io
Conflicts:
	scikits/image/io/_plugins/qt_plugin.py
2009-11-08 09:44:00 +02:00
sccolbert 4beb9eb16b added better logic to the thread dispatcher. 2009-11-08 05:39:02 +01:00
sccolbert 196ab7530a first go at multithreading the mixer. 2009-11-08 05:28:24 +01:00
sccolbert a3737fa34c Added tests for colormixer and histograms. Moved tests up a directory level because
nosetests doesnt see tests in a directory beginning with an _ (_plugins/).
Moved fancy imshow to its own module scivi.py
2009-11-08 02:40:12 +01:00
Stefan van der Walt 1148a47691 io: Add _app_show for matplotlib plugin. 2009-11-08 01:24:20 +02:00
Stefan van der Walt 57a315240d Remove imsave from matplotlib until fixed in their source. 2009-11-08 00:56:38 +02:00
Stefan van der Walt 3c3fa01336 io: Combine qt imports. 2009-11-07 23:41:09 +02:00
Stefan van der Walt ec5bba7682 io: Fix Qt import accidentally removed. 2009-11-07 23:22:06 +02:00
Stefan van der Walt a99339f9d6 Add basic tests for _histograms. 2009-11-07 18:13:02 +02:00
Stefan van der Walt 0cc86e62c5 Merge branch 'io' of git://github.com/sccolbert/scikits.image into io
Conflicts:
	scikits/image/io/_plugins/qt_plugin.py
2009-11-07 17:52:21 +02:00
sccolbert 5bbc0f8de2 removed a dangler. 2009-11-07 16:47:26 +01:00
sccolbert 03129f7bba Added save to variable function using io.push() functionality. 2009-11-07 16:42:08 +01:00
sccolbert ac8dadf1ce added save_to_variable functionality. 2009-11-07 16:10:07 +01:00
sccolbert cc2b9ae634 fixed mouse tracking to not go out of bounds. Added save-to-file. 2009-11-07 14:58:06 +01:00
Stefan van der Walt 775ff607cf Align image to top so that pixel tracking is accurate. 2009-11-07 08:44:02 +02:00
sccolbert 384f801055 Made it so that aspect ratio is maintained on imshow and fancy imshow for
the qt plugin.
2009-11-06 23:11:29 +01:00
sccolbert 983ebd43f9 updated string formatting for slider labels. 2009-11-06 21:12:22 +01:00
sccolbert c4f75b7d47 fixed the gamma correction in the color mixer. 2009-11-06 21:06:23 +01:00
sccolbert ca051a3e98 Finished the refactor of the mixer and the histogram.
Performance is now much better, a bunch of bugs are gone,
and it shouldnt throw anymore exceptions.
2009-11-06 20:40:43 +01:00
sccolbert cf19f11bbb added regular gamma to the mixer, refactored more of fancy imshow. 2009-11-06 17:31:27 +01:00
sccolbert ae9f9cc2ca further progress on the refactoring of the fancy imshow. 2009-11-06 16:19:41 +01:00
sccolbert e21ab2e2ad progress commit 2009-11-06 14:42:46 +01:00
sccolbert 00debb650c added sigmoidal gamma 2009-11-06 13:02:39 +01:00
sccolbert efbaa849dd added histograms to fancy imshow and colormixer.
Unfortunately im suffering from circular references when the window is
initializing. It doesnt crash, but it throws a few exceptions...
A refactor is in order.
2009-11-06 02:24:03 +01:00