[Commit-gnuradio] r8083 - gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python

[michaelld]

Author: michaelld
Date: 2008-03-23 18:08:32 -0600 (Sun, 23 Mar 2008)
New Revision: 8083

Modified:
   gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/fftsink2.py
   gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/form.py
   
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/numbersink2.py
   
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/scopesink2.py
   gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py
   
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/waterfallsink2.py
Log:
Converted DoClose to do_close in the sinks.  Added a do_close() method
to the field class to handle closing of special field types.



Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/fftsink2.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/fftsink2.py    
    2008-03-23 23:55:37 UTC (rev 8082)
+++ 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/fftsink2.py    
    2008-03-24 00:08:32 UTC (rev 8083)
@@ -134,9 +134,9 @@
     def _set_n(self):
         self.one_in_n.set_n(max(1, 
int(self.sample_rate/self.fft_size/self.fft_rate)))
         
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created window to close itself
-        self.win.DoClose ()
+        self.win.do_close ()
 
 class fft_sink_f (fft_sink_base):
     def __init__ (self, parent, baseband_freq=0, ref_scale=2.0,
@@ -229,7 +229,7 @@
        self.set_scale(baseband_freq)
        self.fftsink.set_baseband_freq(baseband_freq)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, stop the input_watcher
         self.input_watcher.stop ()
 
@@ -464,10 +464,10 @@
 
        self.connect(src2, thr2, self.sink2)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created sinks to close themselves
-        self.sink1.DoClose ()
-        self.sink2.DoClose ()
+        self.sink1.do_close ()
+        self.sink2.do_close ()
 
 def main ():
     app = stdgui2.stdapp (test_app_block, "FFT Sink Test App")

Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/form.py
===================================================================
--- gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/form.py    
2008-03-23 23:55:37 UTC (rev 8082)
+++ gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/form.py    
2008-03-24 00:08:32 UTC (rev 8083)
@@ -136,6 +136,9 @@
         return "%s%s is invalid. %s" % (prefix, self._get_prim_value(),
                                         self.converter.help())
 
+    def do_close (self):
+        pass
+
 # static (display-only) text fields
 
 class static_text_field(field):

Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/numbersink2.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/numbersink2.py 
    2008-03-23 23:55:37 UTC (rev 8082)
+++ 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/numbersink2.py 
    2008-03-24 00:08:32 UTC (rev 8083)
@@ -118,9 +118,9 @@
     def set_base_value(self, base_value):
         self.base_value = base_value
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created window to close itself
-        self.win.DoClose ()
+        self.win.do_close ()
 
 class number_sink_f (number_sink_base):
     def __init__ (self, parent, unit='', base_value=0, minval=-100.0,
@@ -360,7 +360,7 @@
 
         return numpy.fromstring (s, numpy.float32)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, stop the input_watcher
         self.input_watcher.stop ()
 
@@ -471,10 +471,10 @@
         self.connect (src1, thr1, self.sink1)
         self.connect (src2, thr2, self.sink2)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created sinks to close themselves
-        self.sink1.DoClose ()
-        self.sink2.DoClose ()
+        self.sink1.do_close ()
+        self.sink2.do_close ()
 
 def main ():
     app = stdgui2.stdapp (test_app_flow_graph, "Number Sink Test App")

Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/scopesink2.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/scopesink2.py  
    2008-03-23 23:55:37 UTC (rev 8082)
+++ 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/scopesink2.py  
    2008-03-24 00:08:32 UTC (rev 8083)
@@ -69,9 +69,9 @@
         self.guts.set_sample_rate (sample_rate)
         self.win.info.set_sample_rate (sample_rate)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created window to close itself
-        self.win.DoClose ()
+        self.win.do_close ()
 
 class scope_sink_f (scope_sink_base):
     def __init__ (self, parent, title='', sample_rate=1,
@@ -402,9 +402,9 @@
     def run_stop (self, evt):
         self.info.running = not self.info.running
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created graph to close itself
-        self.graph.DoClose ()
+        self.graph.do_close ()
 
 class graph_window (plot.PlotCanvas):
 
@@ -470,7 +470,7 @@
         self.iscan -= 1
         return records
 
-    def DoClose (self):
+    def do_close (self):
         # on close, stop the input_watcher
         self.input_watcher.stop ()
 
@@ -649,9 +649,9 @@
         # self.connect("src0 throttle scope")
        self.connect(self.src0, self.thr, self.scope) 
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created scope to close itself
-        self.scope.DoClose ()
+        self.scope.do_close ()
 
 def main ():
     app = stdgui2.stdapp (test_top_block, "O'Scope Test App")

Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py
===================================================================
--- gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py 
2008-03-23 23:55:37 UTC (rev 8082)
+++ gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/stdgui2.py 
2008-03-24 00:08:32 UTC (rev 8083)
@@ -104,7 +104,7 @@
         self.SetAutoLayout (True)
 
         # tell the vbox to fit itself to the panel
-        vbox.Fit (self)
+        self.Fit ()
 
         # if 'pos' is not provided, center this dialog on the screen
         if pos == wx.DefaultPosition:
@@ -183,7 +183,7 @@
 
         self.SetSizer (vbox)
         self.SetAutoLayout (True)
-        vbox.Fit (self)
+        self.Fit ()
 
     def do_close (self):
         if self._debug:

Modified: 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/waterfallsink2.py
===================================================================
--- 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/waterfallsink2.py
  2008-03-23 23:55:37 UTC (rev 8082)
+++ 
gnuradio/branches/developers/michaelld/wxgui/gr-wxgui/src/python/waterfallsink2.py
  2008-03-24 00:08:32 UTC (rev 8083)
@@ -107,9 +107,9 @@
     def _set_n(self):
         self.one_in_n.set_n(max(1, 
int(self.sample_rate/self.fft_size/self.fft_rate)))
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created window to close itself
-        self.win.DoClose ()
+        self.win.do_close ()
 
 class waterfall_sink_f (waterfall_sink_base):
     def __init__ (self, parent, baseband_freq=0,
@@ -176,7 +176,7 @@
 
         return numpy.fromstring (s, numpy.float32)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, stop the input_watcher
         self.input_watcher.stop ()
 
@@ -399,10 +399,10 @@
        self.connect(self.src2, self.thr2, self.sink2)
         vbox.Add (self.sink2.win, 1, wx.EXPAND)
 
-    def DoClose (self):
+    def do_close (self):
         # on close, tell the created sinks to close themselves
-        self.sink1.DoClose ()
-        self.sink2.DoClose ()
+        self.sink1.do_close ()
+        self.sink2.do_close ()
 
 def main ():
     app = stdgui2.stdapp (test_top_block, "Waterfall Sink Test App")