From: Josh Blum <josh@joshknows.com>
Date: Sun, 10 Jan 2010 09:03:11 +0000 (-0800)
Subject: fixed issue 387: removed uses of win.set for wx sinks
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a549bd11646f60d425a74d530b8f3ddfc4774202;p=debian%2Fgnuradio

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 40b1c54d..c9ecb032 100755
--- 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 0b31a00d..782ecb66 100755
--- 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 4733027c..8718a8f6 100755
--- 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 1e8cf89e..4276e389 100755
--- 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 4aa70ada..ab7fb446 100755
--- 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 5391863a..1596fa00 100755
--- 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