diff options
| author | Johnathan Corgan | 2010-07-05 10:43:40 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-07-05 10:43:40 -0700 |
| commit | 41c222c05eb0e3f36cf5a0e328eead58e77e3a8b (patch) | |
| tree | c8d25fdcd4be89ff24cfd2e5b1a7562ae7d8c7dc /grc/blocks/wxgui_scopesink2.xml | |
| parent | 8a4ef7ce3c1028454a357b38b1ddb0af0b54d604 (diff) | |
| parent | dc79a11cb809b33f397603e7641b155120be9ee8 (diff) | |
| download | gnuradio-41c222c05eb0e3f36cf5a0e328eead58e77e3a8b.tar.gz gnuradio-41c222c05eb0e3f36cf5a0e328eead58e77e3a8b.tar.bz2 gnuradio-41c222c05eb0e3f36cf5a0e328eead58e77e3a8b.zip | |
Merge branch 'patches/marcus/stripchart'
Conflicts:
gr-wxgui/src/python/scope_window.py
* Adds new scope window trigger, TRIG_MODE_STRIPCHART
* Allows config file selection of whether background window sinks still run
* Allows config file selection of default trigger mode
* Allows config file selection of default waterfall sink color mode
[wxgui]
#Setting this to true prevents the window sinks from stopping when they
#are not displayed, as when they are in a notebook with a hidden tab.
run_always = False
# Default scope trigger mode.
#
# 0 = Freerun
# 1 = Auto (default)
# 2 = Normal
# 3 = Stripchart
trig_mode = 1
# Default waterfall sink color mode. Valid choices are 'rgb1', 'rbg2',
# 'rgb3', or 'gray'
waterfall_color = rgb1
Diffstat (limited to 'grc/blocks/wxgui_scopesink2.xml')
| -rw-r--r-- | grc/blocks/wxgui_scopesink2.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/grc/blocks/wxgui_scopesink2.xml b/grc/blocks/wxgui_scopesink2.xml index eba45f489..50cd977be 100644 --- a/grc/blocks/wxgui_scopesink2.xml +++ b/grc/blocks/wxgui_scopesink2.xml @@ -20,6 +20,7 @@ scopesink2.$(type.fcn)( ac_couple=$ac_couple, xy_mode=$xy_mode, num_inputs=$num_inputs, + trig_mode=$trig_mode, #if $win_size() size=$win_size, #end if @@ -134,6 +135,27 @@ $(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) <value></value> <type>notebook</type> </param> + <param> + <name>Trigger Mode</name> + <key>trig_mode</key> + <type>enum</type> + <option> + <name>Auto</name> + <key>gr.gr_TRIG_MODE_AUTO</key> + </option> + <option> + <name>Normal</name> + <key>gr.gr_TRIG_MODE_NORM</key> + </option> + <option> + <name>Freerun</name> + <key>gr.gr_TRIG_MODE_FREE</key> + </option> + <option> + <name>Stripchart</name> + <key>gr.gr_TRIG_MODE_STRIPCHART</key> + </option> + </param> <check>not $win_size or len($win_size) == 2</check> <check>not $xy_mode or '$type' == 'complex' or $num_inputs != 1</check> <sink> |