diff options
| author | Matt Ettus | 2009-09-24 22:34:06 -0700 |
|---|---|---|
| committer | Matt Ettus | 2009-09-24 22:34:06 -0700 |
| commit | 5c46578ba936de57e80594540804c964aa408f73 (patch) | |
| tree | cf164f8e3d80b78971fb2987740b7d957ee1f306 /grc/blocks/options.xml | |
| parent | 35ada01aa8ae838d6d75bf063725218fa7e18f5f (diff) | |
| parent | 16474a0adb44dc81a8338a9c4a9a6dcab6f6328f (diff) | |
| download | gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.gz gnuradio-5c46578ba936de57e80594540804c964aa408f73.tar.bz2 gnuradio-5c46578ba936de57e80594540804c964aa408f73.zip | |
Merge commit 'origin' into new_eth
Conflicts:
.gitignore
Diffstat (limited to 'grc/blocks/options.xml')
| -rw-r--r-- | grc/blocks/options.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml index 18d6e2f0c..1798a69f8 100644 --- a/grc/blocks/options.xml +++ b/grc/blocks/options.xml @@ -9,16 +9,17 @@ <block> <name>Options</name> <key>options</key> - <import>from gnuradio import gr -#if $generate_options() == 'wx_gui' + <import>from gnuradio import gr</import> + <import>from gnuradio.gr import firdes</import> + <import>#if $generate_options() == 'wx_gui' from grc_gnuradio import wxgui as grc_wxgui import wx #end if #if $generate_options() != 'hb' from optparse import OptionParser from gnuradio.eng_option import eng_option -#end if -</import> +from gnuradio import eng_notation +#end if</import> <make></make> <callback>if $run: self.start() else: self.stop(); self.wait()</callback> |