diff options
| author | jblum | 2009-01-28 19:52:45 +0000 |
|---|---|---|
| committer | jblum | 2009-01-28 19:52:45 +0000 |
| commit | f6d78800dc5b9db2025ffc2855f09f5cc79b16a6 (patch) | |
| tree | 44fbf0143dcf38073d92b881f51add6573798977 /gr-wxgui/src/python | |
| parent | d902f1e112636d4c9d1257c50ee259db382770f5 (diff) | |
| download | gnuradio-f6d78800dc5b9db2025ffc2855f09f5cc79b16a6.tar.gz gnuradio-f6d78800dc5b9db2025ffc2855f09f5cc79b16a6.tar.bz2 gnuradio-f6d78800dc5b9db2025ffc2855f09f5cc79b16a6.zip | |
fixed 2 scaling bugs in scopesink
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10329 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-wxgui/src/python')
| -rw-r--r-- | gr-wxgui/src/python/common.py | 2 | ||||
| -rw-r--r-- | gr-wxgui/src/python/scope_window.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gr-wxgui/src/python/common.py b/gr-wxgui/src/python/common.py index f31e1a708..e7d08891d 100644 --- a/gr-wxgui/src/python/common.py +++ b/gr-wxgui/src/python/common.py @@ -259,7 +259,7 @@ def get_min_max(samples): """ scale_factor = 3 mean = numpy.average(samples) - rms = scale_factor*((numpy.sum((samples-mean)**2)/len(samples))**.5) + rms = numpy.max([scale_factor*((numpy.sum((samples-mean)**2)/len(samples))**.5), .1]) min = mean - rms max = mean + rms return min, max diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py index 57905ca4d..7d4f97113 100644 --- a/gr-wxgui/src/python/scope_window.py +++ b/gr-wxgui/src/python/scope_window.py @@ -411,8 +411,8 @@ class scope_window(wx.Panel, pubsub.pubsub, common.prop_setter): #autorange if self[AUTORANGE_KEY] and time.time() - self.autorange_ts > AUTORANGE_UPDATE_RATE: bounds = [common.get_min_max(samples) for samples in sampleses] - y_min = numpy.min(*[bound[0] for bound in bounds]) - y_max = numpy.max(*[bound[1] for bound in bounds]) + y_min = numpy.min([bound[0] for bound in bounds]) + y_max = numpy.max([bound[1] for bound in bounds]) #adjust the y per div y_per_div = common.get_clean_num((y_max-y_min)/self[Y_DIVS_KEY]) if y_per_div != self[Y_PER_DIV_KEY]: self.set_y_per_div(y_per_div) |