From 4df00cb005aaa2e9887967cd8d9afc002a85bdf4 Mon Sep 17 00:00:00 2001
From: Stefan van der Walt <stefan@sun.ac.za>
Date: Sun, 1 Nov 2009 23:19:49 +0200
Subject: [PATCH] io: qt4: Use prepare_for display. Add demo snippet.

---
 scikits/image/io/qt_plugin.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/scikits/image/io/qt_plugin.py b/scikits/image/io/qt_plugin.py
index 51a59c1e..fd47eb86 100644
--- a/scikits/image/io/qt_plugin.py
+++ b/scikits/image/io/qt_plugin.py
@@ -1,4 +1,6 @@
 import plugin
+from _plugin_util import prepare_for_display
+
 import numpy as np
 import sys
 
@@ -35,16 +37,11 @@ else:
     def show(arr, block=True):
         global app
 
-        arr = np.ascontiguousarray(arr.astype(np.uint8))
-        if arr.ndim != 3:
-            raise ValueError("Qt only displays colour images.")
-
-        if arr.shape[-1] == 4:
-            raise ValueError("Alpha channels not yet supported.")
-
         if not '-qt4thread' in sys.argv and app is None:
             app = QApplication([])
 
+        arr = prepare_for_display(arr)
+
         iw = ImageWindow(arr)
         iw.show()
 
@@ -55,3 +52,15 @@ else:
             app.exec_()
 
     plugin.register('qt', show=show)
+
+if __name__ == "__main__":
+    import scikits.image.io as io
+
+    io.plugin.use('qt', 'show')
+
+    img = np.empty((200, 200, 3), dtype=np.uint8)
+    img[:50, :50, 0] = 100
+    img[25:100, 25:100, 1] = 200
+    img[:, :, 2] = 155
+    io.imshow(img, block=False)
+    io.imshow(img)