diff options
| author | Johnathan Corgan | 2010-07-05 12:01:29 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-07-05 12:01:29 -0700 |
| commit | 61d57743c708c8cec9b0137427e6aa709a954443 (patch) | |
| tree | 86f639d417faa6d1526002ad89f53d1a609988db /gr-wxgui/src/python/scope_window.py | |
| parent | 1e71bdae9956d64e06bdfbb0c87530619807e100 (diff) | |
| parent | 278b6db3de99ae31d5f4f79dcd62708c4757d7fa (diff) | |
| download | gnuradio-61d57743c708c8cec9b0137427e6aa709a954443.tar.gz gnuradio-61d57743c708c8cec9b0137427e6aa709a954443.tar.bz2 gnuradio-61d57743c708c8cec9b0137427e6aa709a954443.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-wxgui/src/python/scope_window.py')
| -rw-r--r-- | gr-wxgui/src/python/scope_window.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gr-wxgui/src/python/scope_window.py b/gr-wxgui/src/python/scope_window.py index c03b71f1e..a9917782f 100644 --- a/gr-wxgui/src/python/scope_window.py +++ b/gr-wxgui/src/python/scope_window.py @@ -38,6 +38,7 @@ import forms DEFAULT_FRAME_RATE = gr.prefs().get_long('wxgui', 'scope_rate', 30) PERSIST_ALPHA_MIN_EXP, PERSIST_ALPHA_MAX_EXP = -2, 0 SLIDER_STEPS = 100 +DEFAULT_TRIG_MODE = gr.prefs().get_long('wxgui', 'trig_mode', gr.gr_TRIG_MODE_AUTO) DEFAULT_WIN_SIZE = (600, 300) COUPLING_MODES = ( ('DC', False), @@ -47,6 +48,7 @@ TRIGGER_MODES = ( ('Freerun', gr.gr_TRIG_MODE_FREE), ('Auto', gr.gr_TRIG_MODE_AUTO), ('Normal', gr.gr_TRIG_MODE_NORM), + ('Stripchart', gr.gr_TRIG_MODE_STRIPCHART), ) TRIGGER_SLOPES = ( ('Pos +', gr.gr_TRIG_SLOPE_POS), @@ -432,6 +434,7 @@ class scope_window(wx.Panel, pubsub.pubsub): msg_key, use_persistence, persist_alpha, + trig_mode, ): pubsub.pubsub.__init__(self) #check num inputs @@ -471,11 +474,16 @@ class scope_window(wx.Panel, pubsub.pubsub): self[FRAME_RATE_KEY] = frame_rate self[TRIGGER_LEVEL_KEY] = 0 self[TRIGGER_CHANNEL_KEY] = 0 - self[TRIGGER_MODE_KEY] = gr.gr_TRIG_MODE_AUTO + self[TRIGGER_MODE_KEY] = trig_mode + self[TRIGGER_SLOPE_KEY] = gr.gr_TRIG_SLOPE_POS self[T_FRAC_OFF_KEY] = 0.5 self[USE_PERSISTENCE_KEY] = use_persistence self[PERSIST_ALPHA_KEY] = persist_alpha + + if self[TRIGGER_MODE_KEY] == gr.gr_TRIG_MODE_STRIPCHART: + self[T_FRAC_OFF_KEY] = 0.0 + for i in range(num_inputs): self.proxy(common.index_key(AC_COUPLE_KEY, i), controller, common.index_key(ac_couple_key, i)) #init panel and plot |