options for hb filter in usrp simple source

[debian/gnuradio] / grc / scripts / usrp_probe

diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe
index c926034823a0595a9c663b5b9209bd391847b682..ac786075ca7f33b47b425c0babc41ac18d50f9fd 100755 (executable)
--- a/grc/scripts/usrp_probe
+++ b/grc/scripts/usrp_probe
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 """
-Copyright 2008 Free Software Foundation, Inc.
+Copyright 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
@@ -37,7 +37,7 @@ flow_graph = platform.get_new_flow_graph()
 block = flow_graph.get_new_block('usrp_probe')
 
 ##all params
-usrp_number_param = block.get_param('number')
+usrp_which_param = block.get_param('which')
 usrp_dboard_param = block.get_param('dboard')
 
 class USRPProbeWindow(gtk.Window):
@@ -66,14 +66,14 @@ class USRPProbeWindow(gtk.Window):
                #create vbox for storage
                vbox = gtk.VBox()
                frame.add(vbox)
-               vbox.pack_start(usrp_number_param.get_input_object(), False)
+               vbox.pack_start(usrp_which_param.get_input_object(), False)
                vbox.pack_start(usrp_dboard_param.get_input_object(), False)
-               self.diagnose_button = gtk.Button('Probe')
-               self.diagnose_button.connect('clicked', self._probe_usrp)
-               vbox.pack_start(self.diagnose_button, False)
+               self.probe_button = gtk.Button('Probe')
+               self.probe_button.connect('clicked', self._probe_usrp)
+               vbox.pack_start(self.probe_button, False)
                #Create a text box for USRP queries
                self.query_buffer = TextDisplay()
-               self.query_buffer.set_text('Press "Probe" to retrieve USRP information...')
+               self.query_buffer.set_text(block.get_doc())
                vbox.pack_start(self.query_buffer)
                self.show_all()
 
@@ -88,7 +88,7 @@ class USRPProbeWindow(gtk.Window):
                        make = usrp.sink_c
                        get_mux = usrp.determine_tx_mux_value
                try:
-                       u = make(usrp_number_param.evaluate())
+                       u = make(which=usrp_which_param.evaluate())
                        subdev_spec = (side, 0)
                        subdev = usrp.selected_subdev(u, subdev_spec) #get the subdev
                        msg = ">>> USRP Probe\n"
@@ -114,8 +114,5 @@ if __name__ == '__main__':
        try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0))
        except: pass
        #enter the mainloop
-       gtk.gdk.threads_init()
-       gtk.gdk.threads_enter()
        USRPProbeWindow()
        gtk.main()
-       gtk.gdk.threads_leave()