diff options
| author | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-16 07:56:14 -0800 |
| commit | 559d397de9ba937f470d27a7ad8b8d15f8f2f90f (patch) | |
| tree | 221f32c0c10e55f9072fb22623e01fcd1dd63353 /gr-wxgui | |
| parent | a6b5781e36ff75adb1e4d39d755d4ab8f5efd9dd (diff) | |
| parent | 53eee1c624794056fcba50a5eb50b864cbf159dd (diff) | |
| download | gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.gz gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.tar.bz2 gnuradio-559d397de9ba937f470d27a7ad8b8d15f8f2f90f.zip | |
Merge branch 'next' into tagging
Diffstat (limited to 'gr-wxgui')
| -rw-r--r-- | gr-wxgui/src/python/constants.py | 1 | ||||
| -rw-r--r-- | gr-wxgui/src/python/scope_window.py | 4 | ||||
| -rw-r--r-- | gr-wxgui/src/python/scopesink_gl.py | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/constants.py b/gr-wxgui/src/python/constants.py index 9612f36dd..070be0808 100644 --- a/gr-wxgui/src/python/constants.py +++ b/gr-wxgui/src/python/constants.py @@ -66,6 +66,7 @@ X_PER_DIV_KEY = 'x_per_div' Y_DIVS_KEY = 'y_divs' Y_OFF_KEY = 'y_off' Y_PER_DIV_KEY = 'y_per_div' +Y_AXIS_LABEL = 'y_axis_label' MAXIMUM_KEY = 'maximum' MINIMUM_KEY = 'minimum' NUM_BINS_KEY = 'num_bins' diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py index a9917782f..89a808cec 100644 --- a/gr-wxgui/src/python/scope_window.py +++ b/gr-wxgui/src/python/scope_window.py @@ -435,6 +435,7 @@ class scope_window(wx.Panel, pubsub.pubsub): use_persistence, persist_alpha, trig_mode, + y_axis_label, ): pubsub.pubsub.__init__(self) #check num inputs @@ -471,6 +472,7 @@ class scope_window(wx.Panel, pubsub.pubsub): self[T_DIVS_KEY] = 8 self[X_DIVS_KEY] = 8 self[Y_DIVS_KEY] = 8 + self[Y_AXIS_LABEL] = y_axis_label self[FRAME_RATE_KEY] = frame_rate self[TRIGGER_LEVEL_KEY] = 0 self[TRIGGER_CHANNEL_KEY] = 0 @@ -676,7 +678,7 @@ class scope_window(wx.Panel, pubsub.pubsub): self.plotter.set_x_label('Time', 's') self.plotter.set_x_grid(self.get_t_min(), self.get_t_max(), self[T_PER_DIV_KEY], True) #update the y axis - self.plotter.set_y_label('Counts') + self.plotter.set_y_label(self[Y_AXIS_LABEL]) self.plotter.set_y_grid(self.get_y_min(), self.get_y_max(), self[Y_PER_DIV_KEY]) #redraw current sample self.handle_samples() diff --git a/gr-wxgui/src/python/scopesink_gl.py b/gr-wxgui/src/python/scopesink_gl.py index 15be23d5a..5ae897400 100644 --- a/gr-wxgui/src/python/scopesink_gl.py +++ b/gr-wxgui/src/python/scopesink_gl.py @@ -77,6 +77,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb): ac_couple=False, num_inputs=1, trig_mode=scope_window.DEFAULT_TRIG_MODE, + y_axis_label='Counts', frame_rate=scope_window.DEFAULT_FRAME_RATE, use_persistence=False, persist_alpha=None, @@ -134,6 +135,7 @@ class _scope_sink_base(gr.hier_block2, common.wxgui_hb): v_offset=v_offset, xy_mode=xy_mode, trig_mode=trig_mode, + y_axis_label=y_axis_label, ac_couple_key=AC_COUPLE_KEY, trigger_level_key=TRIGGER_LEVEL_KEY, trigger_mode_key=TRIGGER_MODE_KEY, |