diff options
| author | Johnathan Corgan | 2009-11-03 07:15:14 -0800 |
|---|---|---|
| committer | Johnathan Corgan | 2009-11-03 07:15:14 -0800 |
| commit | 058edee5b4d1423b7ad88a9748bec073ff4963ff (patch) | |
| tree | e1b48429dccb13587b04258c4e5c15b8f0660b98 /grc | |
| parent | f9c3bfb83af1048db54de941df1898f2ec7fb1fc (diff) | |
| parent | 392b7f9002cb08dddc1ca0ced18f899a0958ba1f (diff) | |
| download | gnuradio-058edee5b4d1423b7ad88a9748bec073ff4963ff.tar.gz gnuradio-058edee5b4d1423b7ad88a9748bec073ff4963ff.tar.bz2 gnuradio-058edee5b4d1423b7ad88a9748bec073ff4963ff.zip | |
Merge branch 'wip/term' of git@gnuradio.org:jcorgan
* 'wip/term' of git@gnuradio.org:jcorgan:
gr-wxgui: cleanup for merge
Consolidated termsink into one class
Basic terminal window that takes raw text on input msgq and appends it
Add placeholder panel for console, use old style window size
Created skeleton wxgui term window component
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/blocks/Makefile.am | 1 | ||||
| -rw-r--r-- | grc/blocks/block_tree.xml | 1 | ||||
| -rw-r--r-- | grc/blocks/wxgui_termsink.xml | 55 |
3 files changed, 57 insertions, 0 deletions
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 9194d99ec..e436cc764 100644 --- a/grc/blocks/Makefile.am +++ b/grc/blocks/Makefile.am @@ -230,6 +230,7 @@ dist_ourdata_DATA = \ wxgui_histosink2.xml \ wxgui_numbersink2.xml \ wxgui_scopesink2.xml \ + wxgui_termsink.xml \ wxgui_waterfallsink2.xml \ xmlrpc_client.xml \ xmlrpc_server.xml diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index ffa52a1e7..fc074cb69 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -46,6 +46,7 @@ <block>wxgui_constellationsink2</block> <block>wxgui_waterfallsink2</block> <block>wxgui_histosink2</block> + <block>wxgui_termsink</block> </cat> <cat> <name>Operators</name> diff --git a/grc/blocks/wxgui_termsink.xml b/grc/blocks/wxgui_termsink.xml new file mode 100644 index 000000000..985d89b58 --- /dev/null +++ b/grc/blocks/wxgui_termsink.xml @@ -0,0 +1,55 @@ +<?xml version="1.0"?> +<!-- +################################################### +##Terminal window +################################################### + --> +<block> + <name>Terminal Sink</name> + <key>wxgui_termsink</key> + + <import>from gnuradio.wxgui import termsink</import> + + <make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' +termsink.termsink( + parent=$(parent).GetWin(), +#if $win_size() + size=$win_size, +#end if + msgq=$(id)_msgq_in, +) +#if not $grid_pos() +$(parent).Add(self.$(id)) +#else +$(parent).GridAdd(self.$(id), $(', '.join(map(str, $grid_pos())))) +#end if</make> + + <param> + <name>Window Size</name> + <key>win_size</key> + <value></value> + <type>int_vector</type> + <hide>#if $win_size() then 'none' else 'part'#</hide> + </param> + <param> + <name>Grid Position</name> + <key>grid_pos</key> + <value></value> + <type>grid_pos</type> + </param> + + <param> + <name>Notebook</name> + <key>notebook</key> + <value></value> + <type>notebook</type> + </param> + + <check>not $win_size or len($win_size) == 2</check> + + <sink> + <name>in</name> + <type>msg</type> + </sink> + +</block> |