Merged r4671:4680 from jcorgan/est into trunk. Pulls in gr-wxgui updates for new hierarchical blocks and work-in-progress channel sounder example.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4681 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 95 insertions, 0 deletions

diff --git a/gr-wxgui/src/python/stdgui2.py b/gr-wxgui/src/python/stdgui2.py
new file mode 100644
index 000000000..28b2fadd3
--- /dev/null
+++ b/gr-wxgui/src/python/stdgui2.py
@@ -0,0 +1,95 @@
+#
+# Copyright 2004 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 2, 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.
+# 
+
+'''A simple wx gui for GNU Radio applications'''
+
+import wx
+import sys
+from gnuradio import gr
+
+
+class stdapp (wx.App):
+    def __init__ (self, top_block_maker, title="GNU Radio", nstatus=2):
+        self.top_block_maker = top_block_maker
+        self.title = title
+        self._nstatus = nstatus
+        # All our initialization must come before calling wx.App.__init__.
+        # OnInit is called from somewhere in the guts of __init__.
+        wx.App.__init__ (self, redirect=False)
+
+    def OnInit (self):
+        frame = stdframe (self.top_block_maker, self.title, self._nstatus)
+        frame.Show (True)
+        self.SetTopWindow (frame)
+        return True
+
+
+class stdframe (wx.Frame):
+    def __init__ (self, top_block_maker, title="GNU Radio", nstatus=2):
+        # print "stdframe.__init__"
+        wx.Frame.__init__(self, None, -1, title)
+
+        self.CreateStatusBar (nstatus)
+        mainmenu = wx.MenuBar ()
+
+        menu = wx.Menu ()
+        item = menu.Append (200, 'E&xit', 'Exit')
+        self.Bind (wx.EVT_MENU, self.OnCloseWindow, item)
+        mainmenu.Append (menu, "&File")
+        self.SetMenuBar (mainmenu)
+
+        self.Bind (wx.EVT_CLOSE, self.OnCloseWindow)
+        self.panel = stdpanel (self, self, top_block_maker)
+        vbox = wx.BoxSizer(wx.VERTICAL)
+        vbox.Add(self.panel, 1, wx.EXPAND)
+        self.SetSizer(vbox)
+        self.SetAutoLayout(True)
+        vbox.Fit(self)
+
+    def OnCloseWindow (self, event):
+        self.runtime().stop()
+        self.Destroy ()
+
+    def runtime (self):
+        return self.panel.runtime
+    
+class stdpanel (wx.Panel):
+    def __init__ (self, parent, frame, top_block_maker):
+        # print "stdpanel.__init__"
+        wx.Panel.__init__ (self, parent, -1)
+        self.frame = frame
+
+        vbox = wx.BoxSizer (wx.VERTICAL)
+        self.top_block = top_block_maker (frame, self, vbox, sys.argv)
+        self.SetSizer (vbox)
+        self.SetAutoLayout (True)
+        vbox.Fit (self)
+
+        self.runtime = gr.runtime(self.top_block)
+        self.runtime.start ()
+
+class std_top_block (gr.hier_block2):
+    def __init__ (self, parent, panel, vbox, argv):
+        # Call the hier_block2 constructor
+        # Top blocks have no inputs and outputs
+        gr.hier_block2.__init__(self, "std_top_block",
+                                gr.io_signature(0,0,0),
+                                gr.io_signature(0,0,0))