[Commit-gnuradio] r8539 - in grc/trunk/src/grc_gnuradio: . wxgui

[jblum]

Author: jblum
Date: 2008-06-01 01:32:34 -0600 (Sun, 01 Jun 2008)
New Revision: 8539

Modified:
   grc/trunk/src/grc_gnuradio/Generator.py
   grc/trunk/src/grc_gnuradio/wxgui/callback_controls.py
   grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py
Log:
generator bug

Modified: grc/trunk/src/grc_gnuradio/Generator.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Generator.py     2008-06-01 03:36:01 UTC (rev 
8538)
+++ grc/trunk/src/grc_gnuradio/Generator.py     2008-06-01 07:32:34 UTC (rev 
8539)
@@ -69,11 +69,15 @@
                @return a string of python code
                """
                #load the namespace
+               imports = self._flow_graph.get_imports()
+               variables = self._flow_graph.get_variables()
+               blocks = sorted(self._flow_graph.get_blocks(), lambda x, y: 
cmp(x.get_id(), y.get_id()))
+               blocks = filter(lambda b: b not in (imports + variables), 
blocks)
                namespace = {
-                       'imports':      self._flow_graph.get_imports(),
+                       'imports':      imports,
                        'flow_graph': self._flow_graph,
-                       'variables': self._flow_graph.get_variables(),
-                       'blocks': sorted(self._flow_graph.get_blocks(), lambda 
x, y: cmp(x.get_id(), y.get_id())),
+                       'variables': variables,
+                       'blocks': blocks,
                        'connections': self._flow_graph.get_connections(),
                        'callbacks': sum([block.get_callbacks() for block in 
self._flow_graph.get_blocks()], []),
                        'gui_type': 
self._flow_graph.get_option('generate_options'),

Modified: grc/trunk/src/grc_gnuradio/wxgui/callback_controls.py
===================================================================
--- grc/trunk/src/grc_gnuradio/wxgui/callback_controls.py       2008-06-01 
03:36:01 UTC (rev 8538)
+++ grc/trunk/src/grc_gnuradio/wxgui/callback_controls.py       2008-06-01 
07:32:34 UTC (rev 8539)
@@ -33,10 +33,10 @@
 class _control_base(wx.BoxSizer):
        """Control base class"""
        
-       def __init__(self, window, callback, orientation=wx.VERTICAL):
+       def __init__(self, window, callback):
                self.window = window
                self.callback = callback
-               wx.BoxSizer.__init__(self, orientation)                 
+               wx.BoxSizer.__init__(self, wx.VERTICAL)                 
                
        def get_window(self): return self.window
        
@@ -59,7 +59,7 @@
                @param labels the choice labels or empty list
                """
                #initialize
-               _control_base.__init__(self, window, callback, wx.VERTICAL)
+               _control_base.__init__(self, window, callback)
                label_text = LabelText(self.get_window(), label)
                self.Add(label_text, 0, wx.ALIGN_CENTER)
                self.index = index
@@ -168,7 +168,7 @@
                @param num_steps the number of steps
                """
                #initialize
-               _control_base.__init__(self, window, callback, wx.VERTICAL)
+               _control_base.__init__(self, window, callback)
                self.min = float(min)
                self.max = float(max)
                self.num_steps = int(num_steps)

Modified: grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py
===================================================================
--- grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py   2008-06-01 03:36:01 UTC 
(rev 8538)
+++ grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py   2008-06-01 07:32:34 UTC 
(rev 8539)
@@ -80,10 +80,10 @@
                        self._wx_frame.Destroy()
                        exit(0)
                #setup app      
-               self._wx_frame.Bind(wx.EVT_CLOSE, _quit)        
-               self._wx_frame.SetSizerAndFit(self._wx_grid)                    
-               self._wx_frame.Show()           
-               self._wx_app.SetTopWindow(self._wx_frame)               
+               self._wx_frame.Bind(wx.EVT_CLOSE, _quit)
+               self._wx_frame.SetSizerAndFit(self._wx_grid)    
+               self._wx_frame.Show()
+               self._wx_app.SetTopWindow(self._wx_frame)
                #start flow graph
                gr.top_block.start(self)
                #blocking main loop