[Commit-gnuradio] r9315 - gnuradio/trunk/gr-wxgui/src/python

[jcorgan]

Author: jcorgan
Date: 2008-08-18 14:44:41 -0600 (Mon, 18 Aug 2008)
New Revision: 9315

Modified:
   gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
   gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
   gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py
Log:
Make gl selection more robust for testing

Modified: gnuradio/trunk/gr-wxgui/src/python/fftsink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2008-08-18 19:55:14 UTC 
(rev 9314)
+++ gnuradio/trunk/gr-wxgui/src/python/fftsink2.py      2008-08-18 20:44:41 UTC 
(rev 9315)
@@ -25,12 +25,9 @@
 style = p.get_string('wxgui', 'style', 'auto')
 
 # In 3.2 we'll change 'auto' to mean 'gl' if possible, then fallback
-if style == 'auto':
-    style = 'nongl'
+# Currently, anything other than 'gl' means 'nongl'
 
-if style == 'nongl':
-    from fftsink_nongl import fft_sink_f, fft_sink_c
-elif style == 'gl':
+if style == 'gl':
     try:
         import wx.glcanvas
     except ImportError:
@@ -42,3 +39,6 @@
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
 
     from fftsink_gl import fft_sink_f, fft_sink_c
+
+else:
+    from fftsink_nongl import fft_sink_f, fft_sink_c

Modified: gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-18 19:55:14 UTC 
(rev 9314)
+++ gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-18 20:44:41 UTC 
(rev 9315)
@@ -25,12 +25,9 @@
 style = p.get_string('wxgui', 'style', 'auto')
 
 # In 3.2 we'll change 'auto' to mean 'gl' if possible, then fallback
-if style == 'auto':
-    style = 'nongl'
+# Currently, anything other than 'gl' means 'nongl'
 
-if style == 'nongl':
-    from scopesink_nongl import scope_sink_f, scope_sink_c, constellation_sink
-elif style == 'gl':
+if style == 'gl':
     try:
         import wx.glcanvas
     except ImportError:
@@ -42,3 +39,6 @@
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
 
     from scopesink_gl import scope_sink_f, scope_sink_c, constellation_sink
+
+else:
+    from scopesink_nongl import scope_sink_f, scope_sink_c, constellation_sink

Modified: gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py        2008-08-18 
19:55:14 UTC (rev 9314)
+++ gnuradio/trunk/gr-wxgui/src/python/waterfallsink2.py        2008-08-18 
20:44:41 UTC (rev 9315)
@@ -25,12 +25,9 @@
 style = p.get_string('wxgui', 'style', 'auto')
 
 # In 3.2 we'll change 'auto' to mean 'gl' if possible, then fallback
-if style == 'auto':
-    style = 'nongl'
+# Currently, anything other than 'gl' means 'nongl'
 
-if style == 'nongl':
-    from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c
-elif style == 'gl':
+if style == 'gl':
     try:
         import wx.glcanvas
     except ImportError:
@@ -42,3 +39,6 @@
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
 
     from waterfallsink_gl import waterfall_sink_f, waterfall_sink_c
+
+else:
+    from waterfallsink_nongl import waterfall_sink_f, waterfall_sink_c