fixed issue 387: removed uses of win.set for wx sinks

diff --git a/gr-gpio/src/python/gpio_usrp_fft.py b/gr-gpio/src/python/gpio_usrp_fft.py
index 40b1c54d4a76fbd190ff671dfbf40657ce76bf41..c9ecb032ddeebfd324bbdd4f8fa8ef8e75821802 100755 (executable)
--- a/gr-gpio/src/python/gpio_usrp_fft.py
+++ b/gr-gpio/src/python/gpio_usrp_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -279,7 +279,7 @@ class app_top_block(stdgui2.std_top_block):
                 self.myform['baseband'].set_value(r.baseband_freq)
                 self.myform['ddc'].set_value(r.dxc_freq)
            if not self.options.waterfall and not self.options.oscilloscope:
-               self.scope.win.set_baseband_freq(target_freq)
+               self.scope.set_baseband_freq(target_freq)
            return True
 
         return False

diff --git a/gr-msdd6000/src/python-examples/new_msdd_fft.py b/gr-msdd6000/src/python-examples/new_msdd_fft.py
index 0b31a00d9faf5aa86bbe7d9cb6686ec6b437099b..782ecb66e2a1156f4c1c6038c2292ab2fe5d6875 100755 (executable)
--- a/gr-msdd6000/src/python-examples/new_msdd_fft.py
+++ b/gr-msdd6000/src/python-examples/new_msdd_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -245,7 +245,7 @@ class app_top_block(stdgui2.std_top_block):
 #                self.myform['baseband'].set_value(r.baseband_freq)
 #                self.myform['ddc'].set_value(r.dxc_freq)
            if not self.options.waterfall and not self.options.oscilloscope:
-               self.scope.win.set_baseband_freq(target_freq)
+               self.scope.set_baseband_freq(target_freq)
            return True
 
         return False

diff --git a/gr-radio-astronomy/src/python/ra_fftsink.py b/gr-radio-astronomy/src/python/ra_fftsink.py
index 4733027c101599751b185c48c5dae192289884b6..8718a8f67be663a2467b36dba115e452cc0602ab 100755 (executable)
--- a/gr-radio-astronomy/src/python/ra_fftsink.py
+++ b/gr-radio-astronomy/src/python/ra_fftsink.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2003,2004,2005,2007 Free Software Foundation, Inc.
+# Copyright 2003,2004,2005,2007,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -82,7 +82,7 @@ class ra_fft_sink_base(object):
         self.peak_hold = enable
         if enable:
             self.set_average(False)
-        self.win.set_peak_hold(enable)
+        self.set_peak_hold(enable)
 
     def set_autoscale(self, auto):
         self.autoscale = auto

diff --git a/gr-utils/src/python/usrp2_fft.py b/gr-utils/src/python/usrp2_fft.py
index 1e8cf89ea9f57c15785e59dcbabc773f5526654a..4276e389ac7a98d27e91f74087b0261b41f078f4 100755 (executable)
--- a/gr-utils/src/python/usrp2_fft.py
+++ b/gr-utils/src/python/usrp2_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -218,7 +218,7 @@ class app_top_block(stdgui2.std_top_block):
                 self.myform['baseband'].set_value(r.baseband_freq)
                 self.myform['ddc'].set_value(r.dxc_freq)
            if not self.options.oscilloscope:
-               self.scope.win.set_baseband_freq(target_freq)
+               self.scope.set_baseband_freq(target_freq)
            return True
 
         return False

diff --git a/gr-utils/src/python/usrp_fft.py b/gr-utils/src/python/usrp_fft.py
index 4aa70adab9e3bb9085136ca26a046a9e6edc4e61..ab7fb44622112d65ecdfe246d3efe8fe66e16001 100755 (executable)
--- a/gr-utils/src/python/usrp_fft.py
+++ b/gr-utils/src/python/usrp_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -255,7 +255,7 @@ class app_top_block(stdgui2.std_top_block):
                 self.myform['baseband'].set_value(r.baseband_freq)
                 self.myform['ddc'].set_value(r.dxc_freq)
            if not self.options.oscilloscope:
-               self.scope.win.set_baseband_freq(target_freq)
+               self.scope.set_baseband_freq(target_freq)
            return True
 
         return False

diff --git a/usrp2/host/apps/stdin_int32_fft.py b/usrp2/host/apps/stdin_int32_fft.py
index 5391863a5515647c3e4cbd758eaadd7af034fad9..1596fa00deab86dbffdcb1c6318a55c1ccc69c7f 100755 (executable)
--- a/usrp2/host/apps/stdin_int32_fft.py
+++ b/usrp2/host/apps/stdin_int32_fft.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2004,2005,2007,2008 Free Software Foundation, Inc.
+# Copyright 2004,2005,2007,2008,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -152,7 +152,7 @@ class app_top_block(stdgui2.std_top_block):
         if True:
             self.myform['freq'].set_value(target_freq)     # update displayed value
            if not self.options.waterfall and not self.options.oscilloscope:
-               self.scope.win.set_baseband_freq(target_freq)
+               self.scope.set_baseband_freq(target_freq)
            return True
 
         return False