[Commit-gnuradio] r9157 - gnuradio/branches/features/experimental-gui

[jcorgan]

Author: jcorgan
Date: 2008-08-03 00:12:20 -0600 (Sun, 03 Aug 2008)
New Revision: 9157

Modified:
   gnuradio/branches/features/experimental-gui/const_top_block.py
   gnuradio/branches/features/experimental-gui/fft_top_block.py
   gnuradio/branches/features/experimental-gui/pubsub.py
Log:
Make proxy newkey default to given key

Modified: gnuradio/branches/features/experimental-gui/const_top_block.py
===================================================================
--- gnuradio/branches/features/experimental-gui/const_top_block.py      
2008-08-03 06:07:06 UTC (rev 9156)
+++ gnuradio/branches/features/experimental-gui/const_top_block.py      
2008-08-03 06:12:20 UTC (rev 9157)
@@ -128,13 +128,13 @@
                     self._const, self._sink)
 
         self.subscribe('decim', self._set_decim)
-        self.proxy('gain', self._u, 'gain')
-        self.proxy('freq', self._u, 'freq')
-        self.proxy('sample_rate', self._const, 'sample_rate')
-        self.proxy('costas_alpha', self._const, 'costas_alpha')
-        self.proxy('costas_beta', self._const, 'costas_beta')
-        self.proxy('gain_mu', self._const, 'gain_mu')
-        self.proxy('gain_omega', self._const, 'gain_omega')
+        self.proxy('gain', self._u)
+        self.proxy('freq', self._u)
+        self.proxy('sample_rate', self._const)
+        self.proxy('costas_alpha', self._const)
+        self.proxy('costas_beta', self._const)
+        self.proxy('gain_mu', self._const)
+        self.proxy('gain_omega', self._const)
         self.publish('queue', lambda : self._msgq)
 
        self._thread = _const_thread(self._msgq, self)

Modified: gnuradio/branches/features/experimental-gui/fft_top_block.py
===================================================================
--- gnuradio/branches/features/experimental-gui/fft_top_block.py        
2008-08-03 06:07:06 UTC (rev 9156)
+++ gnuradio/branches/features/experimental-gui/fft_top_block.py        
2008-08-03 06:12:20 UTC (rev 9157)
@@ -131,11 +131,11 @@
        self.subscribe('decim', self._set_decim)
 
        # Proxies pass through subscribers and publishers to the supplied object
-        self.proxy('gain', self._u, 'gain')
-        self.proxy('freq', self._u, 'freq')
-        self.proxy('average', self._fft, 'average')
-        self.proxy('avg_alpha', self._fft, 'avg_alpha')
-       self.proxy('sample_rate', self._fft, 'sample_rate')
+        self.proxy('gain', self._u)
+        self.proxy('freq', self._u)
+        self.proxy('average', self._fft)
+        self.proxy('avg_alpha', self._fft)
+       self.proxy('sample_rate', self._fft)
        
         """
         Create update thread.  Updates property 'fft' at desired frame rate

Modified: gnuradio/branches/features/experimental-gui/pubsub.py
===================================================================
--- gnuradio/branches/features/experimental-gui/pubsub.py       2008-08-03 
06:07:06 UTC (rev 9156)
+++ gnuradio/branches/features/experimental-gui/pubsub.py       2008-08-03 
06:12:20 UTC (rev 9157)
@@ -91,8 +91,9 @@
         else:
             self._subscribers[key].remove(subscriber)
 
-    def proxy(self, key, p, newkey):
+    def proxy(self, key, p, newkey=None):
        if not self.has_key(key): self.__missing__(key)
+       if newkey is None: newkey = key
        self._proxies[key] = (p, newkey)        
 
     def unproxy(self, key):