Changeset 7288

Show
Ignore:
Timestamp:
12/27/07 13:37:52
Author:
jcorgan
Message:

Applied changeset r6839 on trunk to release branch.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/releases/3.1/gr-utils/src/python/usrp_fft.py

    r7287 r7288  
    236236                self.myform['ddc'].set_value(r.dxc_freq) 
    237237            if not self.options.waterfall and not self.options.oscilloscope: 
    238                 self.scope.set_baseband_freq(target_freq) 
     238                self.scope.win.set_baseband_freq(target_freq) 
    239239            return True 
    240240 
    …… 
    265265            # Re-center on maximum power 
    266266            points = self.scope.win._points 
    267             ind = numpy.argmax(points[:,1]) 
     267            if self.scope.win.peak_hold: 
     268                if self.scope.win.peak_vals is not None: 
     269                    ind = numpy.argmax(self.scope.win.peak_vals) 
     270                else: 
     271                    ind = int(points.shape()[0]/2) 
     272            else: 
     273                ind = numpy.argmax(points[:,1]) 
    268274            (freq, pwr) = points[ind] 
    269275            target_freq = freq/self.scope.win._scale_factor 
     276            print ind, freq, pwr 
    270277            self.set_freq(target_freq)             
    271278        else: 

  • gnuradio/branches/releases/3.1/gr-wxgui/src/python/fftsink2.py

    r7283 r7288  
    257257 
    258258    def set_baseband_freq(self, baseband_freq): 
     259        if self.peak_hold: 
     260            self.peak_vals = None 
    259261        self.set_scale(baseband_freq) 
    260262        self.fftsink.set_baseband_freq(baseband_freq)