constsink in scope wrapper (backwards compadible)

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9294 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-wxgui/src/python/scopesink2.py b/gr-wxgui/src/python/scopesink2.py
index 4d9f33afcde0c23a6c2e7eaeaceba52e813e1d7e..8888b6f3adf50c2e0752927d5bd7d973e8364932 100644 (file)
--- a/gr-wxgui/src/python/scopesink2.py
+++ b/gr-wxgui/src/python/scopesink2.py
@@ -29,7 +29,7 @@ if style == 'auto':
     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 @@ elif style == 'gl':
     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

diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py
index 851e43d3297852861c985a764223aae12fe67c85..8236708b360aca7d0cbd0c0ea49efbd4334f3dd2 100644 (file)
--- a/gr-wxgui/src/python/scopesink_gl.py
+++ b/gr-wxgui/src/python/scopesink_gl.py
@@ -129,9 +129,9 @@ class scope_sink_c(_scope_sink_base):
 
 #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