[Commit-gnuradio] r10626 - in gnuradio/branches/releases/3.2: . gnuradio-core/src/python/gnuradio/gr gr-radio-astronomy/src/python

[jcorgan]

Author: jcorgan
Date: 2009-03-16 08:23:22 -0600 (Mon, 16 Mar 2009)
New Revision: 10626

Modified:
   gnuradio/branches/releases/3.2/
   gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
   
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
Log:
Applied changeset r10623 to release 3.2 branch.


Property changes on: gnuradio/branches/releases/3.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600
   + /gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
/gnuradio/trunk:10356-10359,10481-10482,10497-10499,10506-10507,10511,10514,10521,10523-10524,10529,10531,10535,10537-10538,10550-10551,10556,10558-10560,10562-10563,10565,10574-10576,10578-10579,10581-10582,10585,10587,10596-10600,10623


Property changes on: 
gnuradio/branches/releases/3.2/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10587,10596-10599
   + 
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
/gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10576,10582,10587,10596-10599,10623

Modified: 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
===================================================================
--- 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
    2009-03-16 13:37:11 UTC (rev 10625)
+++ 
gnuradio/branches/releases/3.2/gr-radio-astronomy/src/python/usrp_ra_receiver.py
    2009-03-16 14:23:22 UTC (rev 10626)
@@ -628,9 +628,9 @@
                        self.centerfreq = target_freq
                        self.observing -= delta
                        self.scope.set_baseband_freq (self.observing)
-
-                       self.myform['baseband'].set_value(r.baseband_freq)
-                       self.myform['ddc'].set_value(r.dxc_freq)
+                       if not self.cardtype == usrp_dbid.BASIC_RX:
+                               
self.myform['baseband'].set_value(r.baseband_freq)
+                               self.myform['ddc'].set_value(r.dxc_freq)
                        
                        if (self.use_notches):
                                self.compute_notch_taps(self.notches)