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

[jblum]

Author: jblum
Date: 2008-08-14 16:07:44 -0600 (Thu, 14 Aug 2008)
New Revision: 9294

Modified:
   gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
   gnuradio/trunk/gr-wxgui/src/python/scopesink_gl.py
Log:
constsink in scope wrapper (backwards compadible)

Modified: gnuradio/trunk/gr-wxgui/src/python/scopesink2.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-14 19:53:37 UTC 
(rev 9293)
+++ gnuradio/trunk/gr-wxgui/src/python/scopesink2.py    2008-08-14 22:07:44 UTC 
(rev 9294)
@@ -29,7 +29,7 @@
     style = 'nongl'
 
 if style == 'nongl':
-    from scopesink_nongl import scope_sink_f, scope_sink_c
+    from scopesink_nongl import scope_sink_f, scope_sink_c, constellation_sink
 elif style == 'gl':
     try:
         import wx.glcanvas
@@ -41,4 +41,4 @@
     except ImportError:
         raise RuntimeError("Unable to import OpenGL. Are Python wrappers for 
OpenGL installed?")
 
-    from scopesink_gl import scope_sink_f, scope_sink_c
+    from scopesink_gl import scope_sink_f, scope_sink_c, constellation_sink

Modified: gnuradio/trunk/gr-wxgui/src/python/scopesink_gl.py
===================================================================
--- gnuradio/trunk/gr-wxgui/src/python/scopesink_gl.py  2008-08-14 19:53:37 UTC 
(rev 9293)
+++ gnuradio/trunk/gr-wxgui/src/python/scopesink_gl.py  2008-08-14 22:07:44 UTC 
(rev 9294)
@@ -129,9 +129,9 @@
 
 #backwards compadible wrapper (maybe only grc uses this)
 class constellation_sink(scope_sink_c):
-       def __init__(self, **kwargs):
-               kwargs['xy_mode'] = True
-               scope_sink_c.__init__(self, **kwargs)
+       def __init__(self, *args, **kwargs):
+               scope_sink_c.__init__(self, *args, **kwargs)
+               self.set_scope_xy_mode(True)
 
 # ----------------------------------------------------------------
 # Stand-alone test application