From 92f2da3450b3ae0a5d16d322ad42c7812c4ffc62 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 15 Oct 2009 09:11:59 -0700 Subject: [PATCH] Created skeleton wxgui term window component --- gr-wxgui/src/python/Makefile.am | 2 ++ gr-wxgui/src/python/term_window.py | 28 ++++++++++++++++++++++ gr-wxgui/src/python/termsink.py | 38 ++++++++++++++++++++++++++++++ grc/blocks/Makefile.am | 1 + grc/blocks/block_tree.xml | 1 + grc/blocks/wxgui_termsink.xml | 32 +++++++++++++++++++++++++ 6 files changed, 102 insertions(+) create mode 100644 gr-wxgui/src/python/term_window.py create mode 100644 gr-wxgui/src/python/termsink.py create mode 100644 grc/blocks/wxgui_termsink.xml diff --git a/gr-wxgui/src/python/Makefile.am b/gr-wxgui/src/python/Makefile.am index e06298a2..0b4550b3 100644 --- a/gr-wxgui/src/python/Makefile.am +++ b/gr-wxgui/src/python/Makefile.am @@ -53,6 +53,8 @@ ourpython_PYTHON = \ scopesink_nongl.py \ scopesink_gl.py \ scope_window.py \ + term_window.py \ + termsink.py \ waterfallsink2.py \ waterfallsink_nongl.py \ waterfallsink_gl.py \ diff --git a/gr-wxgui/src/python/term_window.py b/gr-wxgui/src/python/term_window.py new file mode 100644 index 00000000..cae19c07 --- /dev/null +++ b/gr-wxgui/src/python/term_window.py @@ -0,0 +1,28 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +import wx +import pubsub + +class term_window(wx.Panel, pubsub.pubsub): + def __init__(self, parent): + pubsub.pubsub.__init__(self) + wx.Panel.__init__(self, parent, style=wx.SIMPLE_BORDER) diff --git a/gr-wxgui/src/python/termsink.py b/gr-wxgui/src/python/termsink.py new file mode 100644 index 00000000..92aba47f --- /dev/null +++ b/gr-wxgui/src/python/termsink.py @@ -0,0 +1,38 @@ +# +# Copyright 2009 Free Software Foundation, Inc. +# +# This file is part of GNU Radio +# +# GNU Radio is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3, or (at your option) +# any later version. +# +# GNU Radio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Radio; see the file COPYING. If not, write to +# the Free Software Foundation, Inc., 51 Franklin Street, +# Boston, MA 02110-1301, USA. +# + +import term_window +import common +from gnuradio import gr + +class termsink(gr.hier_block2, common.wxgui_hb): + def __init__(self,parent): + gr.hier_block2.__init__( + self, + "termsink", + gr.io_signature(0, 0, 0), + gr.io_signature(0, 0, 0), + ) + + self.win = term_window.term_window( + parent=parent, + ) + diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am index 9194d99e..e436cc76 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 187ca196..5d1d5102 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -46,6 +46,7 @@ wxgui_constellationsink2 wxgui_waterfallsink2 wxgui_histosink2 + wxgui_termsink Operators diff --git a/grc/blocks/wxgui_termsink.xml b/grc/blocks/wxgui_termsink.xml new file mode 100644 index 00000000..e1d52cd1 --- /dev/null +++ b/grc/blocks/wxgui_termsink.xml @@ -0,0 +1,32 @@ + + + + Terminal Sink + wxgui_termsink + from gnuradio.wxgui import termsink + #set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self' +termsink.termsink( + $(parent).GetWin(), +) +#if not $grid_pos() +$(parent).Add(self.$(id).win) +#else +$(parent).GridAdd(self.$(id).win, $(', '.join(map(str, $grid_pos())))) +#end if + + Grid Position + grid_pos + + grid_pos + + + Notebook + notebook + + notebook + + -- 2.47.2