diff options
21 files changed, 37 insertions, 22 deletions
diff --git a/gr-analog/examples/fm_demod.py b/gr-analog/examples/fm_demod.py index e72688b1c5..961f06ff4d 100644 --- a/gr-analog/examples/fm_demod.py +++ b/gr-analog/examples/fm_demod.py @@ -14,6 +14,7 @@ from gnuradio import filter from gnuradio import analog from gnuradio import audio from gnuradio.filter import firdes +from gnuradio.fft import window import sys, math # Create a top_block @@ -49,7 +50,7 @@ class build_graph(gr.top_block): 15e3, # low pass cutoff freq 1e3, # width of trans. band 60, # stop band attenuaton - firdes.WIN_KAISER) + window.WIN_KAISER) # Build the resampler and filter resamp_filter = filter.pfb_arb_resampler_fff(resamp_rate, diff --git a/gr-analog/examples/fmtest.py b/gr-analog/examples/fmtest.py index d89c964d7c..0664238b6b 100644 --- a/gr-analog/examples/fmtest.py +++ b/gr-analog/examples/fmtest.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter +from gnuradio.fft import window from gnuradio import analog from gnuradio import channels import sys, math, time @@ -82,7 +83,7 @@ class fmtest(gr.top_block): self._chan_rate = self._if_rate / self._M self._taps = filter.firdes.low_pass_2(1, self._if_rate, bw, t_bw, attenuation_dB=100, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) tpc = math.ceil(float(len(self._taps)) / float(self._M)) print("Number of taps: ", len(self._taps)) diff --git a/gr-filter/examples/channelize.py b/gr-filter/examples/channelize.py index d46eb2a715..4d92bdce3f 100644 --- a/gr-filter/examples/channelize.py +++ b/gr-filter/examples/channelize.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter +from gnuradio.fft import window import sys, time import numpy @@ -39,7 +40,7 @@ class pfb_top_block(gr.top_block): # Create a set of taps for the PFB channelizer self._taps = filter.firdes.low_pass_2(1, self._ifs, 475.50, 50, attenuation_dB=100, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) # Calculate the number of taps per channel for our own information tpc = numpy.ceil(float(len(self._taps)) / float(self._M)) diff --git a/gr-filter/examples/chirp_channelize.py b/gr-filter/examples/chirp_channelize.py index 9d30554fc3..03efcf873f 100644 --- a/gr-filter/examples/chirp_channelize.py +++ b/gr-filter/examples/chirp_channelize.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter +from gnuradio.fft import window import sys, time import numpy @@ -38,7 +39,7 @@ class pfb_top_block(gr.top_block): # Create a set of taps for the PFB channelizer self._taps = filter.firdes.low_pass_2(1, self._fs, 500, 20, attenuation_dB=10, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) # Calculate the number of taps per channel for our own information tpc = numpy.ceil(float(len(self._taps)) / float(self._M)) diff --git a/gr-filter/examples/decimate.py b/gr-filter/examples/decimate.py index 99ababaa4d..8e2f3c7c36 100644 --- a/gr-filter/examples/decimate.py +++ b/gr-filter/examples/decimate.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter +from gnuradio.fft import window import sys, time import numpy @@ -40,7 +41,7 @@ class pfb_top_block(gr.top_block): self._taps = filter.firdes.low_pass_2(1, self._fs, 200, 150, attenuation_dB=120, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) # Calculate the number of taps per channel for our own information tpc = numpy.ceil(float(len(self._taps)) / float(self._decim)) diff --git a/gr-filter/examples/gr_filtdes_live_upd.py b/gr-filter/examples/gr_filtdes_live_upd.py index d173388137..807d550662 100644 --- a/gr-filter/examples/gr_filtdes_live_upd.py +++ b/gr-filter/examples/gr_filtdes_live_upd.py @@ -10,6 +10,7 @@ from gnuradio.filter import filter_design from gnuradio import gr, filter +from gnuradio.fft import window from gnuradio import blocks import sys @@ -60,7 +61,7 @@ class my_top_block(gr.top_block): channel = channels.channel_model(0.01) self.filt = filter.fft_filter_ccc(1, self.filt_taps) thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) - self.snk1 = qtgui.freq_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.freq_sink_c(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Freq Example", 1) diff --git a/gr-filter/examples/interpolate.py b/gr-filter/examples/interpolate.py index eed63938f7..8674566e25 100644 --- a/gr-filter/examples/interpolate.py +++ b/gr-filter/examples/interpolate.py @@ -11,6 +11,7 @@ from gnuradio import gr from gnuradio import blocks from gnuradio import filter +from gnuradio.fft import window import sys, time import numpy @@ -46,7 +47,7 @@ class pfb_top_block(gr.top_block): self._interp*self._fs, freq2+50, 50, attenuation_dB=120, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) # Create a set of taps for the PFB arbitrary resampler # The filter size is the number of filters in the filterbank; 32 will give very low side-lobes, @@ -58,7 +59,7 @@ class pfb_top_block(gr.top_block): flt_size*self._fs, freq2+50, 150, attenuation_dB=120, - window=filter.firdes.WIN_BLACKMAN_hARRIS) + window=window.WIN_BLACKMAN_hARRIS) # Calculate the number of taps per channel for our own information tpc = numpy.ceil(float(len(self._taps)) / float(self._interp)) diff --git a/gr-filter/examples/reconstruction.py b/gr-filter/examples/reconstruction.py index a9cf67511d..a484d6a27a 100644 --- a/gr-filter/examples/reconstruction.py +++ b/gr-filter/examples/reconstruction.py @@ -11,6 +11,7 @@ from gnuradio import gr, digital from gnuradio import filter from gnuradio import blocks +from gnuradio.fft import window import sys import numpy @@ -43,7 +44,7 @@ def main(): tb = 400 proto_taps = filter.firdes.low_pass_2(1, nchans*fs, bw, tb, 80, - filter.firdes.WIN_BLACKMAN_hARRIS) + window.WIN_BLACKMAN_hARRIS) print("Filter length: ", len(proto_taps)) diff --git a/gr-filter/lib/rational_resampler_impl.cc b/gr-filter/lib/rational_resampler_impl.cc index 9637ab18d1..d5642d4064 100644 --- a/gr-filter/lib/rational_resampler_impl.cc +++ b/gr-filter/lib/rational_resampler_impl.cc @@ -13,6 +13,7 @@ #endif #include "rational_resampler_impl.h" +#include <gnuradio/fft/window.h> #include <gnuradio/filter/firdes.h> #include <gnuradio/integer_math.h> #include <gnuradio/io_signature.h> @@ -62,7 +63,7 @@ std::vector<TAP_T> design_resampler_filter(const unsigned interpolation, interpolation, /* Fs */ mid_transition_band, /* trans mid point */ trans_width, /* transition width */ - firdes::WIN_KAISER, + fft::window::WIN_KAISER, beta); /* beta*/ } diff --git a/gr-filter/python/filter/bindings/pfb_arb_resampler_fff_python.cc b/gr-filter/python/filter/bindings/pfb_arb_resampler_fff_python.cc index 3857a96dbb..70cfab944b 100644 --- a/gr-filter/python/filter/bindings/pfb_arb_resampler_fff_python.cc +++ b/gr-filter/python/filter/bindings/pfb_arb_resampler_fff_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pfb_arb_resampler_fff.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c5e898dcdfca7ab572b39fcb3f977449) */ +/* BINDTOOL_HEADER_FILE_HASH(01c79a89ea9653af3845ae6feedf7112) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-filter/python/filter/bindings/pfb_arb_resampler_python.cc b/gr-filter/python/filter/bindings/pfb_arb_resampler_python.cc index 7d778ca6ef..926961b648 100644 --- a/gr-filter/python/filter/bindings/pfb_arb_resampler_python.cc +++ b/gr-filter/python/filter/bindings/pfb_arb_resampler_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pfb_arb_resampler.h) */ -/* BINDTOOL_HEADER_FILE_HASH(20d30db553c5a0baf55e49dcb9fd7f47) */ +/* BINDTOOL_HEADER_FILE_HASH(575adbe9dca6665e15803cdc1f2fa028) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-filter/python/filter/bindings/pfb_channelizer_ccf_python.cc b/gr-filter/python/filter/bindings/pfb_channelizer_ccf_python.cc index 3717f4f106..11a2b6ac10 100644 --- a/gr-filter/python/filter/bindings/pfb_channelizer_ccf_python.cc +++ b/gr-filter/python/filter/bindings/pfb_channelizer_ccf_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pfb_channelizer_ccf.h) */ -/* BINDTOOL_HEADER_FILE_HASH(58e2ad3c8033d6b70a93e1210389251a) */ +/* BINDTOOL_HEADER_FILE_HASH(e5e101f91f9b1d578affd27a80a639b7) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-filter/python/filter/bindings/pfb_decimator_ccf_python.cc b/gr-filter/python/filter/bindings/pfb_decimator_ccf_python.cc index c507f5c47e..d8b0f8b1d6 100644 --- a/gr-filter/python/filter/bindings/pfb_decimator_ccf_python.cc +++ b/gr-filter/python/filter/bindings/pfb_decimator_ccf_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pfb_decimator_ccf.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c5b86590e4f51a1b90b5b5464ee0fca1) */ +/* BINDTOOL_HEADER_FILE_HASH(b1bbd51a820b07e98a315670a82d4c64) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-filter/python/filter/bindings/pfb_interpolator_ccf_python.cc b/gr-filter/python/filter/bindings/pfb_interpolator_ccf_python.cc index 1e1b768b40..b9a612f126 100644 --- a/gr-filter/python/filter/bindings/pfb_interpolator_ccf_python.cc +++ b/gr-filter/python/filter/bindings/pfb_interpolator_ccf_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(pfb_interpolator_ccf.h) */ -/* BINDTOOL_HEADER_FILE_HASH(b5d91c997d6fec23021c8c0dd766e535) */ +/* BINDTOOL_HEADER_FILE_HASH(0cad2271ae2fb9771ab7a3e89dc95300) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-filter/python/filter/bindings/polyphase_filterbank_python.cc b/gr-filter/python/filter/bindings/polyphase_filterbank_python.cc index 383476bbc1..1001fec7a7 100644 --- a/gr-filter/python/filter/bindings/polyphase_filterbank_python.cc +++ b/gr-filter/python/filter/bindings/polyphase_filterbank_python.cc @@ -14,7 +14,7 @@ /* BINDTOOL_GEN_AUTOMATIC(0) */ /* BINDTOOL_USE_PYGCCXML(0) */ /* BINDTOOL_HEADER_FILE(polyphase_filterbank.h) */ -/* BINDTOOL_HEADER_FILE_HASH(00757cfefaac6f0906e8e0643ae0213c) */ +/* BINDTOOL_HEADER_FILE_HASH(107cf4797045f9c8e227c2c741e2ed4d) */ /***********************************************************************************/ #include <pybind11/complex.h> diff --git a/gr-qtgui/examples/pyqt_example_c.py b/gr-qtgui/examples/pyqt_example_c.py index d4b486944b..579dc462a7 100644 --- a/gr-qtgui/examples/pyqt_example_c.py +++ b/gr-qtgui/examples/pyqt_example_c.py @@ -9,6 +9,7 @@ # from gnuradio import gr, filter +from gnuradio.fft import window from gnuradio import blocks import sys @@ -144,7 +145,7 @@ class my_top_block(gr.top_block): src = blocks.add_cc() channel = channels.channel_model(0.001) thr = blocks.throttle(gr.sizeof_gr_complex, 100*fftsize) - self.snk1 = qtgui.sink_c(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.sink_c(fftsize, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Signal Example", True, True, True, False, None) diff --git a/gr-qtgui/examples/pyqt_example_f.py b/gr-qtgui/examples/pyqt_example_f.py index 0a567aaf06..2503e4b7fb 100644 --- a/gr-qtgui/examples/pyqt_example_f.py +++ b/gr-qtgui/examples/pyqt_example_f.py @@ -10,6 +10,7 @@ from gnuradio import gr, filter from gnuradio import blocks +from gnuradio.fft import window import sys try: @@ -135,7 +136,7 @@ class my_top_block(gr.top_block): thr = blocks.throttle(gr.sizeof_float, 100*fftsize) noise = analog.noise_source_f(analog.GR_GAUSSIAN, 0.001) add = blocks.add_ff() - self.snk1 = qtgui.sink_f(fftsize, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.sink_f(fftsize, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Float Signal Example", True, True, True, False, None) diff --git a/gr-qtgui/examples/pyqt_freq_c.py b/gr-qtgui/examples/pyqt_freq_c.py index 1489e05169..c8f806a797 100644 --- a/gr-qtgui/examples/pyqt_freq_c.py +++ b/gr-qtgui/examples/pyqt_freq_c.py @@ -10,6 +10,7 @@ from gnuradio import gr, filter from gnuradio import blocks +from gnuradio.fft import window import sys try: @@ -144,7 +145,7 @@ class my_top_block(gr.top_block): src = blocks.add_cc() channel = channels.channel_model(0.01) thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) - self.snk1 = qtgui.freq_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.freq_sink_c(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Freq Example", 3, None) diff --git a/gr-qtgui/examples/pyqt_freq_f.py b/gr-qtgui/examples/pyqt_freq_f.py index 753e7c84e4..3aa5e6bc01 100644 --- a/gr-qtgui/examples/pyqt_freq_f.py +++ b/gr-qtgui/examples/pyqt_freq_f.py @@ -10,6 +10,7 @@ from gnuradio import gr, filter from gnuradio import blocks +from gnuradio.fft import window import sys try: @@ -134,7 +135,7 @@ class my_top_block(gr.top_block): src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) src = blocks.add_ff() thr = blocks.throttle(gr.sizeof_float, 100*npts) - self.snk1 = qtgui.freq_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.freq_sink_f(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Real freq Example", 3, None) diff --git a/gr-qtgui/examples/pyqt_waterfall_c.py b/gr-qtgui/examples/pyqt_waterfall_c.py index f0b3cf4e5e..4d1361e0d9 100644 --- a/gr-qtgui/examples/pyqt_waterfall_c.py +++ b/gr-qtgui/examples/pyqt_waterfall_c.py @@ -10,6 +10,7 @@ from gnuradio import gr, filter from gnuradio import blocks +from gnuradio.fft import window import sys try: @@ -147,7 +148,7 @@ class my_top_block(gr.top_block): channel = channels.channel_model(0.01) thr = blocks.throttle(gr.sizeof_gr_complex, 100*npts) filt = filter.fft_filter_ccc(1, taps) - self.snk1 = qtgui.waterfall_sink_c(npts, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.waterfall_sink_c(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Complex Waterfall Example", 2, None) self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) diff --git a/gr-qtgui/examples/pyqt_waterfall_f.py b/gr-qtgui/examples/pyqt_waterfall_f.py index 6898ef43b5..d7778047cc 100644 --- a/gr-qtgui/examples/pyqt_waterfall_f.py +++ b/gr-qtgui/examples/pyqt_waterfall_f.py @@ -10,6 +10,7 @@ from gnuradio import gr, filter from gnuradio import blocks +from gnuradio.fft import window import sys try: @@ -133,7 +134,7 @@ class my_top_block(gr.top_block): src2 = analog.sig_source_f(Rs, analog.GR_SIN_WAVE, f2, 0.1, 0) src = blocks.add_ff() thr = blocks.throttle(gr.sizeof_float, 100*npts) - self.snk1 = qtgui.waterfall_sink_f(npts, filter.firdes.WIN_BLACKMAN_hARRIS, + self.snk1 = qtgui.waterfall_sink_f(npts, window.WIN_BLACKMAN_hARRIS, 0, Rs, "Real Waterfall Example", 2, None) self.snk1.set_color_map(0, qtgui.INTENSITY_COLOR_MAP_TYPE_COOL) |