summaryrefslogtreecommitdiff
path: root/gr-filter/examples
diff options
context:
space:
mode:
authorJohnathan Corgan <johnathan@corganlabs.com>2016-08-01 14:49:18 -0700
committerJohnathan Corgan <johnathan@corganlabs.com>2016-08-01 14:49:18 -0700
commit1cdda44be516afd4197e1adda72bf2b2391a1955 (patch)
treea64d47ba9430fc5de93e6258376f90742350ae41 /gr-filter/examples
parentedbcd297b252c3ee9fc5544cbe12115f45c727a7 (diff)
parent4ac5869570075668c0c42b4473411c5e673db0d7 (diff)
Merge remote-tracking branch 'pinkavaj/argparse-filter-01' into next
Diffstat (limited to 'gr-filter/examples')
-rwxr-xr-xgr-filter/examples/fft_filter_ccc.py56
-rwxr-xr-xgr-filter/examples/fir_filter_ccc.py50
-rwxr-xr-xgr-filter/examples/fir_filter_fff.py50
3 files changed, 78 insertions, 78 deletions
diff --git a/gr-filter/examples/fft_filter_ccc.py b/gr-filter/examples/fft_filter_ccc.py
index 00b0697b6c..92bcc7e316 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)
diff --git a/gr-filter/examples/fir_filter_ccc.py b/gr-filter/examples/fir_filter_ccc.py
index b295e299bb..357e3d7111 100755
--- a/gr-filter/examples/fir_filter_ccc.py
+++ b/gr-filter/examples/fir_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:
@@ -65,27 +65,27 @@ class example_fir_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("-B", "--bandwidth", type="eng_float", default=1000,
- help="Filter bandwidth [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_fir_filter_ccc(options.nsamples,
- options.samplerate,
- options.bandwidth,
- 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("-B", "--bandwidth", type=eng_float, default=1000,
+ help="Filter bandwidth [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_fir_filter_ccc(args.nsamples,
+ args.samplerate,
+ args.bandwidth,
+ args.transition,
+ args.attenuation,
+ args.decimation)
put.run()
data_src = scipy.array(put.vsnk_src.data())
@@ -96,9 +96,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)
diff --git a/gr-filter/examples/fir_filter_fff.py b/gr-filter/examples/fir_filter_fff.py
index 60b61054e9..2019215f12 100755
--- a/gr-filter/examples/fir_filter_fff.py
+++ b/gr-filter/examples/fir_filter_fff.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:
@@ -65,27 +65,27 @@ class example_fir_filter_fff(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("-B", "--bandwidth", type="eng_float", default=1000,
- help="Filter bandwidth [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_fir_filter_fff(options.nsamples,
- options.samplerate,
- options.bandwidth,
- 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("-B", "--bandwidth", type=eng_float, default=1000,
+ help="Filter bandwidth [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_fir_filter_fff(args.nsamples,
+ args.samplerate,
+ args.bandwidth,
+ args.transition,
+ args.attenuation,
+ args.decimation)
put.run()
data_src = scipy.array(put.vsnk_src.data())
@@ -96,9 +96,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)
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 14:21:19 +0000