Merge remote branch 'nldudok1/gr-wxgui_emulate_analog' into master

[debian/gnuradio] / gr-wxgui / src / python / fftsink_gl.py

diff --git a/gr-wxgui/src/python/fftsink_gl.py b/gr-wxgui/src/python/fftsink_gl.py
index 564764487ea3fccb49f26f429a548e27e3ae5e96..0d725ea14b3063a25f71b121cfd8965d84de63cf 100644 (file)
--- a/gr-wxgui/src/python/fftsink_gl.py
+++ b/gr-wxgui/src/python/fftsink_gl.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2008,2009 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -53,8 +53,10 @@ class _fft_sink_base(gr.hier_block2, common.wxgui_hb):
                title='',
                size=fft_window.DEFAULT_WIN_SIZE,
                peak_hold=False,
+               win=None,
                 emulate_analog=False,
                 analog_alpha=None,
+               **kwargs #do not end with a comma
        ):
                #ensure avg alpha
                if avg_alpha is None: avg_alpha = 2.0/fft_rate
@@ -82,6 +84,7 @@ class _fft_sink_base(gr.hier_block2, common.wxgui_hb):
                        ref_scale=ref_scale,
                        avg_alpha=avg_alpha,
                        average=average,
+                       win=win,
                )
                msgq = gr.msg_queue(2)
                sink = gr.message_sink(gr.sizeof_float*fft_size, msgq, True)