Merge commit 'v3.3.1' into try-3.3.1

[debian/gnuradio] / grc / scripts / usrp_probe

diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe
index 3d7b6f0cbb521bef5893f6448d2f2a1c0b22685b..d2e92e7530ab10dff1b46062ac13840d7209b544 100755 (executable)
--- a/grc/scripts/usrp_probe
+++ b/grc/scripts/usrp_probe
@@ -27,11 +27,8 @@ import gtk
 
 from gnuradio.grc.gui.Dialogs import TextDisplay
 
-from gnuradio.grc.platforms.python.Platform import Platform
-platform = Platform(block_paths_internal_only=['usrp_probe.xml'])
-
-from gnuradio.grc.platforms.gui.Platform import Platform
-platform = Platform(platform)
+from gnuradio.grc.python.Platform import Platform
+platform = Platform()
 
 flow_graph = platform.get_new_flow_graph()
 block = flow_graph.get_new_block('usrp_probe')
@@ -40,6 +37,11 @@ block = flow_graph.get_new_block('usrp_probe')
 usrp_which_param = block.get_param('which')
 usrp_dboard_param = block.get_param('dboard')
 
+def get_input(param):
+       param.validate()
+       input = param.get_input()
+       return input
+
 class USRPProbeWindow(gtk.Window):
        """
        The main window for USRP Dignostics.
@@ -66,8 +68,8 @@ class USRPProbeWindow(gtk.Window):
                #create vbox for storage
                vbox = gtk.VBox()
                frame.add(vbox)
-               vbox.pack_start(usrp_which_param.get_input_object(), False)
-               vbox.pack_start(usrp_dboard_param.get_input_object(), False)
+               vbox.pack_start(get_input(usrp_which_param), False)
+               vbox.pack_start(get_input(usrp_dboard_param), False)
                self.probe_button = gtk.Button('Probe')
                self.probe_button.connect('clicked', self._probe_usrp)
                vbox.pack_start(self.probe_button, False)