diff options
Diffstat (limited to 'gr-qtgui/apps')
25 files changed, 223 insertions, 257 deletions
diff --git a/gr-qtgui/apps/CMakeLists.txt b/gr-qtgui/apps/CMakeLists.txt index 3c64cb6e0a..6a8e6c51aa 100644 --- a/gr-qtgui/apps/CMakeLists.txt +++ b/gr-qtgui/apps/CMakeLists.txt @@ -33,7 +33,6 @@ GR_PYTHON_INSTALL( plot_time_form.py plot_time_raster_form.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/qtgui - COMPONENT "qtgui_python" ) GR_PYTHON_INSTALL( @@ -58,5 +57,4 @@ GR_PYTHON_INSTALL( gr_spectrogram_plot gr_constellation_plot DESTINATION ${GR_RUNTIME_DIR} - COMPONENT "qtgui_python" ) diff --git a/gr-qtgui/apps/gr_constellation_plot b/gr-qtgui/apps/gr_constellation_plot index 528bb97e5a..ff5db1a9a6 100755 --- a/gr-qtgui/apps/gr_constellation_plot +++ b/gr-qtgui/apps/gr_constellation_plot @@ -22,8 +22,8 @@ from gnuradio import gr from gnuradio import blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os, sys try: @@ -143,32 +143,27 @@ class my_top_block(gr.top_block): def main(): description = "Plots the constellations of a list of files." - parser = OptionParser(option_class=eng_option, description=description, + parser = ArgumentParser(description=description, conflict_handler="resolve") - parser.add_option("-N", "--nsamples", type="int", default=1000000, - help="Set the number of samples to display [default=%default]") - parser.add_option("-S", "--start", type="int", default=0, - help="Starting sample number [default=%default]") - (options, args) = parser.parse_args() + parser.add_argument("-N", "--nsamples", type=int, default=1000000, + help="Set the number of samples to display [default=%(default)r]") + parser.add_argument("-S", "--start", type=int, default=0, + help="Starting sample number [default=%(default)r]") + parser.add_argument("files", nargs="+", metavar='FILE') + args = parser.parse_args() - if(len(args) < 1): - parser.print_help() - sys.exit(0) - - filelist = list(args) - - nsamples = options.nsamples + filelist = args.files + nsamples = args.nsamples # Find the smallest number of samples in all files and use that as # a maximum value possible. filesizes = [] for f in filelist: if(os.path.exists(f)): - filesizes.append(os.path.getsize(f) / gr.sizeof_gr_complex) + filesizes.append(os.path.getsize(f) // gr.sizeof_gr_complex) max_nsamples = min(filesizes) - tb = my_top_block(filelist, - options.start, nsamples, max_nsamples); + tb = my_top_block(filelist, args.start, nsamples, max_nsamples); main_box = plot_constellation_form(tb, 'GNU Radio Constellation Plot', 10000.0) for n in xrange(tb._nsigs): diff --git a/gr-qtgui/apps/gr_psd_plot_b b/gr-qtgui/apps/gr_psd_plot_b index 606311af48..26263112ca 100755 --- a/gr-qtgui/apps/gr_psd_plot_b +++ b/gr-qtgui/apps/gr_psd_plot_b @@ -54,16 +54,15 @@ class psd_plot_b(plot_base.plot_base): def main(): description = "Plots the PSDs of a list of files. Files are a binary list of bytes." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = psd_plot_b(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average) + tb = psd_plot_b(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average) main_box = plot_base.plot_psd_form(tb, 'GNU Radio PSD Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_psd_plot_c b/gr-qtgui/apps/gr_psd_plot_c index 6df9fae190..1bd847b607 100755 --- a/gr-qtgui/apps/gr_psd_plot_c +++ b/gr-qtgui/apps/gr_psd_plot_c @@ -55,16 +55,15 @@ class psd_plot_c(plot_base.plot_base): def main(): description = "Plots the PSDs of a list of files. Files are a binary list of complex floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = psd_plot_c(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average) + tb = psd_plot_c(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average) main_box = plot_base.plot_psd_form(tb, 'GNU Radio PSD Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_psd_plot_f b/gr-qtgui/apps/gr_psd_plot_f index f07e3e8b50..04f1b03486 100755 --- a/gr-qtgui/apps/gr_psd_plot_f +++ b/gr-qtgui/apps/gr_psd_plot_f @@ -55,16 +55,15 @@ class psd_plot_f(plot_base.plot_base): def main(): description = "Plots the PSDs of a list of files. Files are a binary list of floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = psd_plot_f(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average) + tb = psd_plot_f(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average) main_box = plot_base.plot_psd_form(tb, 'GNU Radio PSD Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_psd_plot_i b/gr-qtgui/apps/gr_psd_plot_i index 1852345823..46bdd7bc84 100755 --- a/gr-qtgui/apps/gr_psd_plot_i +++ b/gr-qtgui/apps/gr_psd_plot_i @@ -54,16 +54,15 @@ class psd_plot_i(plot_base.plot_base): def main(): description = "Plots the PSDs of a list of files. Files are a binary list of integers." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = psd_plot_i(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average) + tb = psd_plot_i(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average) main_box = plot_base.plot_psd_form(tb, 'GNU Radio PSD Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_psd_plot_s b/gr-qtgui/apps/gr_psd_plot_s index c06076f1f9..8dc4a05d55 100755 --- a/gr-qtgui/apps/gr_psd_plot_s +++ b/gr-qtgui/apps/gr_psd_plot_s @@ -54,16 +54,15 @@ class psd_plot_s(plot_base.plot_base): def main(): description = "Plots the PSDs of a list of files. Files are a binary list of shorts." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = psd_plot_s(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average) + tb = psd_plot_s(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average) main_box = plot_base.plot_psd_form(tb, 'GNU Radio PSD Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_spectrogram_plot b/gr-qtgui/apps/gr_spectrogram_plot index db79f9dbad..8e8ba86757 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot +++ b/gr-qtgui/apps/gr_spectrogram_plot @@ -142,55 +142,54 @@ def read_header(filelist): def main(): description = 'Plots the spectrogram (waterfall) of a file with detached header.' description += ' Assumes header is <input_filename>.hdr' - (options, args) = plot_base.setup_options(description) - filelist = list(args) + args = plot_base.setup_options(description) # Attempt to read the header information - info = read_header(filelist) + info = read_header(args.files) # If no header, quit if not info: sys.stderr.write('Header not found\n') sys.exit(1) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) srate = info["rx_rate"] # Dispatch the proper function # Complex Types if(info["cplx"] == True): if( info["type"] == "float" ): - tb = spectrogram_plot_c(filelist, - options.center_frequency,srate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_c(args.files, + args.center_frequency,srate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); else: sys.stderr.write("Complex File Type " + info["type"]+ " not supported.\n") # Real Types else: if( info["type"] == "bytes" ): - tb = spectrogram_plot_b(filelist, - options.center_frequency,srate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_b(args.files, + args.center_frequency,srate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); elif( info["type"] == "int" ): - tb = spectrogram_plot_i(filelist, - options.center_frequency,srate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_i(args.files, + args.center_frequency,srate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); elif( info["type"] == "float" ): - tb = spectrogram_plot_f(filelist, - options.center_frequency,srate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_f(args.files, + args.center_frequency,srate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); elif( info["type"] == "short" ): - tb = spectrogram_plot_s(filelist, - options.center_frequency,srate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_s(args.files, + args.center_frequency,srate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); else: sys.stderr.write("Real File Type " + info["type"] + " not supported\n") main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Spectrogram Plot') diff --git a/gr-qtgui/apps/gr_spectrogram_plot_b b/gr-qtgui/apps/gr_spectrogram_plot_b index 0d7a16ea6e..6045ebfadd 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_b +++ b/gr-qtgui/apps/gr_spectrogram_plot_b @@ -54,16 +54,15 @@ class spectrogram_plot_b(plot_base.plot_base): def main(): description = "Plots the spectrogram (waterfall) of a list of files. Files are a binary list of chars." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = spectrogram_plot_b(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_b(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_spectrogram_plot_c b/gr-qtgui/apps/gr_spectrogram_plot_c index 52b0d4dff7..a2e63d0113 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_c +++ b/gr-qtgui/apps/gr_spectrogram_plot_c @@ -55,16 +55,15 @@ class spectrogram_plot_c(plot_base.plot_base): def main(): description = "Plots the spectrogram (waterfall) of a list of files. Files are a binary list of complex floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = spectrogram_plot_c(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_c(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Spectrogram Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_spectrogram_plot_f b/gr-qtgui/apps/gr_spectrogram_plot_f index 6ea5afc4ef..d131747486 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_f +++ b/gr-qtgui/apps/gr_spectrogram_plot_f @@ -55,16 +55,15 @@ class spectrogram_plot_f(plot_base.plot_base): def main(): description = "Plots the spectrogram (waterfall) of a list of files. Files are a binary list of floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = spectrogram_plot_f(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_f(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_spectrogram_plot_i b/gr-qtgui/apps/gr_spectrogram_plot_i index 893df2a234..723291d4b4 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_i +++ b/gr-qtgui/apps/gr_spectrogram_plot_i @@ -54,16 +54,15 @@ class spectrogram_plot_i(plot_base.plot_base): def main(): description = "Plots the spectrogram (waterfall) of a list of files. Files are a binary list of ints." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = spectrogram_plot_i(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_i(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_spectrogram_plot_s b/gr-qtgui/apps/gr_spectrogram_plot_s index 82a22f740d..606fbf95e4 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_s +++ b/gr-qtgui/apps/gr_spectrogram_plot_s @@ -54,16 +54,15 @@ class spectrogram_plot_s(plot_base.plot_base): def main(): description = "Plots the spectrogram (waterfall) of a list of files. Files are a binary list of shorts." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = spectrogram_plot_s(filelist, - options.center_frequency, options.sample_rate, - options.psd_size, - options.start, options.nsamples, max_nsamples, - options.average); + tb = spectrogram_plot_s(args.files, + args.center_frequency, args.sample_rate, + args.psd_size, + args.start, args.nsamples, max_nsamples, + args.average); main_box = plot_base.plot_spectrogram_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_time_plot_b b/gr-qtgui/apps/gr_time_plot_b index d822557f1b..a2f63cc4bf 100755 --- a/gr-qtgui/apps/gr_time_plot_b +++ b/gr-qtgui/apps/gr_time_plot_b @@ -52,14 +52,13 @@ class plot_time_b(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of chars." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_b(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - not options.no_auto_scale) + tb = plot_time_b(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + not args.no_auto_scale) main_box = plot_base.plot_time_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_time_plot_c b/gr-qtgui/apps/gr_time_plot_c index 202e0f88f4..3dfccad804 100755 --- a/gr-qtgui/apps/gr_time_plot_c +++ b/gr-qtgui/apps/gr_time_plot_c @@ -54,14 +54,13 @@ class plot_time_c(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of complex floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_c(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - not options.no_auto_scale) + tb = plot_time_c(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + not args.no_auto_scale) main_box = plot_base.plot_time_form(tb, 'GNU Radio Time Plot', 10000.0) main_box.show() diff --git a/gr-qtgui/apps/gr_time_plot_f b/gr-qtgui/apps/gr_time_plot_f index 8f5ad9f60d..59b340de9e 100755 --- a/gr-qtgui/apps/gr_time_plot_f +++ b/gr-qtgui/apps/gr_time_plot_f @@ -53,14 +53,13 @@ class plot_time_f(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_f(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - not options.no_auto_scale) + tb = plot_time_f(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + not args.no_auto_scale) main_box = plot_base.plot_time_form(tb, 'GNU Radio Time Plot', 10000.0) main_box.show() diff --git a/gr-qtgui/apps/gr_time_plot_i b/gr-qtgui/apps/gr_time_plot_i index 8a7888b451..66c0a7f9cf 100755 --- a/gr-qtgui/apps/gr_time_plot_i +++ b/gr-qtgui/apps/gr_time_plot_i @@ -52,14 +52,13 @@ class plot_time_i(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of integers." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_i(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - not options.no_auto_scale) + tb = plot_time_i(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + not args.no_auto_scale) main_box = plot_base.plot_time_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_time_plot_s b/gr-qtgui/apps/gr_time_plot_s index 7cee262379..b2e42320db 100755 --- a/gr-qtgui/apps/gr_time_plot_s +++ b/gr-qtgui/apps/gr_time_plot_s @@ -52,14 +52,13 @@ class plot_time_s(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of shorts." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_s(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - not options.no_auto_scale) + tb = plot_time_s(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + not args.no_auto_scale) main_box = plot_base.plot_time_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_time_raster_b b/gr-qtgui/apps/gr_time_raster_b index ad8691489c..6cd93b0965 100755 --- a/gr-qtgui/apps/gr_time_raster_b +++ b/gr-qtgui/apps/gr_time_raster_b @@ -56,15 +56,14 @@ class plot_time_raster_b(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of chars." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_raster_b(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - options.nrows, options.ncols, - not options.no_auto_scale) + tb = plot_time_raster_b(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + args.nrows, args.ncols, + not args.no_auto_scale) main_box = plot_base.plot_time_raster_form(tb, 'GNU Radio Time Plot') main_box.show() diff --git a/gr-qtgui/apps/gr_time_raster_f b/gr-qtgui/apps/gr_time_raster_f index 5d6a8389cf..944d739978 100755 --- a/gr-qtgui/apps/gr_time_raster_f +++ b/gr-qtgui/apps/gr_time_raster_f @@ -56,15 +56,14 @@ class plot_time_raster_f(plot_base.plot_base): def main(): description = "Plots a list of files on a scope plot. Files are a binary list of floats." - (options, args) = plot_base.setup_options(description) + args = plot_base.setup_options(description) - filelist = list(args) - max_nsamples = plot_base.find_max_nsamples(filelist) + max_nsamples = plot_base.find_max_nsamples(args.files) - tb = plot_time_raster_f(filelist, options.sample_rate, - options.start, options.nsamples, max_nsamples, - options.nrows, options.ncols, - not options.no_auto_scale) + tb = plot_time_raster_f(args.files, args.sample_rate, + args.start, args.nsamples, max_nsamples, + args.nrows, args.ncols, + not args.no_auto_scale) main_box = plot_base.plot_time_raster_form(tb, 'GNU Radio Time Plot', 10000.0) main_box.show() diff --git a/gr-qtgui/apps/plot_base.py b/gr-qtgui/apps/plot_base.py index eaab7599c7..7a039e2135 100644 --- a/gr-qtgui/apps/plot_base.py +++ b/gr-qtgui/apps/plot_base.py @@ -21,8 +21,6 @@ # from gnuradio import gr, blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser import os, sys os.environ['GR_CONF_CONTROLPORT_ON'] = 'False' diff --git a/gr-qtgui/apps/plot_psd_base.py b/gr-qtgui/apps/plot_psd_base.py index 46f903e1b5..c3c03ec977 100644 --- a/gr-qtgui/apps/plot_psd_base.py +++ b/gr-qtgui/apps/plot_psd_base.py @@ -21,8 +21,8 @@ # from gnuradio import gr, blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os, sys try: @@ -141,23 +141,21 @@ class plot_base(gr.top_block): self.start() def setup_options(desc): - parser = OptionParser(option_class=eng_option, description=desc, - conflict_handler="resolve") - parser.add_option("-N", "--nsamples", type="int", default=1000000, + parser = ArgumentParser(description=desc, conflict_handler="resolve") + parser.add_argument("-N", "--nsamples", type=int, default=1000000, help="Set the number of samples to display [default=prints entire file]") - parser.add_option("-S", "--start", type="int", default=0, - help="Starting sample number [default=%default]") - parser.add_option("-L", "--psd-size", type="int", default=2048, - help="Set the FFT size of the PSD [default=%default]") - parser.add_option("-f", "--center-frequency", type="eng_float", default=0.0, - help="Set the center frequency of the signal [default=%default]") - parser.add_option("-r", "--sample-rate", type="eng_float", default=1.0, - help="Set the sample rate of the signal [default=%default]") - parser.add_option("-a", "--average", type="float", default=1.0, - help="Set amount of averaging (smaller=more averaging) [default=%default]") - (options, args) = parser.parse_args() - - if(len(args) < 1): - parser.print_help() - sys.exit(0) - return (options,args) + parser.add_argument("-S", "--start", type=int, default=0, + help="Starting sample number [default=%(default)r]") + parser.add_argument("-L", "--psd-size", type=int, default=2048, + help="Set the FFT size of the PSD [default=%(default)r]") + parser.add_argument("-f", "--center-frequency", type=eng_float, default=0.0, + help="Set the center frequency of the signal [default=%(default)r]") + parser.add_argument("-r", "--sample-rate", type=eng_float, default=1.0, + help="Set the sample rate of the signal [default=%(default)r]") + parser.add_argument("-a", "--average", type=float, default=1.0, + help="Set amount of averaging (smaller=more averaging) [default=%(default)r]") + parser.add_argument("files", nargs='+', metavar='FILE', + help="Complex samples") + args = parser.parse_args() + + return args diff --git a/gr-qtgui/apps/plot_spectrogram_base.py b/gr-qtgui/apps/plot_spectrogram_base.py index b252bb8863..f568100719 100644 --- a/gr-qtgui/apps/plot_spectrogram_base.py +++ b/gr-qtgui/apps/plot_spectrogram_base.py @@ -21,8 +21,8 @@ # from gnuradio import gr, blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os, sys try: @@ -146,25 +146,22 @@ class plot_base(gr.top_block): self.start() def setup_options(desc): - parser = OptionParser(option_class=eng_option, description=desc, - conflict_handler="resolve") - parser.add_option("-N", "--nsamples", type="int", default=1000000, - help="Set the number of samples to display [default=%default]") - parser.add_option("-S", "--start", type="int", default=0, - help="Starting sample number [default=%default]") - parser.add_option("-L", "--psd-size", type="int", default=2048, - help="Set the FFT size of the PSD [default=%default]") - parser.add_option("-f", "--center-frequency", type="eng_float", default=0.0, - help="Set the center frequency of the signal [default=%default]") - parser.add_option("-r", "--sample-rate", type="eng_float", default=1.0, - help="Set the sample rate of the signal [default=%default]") - parser.add_option("-a", "--average", type="float", default=1.0, - help="Set amount of averaging (smaller=more averaging) [default=%default]") - (options, args) = parser.parse_args() - - if(len(args) < 1): - parser.print_help() - sys.exit(0) - - return (options, args) + parser = ArgumentParser(description=desc, conflict_handler="resolve") + parser.add_argument("-N", "--nsamples", type=int, default=1000000, + help="Set the number of samples to display [default=%(default)r]") + parser.add_argument("-S", "--start", type=int, default=0, + help="Starting sample number [default=%(default)r]") + parser.add_argument("-L", "--psd-size", type=int, default=2048, + help="Set the FFT size of the PSD [default=%(default)r]") + parser.add_argument("-f", "--center-frequency", type=eng_float, default=0.0, + help="Set the center frequency of the signal [default=%(default)r]") + parser.add_argument("-r", "--sample-rate", type=eng_float, default=1.0, + help="Set the sample rate of the signal [default=%(default)r]") + parser.add_argument("-a", "--average", type=float, default=1.0, + help="Set amount of averaging (smaller=more averaging) [default=%(default)r]") + parser.add_argument('files', nargs='+', metavar='FILE', + help="File with complex samples") + args = parser.parse_args() + + return args diff --git a/gr-qtgui/apps/plot_time_base.py b/gr-qtgui/apps/plot_time_base.py index 007c94d044..cfbe5dc6cb 100644 --- a/gr-qtgui/apps/plot_time_base.py +++ b/gr-qtgui/apps/plot_time_base.py @@ -21,8 +21,8 @@ # from gnuradio import gr, blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os, sys try: @@ -166,19 +166,18 @@ class plot_base(gr.top_block): self._auto_scale = False def setup_options(desc): - parser = OptionParser(option_class=eng_option, description=desc, - conflict_handler="resolve") - parser.add_option("-N", "--nsamples", type="int", default=1000000, - help="Set the number of samples to display [default=%default]") - parser.add_option("-S", "--start", type="int", default=0, - help="Starting sample number [default=%default]") - parser.add_option("-r", "--sample-rate", type="eng_float", default=1.0, - help="Set the sample rate of the signal [default=%default]") - parser.add_option("", "--no-auto-scale", action="store_true", default=False, - help="Do not auto-scale the plot [default=%default]") - (options,args) = parser.parse_args() - if(len(args) < 1): - parser.print_help() - sys.exit(0) - return (options,args) + parser = ArgumentParser(description=desc, conflict_handler="resolve") + parser.add_argument("-N", "--nsamples", type=int, default=1000000, + help="Set the number of samples to display [default=%(default)r]") + parser.add_argument("-S", "--start", type=int, default=0, + help="Starting sample number [default=%(default)r]") + parser.add_argument("-r", "--sample-rate", type=eng_float, default=1.0, + help="Set the sample rate of the signal [default=%(default)r]") + parser.add_argument("--no-auto-scale", action="store_true", + help="Do not auto-scale the plot [default=%(default)r]") + parser.add_argument("files", nargs='+', metavar="FILE", + help="File with complex samples") + args = parser.parse_args() + + return args diff --git a/gr-qtgui/apps/plot_time_raster_base.py b/gr-qtgui/apps/plot_time_raster_base.py index 856c8c8945..e84b84c295 100644 --- a/gr-qtgui/apps/plot_time_raster_base.py +++ b/gr-qtgui/apps/plot_time_raster_base.py @@ -21,8 +21,8 @@ # from gnuradio import gr, blocks -from gnuradio.eng_option import eng_option -from optparse import OptionParser +from gnuradio.eng_arg import eng_float, intx +from argparse import ArgumentParser import os, sys try: @@ -161,23 +161,22 @@ class plot_base(gr.top_block): self._auto_scale = False def setup_options(desc): - parser = OptionParser(option_class=eng_option, description=desc, - conflict_handler="resolve") - parser.add_option("-N", "--nsamples", type="int", default=1000000, - help="Set the number of samples to display [default=%default]") - parser.add_option("-S", "--start", type="int", default=0, - help="Starting sample number [default=%default]") - parser.add_option("-C", "--ncols", type="int", default=100, - help="Number of columns [default=%default]") - parser.add_option("-R", "--nrows", type="int", default=100, - help="Number of rows [default=%default]") - parser.add_option("-r", "--sample-rate", type="eng_float", default=1.0, - help="Set the sample rate of the signal [default=%default]") - parser.add_option("", "--no-auto-scale", action="store_true", default=False, - help="Do not auto-scale the plot [default=%default]") - (options,args) = parser.parse_args() - if(len(args) < 1): - parser.print_help() - sys.exit(0) - return (options,args) + parser = ArgumentParser(description=desc, conflict_handler="resolve") + parser.add_argument("-N", "--nsamples", type=int, default=1000000, + help="Set the number of samples to display [default=%(default)r]") + parser.add_argument("-S", "--start", type=int, default=0, + help="Starting sample number [default=%(default)r]") + parser.add_argument("-C", "--ncols", type=int, default=100, + help="Number of columns [default=%(default)r]") + parser.add_argument("-R", "--nrows", type=int, default=100, + help="Number of rows [default=%(default)r]") + parser.add_argument("-r", "--sample-rate", type=eng_float, default=1.0, + help="Set the sample rate of the signal [default=%(default)r]") + parser.add_argument("--no-auto-scale", action="store_true", + help="Do not auto-scale the plot [default=%(default)r]") + parser.add_argument("files", nargs="+", metavar="FILE", + help="Input files with complex samples") + args = parser.parse_args() + + return args |