[Commit-gnuradio] [gnuradio] 02/13: filter: fft_filter_ccc - replace OptionParser by ArgumentParser

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch next
in repository gnuradio.

commit e0d5c273ab0e199e191e92f8a46325916a19ab27
Author: Jiří Pinkava <address@hidden>
Date:   Sun Jun 26 13:04:39 2016 +0200

    filter: fft_filter_ccc - replace OptionParser by ArgumentParser
---
 gr-filter/examples/fft_filter_ccc.py | 56 ++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gr-filter/examples/fft_filter_ccc.py 
b/gr-filter/examples/fft_filter_ccc.py
index 00b0697..92bcc7e 100755
--- a/gr-filter/examples/fft_filter_ccc.py
+++ b/gr-filter/examples/fft_filter_ccc.py
@@ -24,8 +24,8 @@ from gnuradio import gr, filter
 from gnuradio import analog
 from gnuradio import blocks
 from gnuradio import eng_notation
-from gnuradio.eng_option import eng_option
-from optparse import OptionParser
+from gnuradio.eng_arg import eng_float, intx
+from argparse import ArgumentParser
 import sys
 
 try:
@@ -68,30 +68,30 @@ class example_fft_filter_ccc(gr.top_block):
         self.connect(self.head, self.filt0, self.vsnk_out)
 
 def main():
-    parser = OptionParser(option_class=eng_option, conflict_handler="resolve")
-    parser.add_option("-N", "--nsamples", type="int", default=10000,
-                      help="Number of samples to process [default=%default]")
-    parser.add_option("-s", "--samplerate", type="eng_float", default=8000,
-                      help="System sample rate [default=%default]")
-    parser.add_option("-S", "--start-pass", type="eng_float", default=1000,
-                      help="Start of Passband [default=%default]")
-    parser.add_option("-E", "--end-pass", type="eng_float", default=2000,
-                      help="End of Passband [default=%default]")
-    parser.add_option("-T", "--transition", type="eng_float", default=100,
-                      help="Transition band [default=%default]")
-    parser.add_option("-A", "--attenuation", type="eng_float", default=80,
-                      help="Stopband attenuation [default=%default]")
-    parser.add_option("-D", "--decimation", type="int", default=1,
-                      help="Decmation factor [default=%default]")
-    (options, args) = parser.parse_args ()
-
-    put = example_fft_filter_ccc(options.nsamples,
-                                 options.samplerate,
-                                 options.start_pass,
-                                 options.end_pass,
-                                 options.transition,
-                                 options.attenuation,
-                                 options.decimation)
+    parser = ArgumentParser(conflict_handler="resolve")
+    parser.add_argument("-N", "--nsamples", type=int, default=10000,
+                      help="Number of samples to process 
[default=%(default)r]")
+    parser.add_argument("-s", "--samplerate", type=eng_float, default=8000,
+                      help="System sample rate [default=%(default)r]")
+    parser.add_argument("-S", "--start-pass", type=eng_float, default=1000,
+                      help="Start of Passband [default=%(default)r]")
+    parser.add_argument("-E", "--end-pass", type=eng_float, default=2000,
+                      help="End of Passband [default=%(default)r]")
+    parser.add_argument("-T", "--transition", type=eng_float, default=100,
+                      help="Transition band [default=%(default)r]")
+    parser.add_argument("-A", "--attenuation", type=eng_float, default=80,
+                      help="Stopband attenuation [default=%(default)r]")
+    parser.add_argument("-D", "--decimation", type=int, default=1,
+                      help="Decmation factor [default=%(default)r]")
+    args = parser.parse_args()
+
+    put = example_fft_filter_ccc(args.nsamples,
+                                 args.samplerate,
+                                 args.start_pass,
+                                 args.end_pass,
+                                 args.transition,
+                                 args.attenuation,
+                                 args.decimation)
     put.run()
 
     data_src = scipy.array(put.vsnk_src.data())
@@ -102,9 +102,9 @@ def main():
     f1 = pylab.figure(1, figsize=(12,10))
     s1 = f1.add_subplot(1,1,1)
     s1.psd(data_src, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
     s1.psd(data_snk, NFFT=nfft, noverlap=nfft/4,
-           Fs=options.samplerate)
+           Fs=args.samplerate)
 
     f2 = pylab.figure(2, figsize=(12,10))
     s2 = f2.add_subplot(1,1,1)