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 /grc | |
| 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 'grc')
| -rw-r--r-- | grc/blocks/gr_file_sink.xml | 19 | ||||
| -rw-r--r-- | grc/blocks/wxgui_scopesink2.xml | 22 |
2 files changed, 40 insertions, 1 deletions
diff --git a/grc/blocks/gr_file_sink.xml b/grc/blocks/gr_file_sink.xml index 880dc2759..0081c93f8 100644 --- a/grc/blocks/gr_file_sink.xml +++ b/grc/blocks/gr_file_sink.xml @@ -8,7 +8,9 @@ <name>File Sink</name> <key>gr_file_sink</key> <import>from gnuradio import gr</import> - <make>gr.file_sink($type.size*$vlen, $file)</make> + <make>gr.file_sink($type.size*$vlen, $file) +self.$(id).set_unbuffered($unbuffered)</make> + <callback>set_unbuffered($unbuffered)</callback> <param> <name>File</name> <key>file</key> @@ -51,6 +53,21 @@ <value>1</value> <type>int</type> </param> + <param> + <name>Unbuffered</name> + <key>unbuffered</key> + <value>False</value> + <type>bool</type> + <option> + <name>Off</name> + <key>False</key> + </option> + <option> + <name>On</name> + <key>True</key> + </option> + </param> + <check>$vlen > 0</check> <sink> <name>in</name> 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> |