diff options
| author | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-06-23 20:38:18 +0000 |
|---|---|---|
| committer | jblum <jblum@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-06-23 20:38:18 +0000 |
| commit | 9988664127b367fa8fee4409f8460673d6f265e1 (patch) | |
| tree | 96752c15b7f1447e5e78a7282d1de141f9e0000b /grc/scripts | |
| parent | 885e6fe1fd0e06476511c79515f34ffcef50287d (diff) | |
Merging r11186:11273 from grc branch.
Fixes, features, and reorganization for grc.
Minor fixes and features for wxgui forms.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11274 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'grc/scripts')
| -rwxr-xr-x | grc/scripts/grc | 11 | ||||
| -rwxr-xr-x | grc/scripts/usrp2_probe | 6 | ||||
| -rwxr-xr-x | grc/scripts/usrp_probe | 6 |
3 files changed, 9 insertions, 14 deletions
diff --git a/grc/scripts/grc b/grc/scripts/grc index a2e3bc28ac..8a6cc0af4f 100755 --- a/grc/scripts/grc +++ b/grc/scripts/grc @@ -18,8 +18,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ -import os - import pygtk pygtk.require('2.0') import gtk @@ -32,7 +30,7 @@ Cannot import gnuradio. Are your PYTHONPATH and LD_LIBRARY_PATH set correctly?"" d.run() exit(-1) -from gnuradio.grc.platforms.base.Constants import VERSION +from gnuradio.grc import VERSION from optparse import OptionParser if __name__ == "__main__": @@ -47,13 +45,10 @@ and you are welcome to redistribute it. """%VERSION parser = OptionParser(usage=usage, version=version) (options, args) = parser.parse_args() - from gnuradio.grc.platforms.python.Platform import Platform + from gnuradio.grc.python.Platform import Platform from gnuradio.grc.gui.ActionHandler import ActionHandler #setup icon using icon theme try: gtk.window_set_default_icon(gtk.IconTheme().load_icon('gnuradio-grc', 256, 0)) except: pass - #extract extra block paths from environment variable, separated by semicolon - try: extra_blocks = os.environ['GRC_BLOCKS_PATH'].split(';') - except: extra_blocks = list() - ActionHandler(args, Platform(extra_blocks=extra_blocks)) + ActionHandler(args, Platform()) diff --git a/grc/scripts/usrp2_probe b/grc/scripts/usrp2_probe index fac2427de0..00d4366ddf 100755 --- a/grc/scripts/usrp2_probe +++ b/grc/scripts/usrp2_probe @@ -29,10 +29,10 @@ import gobject from gnuradio.grc.gui.Dialogs import TextDisplay -from gnuradio.grc.platforms.python.Platform import Platform -platform = Platform(critical_only=True) +from gnuradio.grc.python.Platform import Platform +platform = Platform() -from gnuradio.grc.platforms.gui.Platform import Platform +from gnuradio.grc.gui.Platform import Platform platform = Platform(platform) flow_graph = platform.get_new_flow_graph() diff --git a/grc/scripts/usrp_probe b/grc/scripts/usrp_probe index 3eb3de58ed..6565612c16 100755 --- a/grc/scripts/usrp_probe +++ b/grc/scripts/usrp_probe @@ -27,10 +27,10 @@ import gtk from gnuradio.grc.gui.Dialogs import TextDisplay -from gnuradio.grc.platforms.python.Platform import Platform -platform = Platform(critical_only=True) +from gnuradio.grc.python.Platform import Platform +platform = Platform() -from gnuradio.grc.platforms.gui.Platform import Platform +from gnuradio.grc.gui.Platform import Platform platform = Platform(platform) flow_graph = platform.get_new_flow_graph() |