diff options
| author | Johnathan Corgan | 2009-09-02 14:38:37 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2009-09-02 14:38:37 -0700 |
| commit | 72afd843cfa4037eb0a059a647c952b7e5ddf25c (patch) | |
| tree | e70794c5f51fec80e90c76456ce96e27193aafa8 /gr-wxgui/src/python/fft_window.py | |
| parent | a36c92ed48fb80c78a97a200b92b98d36a7d4c05 (diff) | |
| parent | a70c291e3cd4fc3d51f2eebb6b39cdb9d46862da (diff) | |
| download | gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.tar.gz gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.tar.bz2 gnuradio-72afd843cfa4037eb0a059a647c952b7e5ddf25c.zip | |
Merge branch 'wxgui_fix' from http://gnuradio.org/git/jblum.git into master
* waterfall and fft use a common autoscale function
* Fix so that the waterfall texture is initialized with a buffer of the same size.
Diffstat (limited to 'gr-wxgui/src/python/fft_window.py')
| -rw-r--r-- | gr-wxgui/src/python/fft_window.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/gr-wxgui/src/python/fft_window.py b/gr-wxgui/src/python/fft_window.py index 4c575f1a6..237c8940c 100644 --- a/gr-wxgui/src/python/fft_window.py +++ b/gr-wxgui/src/python/fft_window.py @@ -254,17 +254,7 @@ class fft_window(wx.Panel, pubsub.pubsub): Set the dynamic range and reference level. """ if not len(self.samples): return - #get the peak level (max of the samples) - peak_level = numpy.max(self.samples) - #separate noise samples - noise_samps = numpy.sort(self.samples)[:len(self.samples)/2] - #get the noise floor - noise_floor = numpy.average(noise_samps) - #get the noise deviation - noise_dev = numpy.std(noise_samps) - #determine the maximum and minimum levels - max_level = peak_level - min_level = noise_floor - abs(2*noise_dev) + min_level, max_level = common.get_min_max_fft(self.samples) #set the range to a clean number of the dynamic range self[Y_PER_DIV_KEY] = common.get_clean_num(1+(max_level - min_level)/self[Y_DIVS_KEY]) #set the reference level to a multiple of y per div |