Skip to content

Commit d2194d1

Browse files
trondeautrondeau
committedDec 18, 2012
filter: Install all filter design tool files into gnuradio.filter.
Also updated copyright on filtdes stuff.
·
v3.7.4git3.7.0git
1 parent cf0276c commit d2194d1

13 files changed

+53
-53
lines changed
 

‎gr-filter/apps/gr_filter_design

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Boston, MA 02110-1301, USA.
2121
#
2222

23-
from gnuradio import filter_design
23+
from gnuradio.filter import filter_design
2424
import sys
2525

2626
# Call filter desgin main function

‎gr-filter/examples/gr_filtdes_api.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
#
3-
# Copyright 2009,2012 Free Software Foundation, Inc.
3+
# Copyright 2012 Free Software Foundation, Inc.
44
#
55
# This file is part of GNU Radio
66
#
@@ -20,7 +20,7 @@
2020
# Boston, MA 02110-1301, USA.
2121
#
2222

23-
from gnuradio import filter_design
23+
from gnuradio.filter import filter_design
2424
import sys
2525

2626
'''

‎gr-filter/examples/gr_filtdes_callback.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
#
3-
# Copyright 2009,2012 Free Software Foundation, Inc.
3+
# Copyright 2012 Free Software Foundation, Inc.
44
#
55
# This file is part of GNU Radio
66
#
@@ -20,7 +20,7 @@
2020
# Boston, MA 02110-1301, USA.
2121
#
2222

23-
from gnuradio import filter_design
23+
from gnuradio.filter import filter_design
2424
import sys
2525

2626
'''

‎gr-filter/examples/gr_filtdes_restrict.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
#
3-
# Copyright 2009,2012 Free Software Foundation, Inc.
3+
# Copyright 2012 Free Software Foundation, Inc.
44
#
55
# This file is part of GNU Radio
66
#
@@ -20,7 +20,7 @@
2020
# Boston, MA 02110-1301, USA.
2121
#
2222

23-
from gnuradio import filter_design
23+
from gnuradio.filter import filter_design
2424
import sys
2525

2626
'''

‎gr-filter/python/design/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ GR_PYTHON_INSTALL(
2525
api_object.py
2626
filter_design.py
2727
fir_design.py
28-
DESTINATION ${GR_PYTHON_DIR}/gnuradio
28+
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
2929
COMPONENT "filter_python"
3030
)
3131

‎gr-filter/python/design/api_object.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#

‎gr-filter/python/design/filter_design.py

+14-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#
@@ -21,6 +21,7 @@
2121
import sys, os, re, csv, copy
2222
import warnings
2323
from optparse import OptionParser
24+
from gnuradio import filter
2425

2526
try:
2627
import scipy
@@ -42,37 +43,37 @@
4243
raise SystemExit, 1
4344

4445
try:
45-
from gnuradio.pyqt_filter_stacked import Ui_MainWindow
46+
from gnuradio.filter.pyqt_filter_stacked import Ui_MainWindow
4647
except ImportError:
4748
print "Could not import from pyqt_filter_stacked. Please build with \"pyuic4 pyqt_filter_stacked.ui -o pyqt_filter_stacked.py\""
4849
raise SystemExit, 1
4950

5051
try:
51-
from gnuradio.banditems import *
52+
from gnuradio.filter.banditems import *
5253
except ImportError:
5354
print "Could not import from banditems. Please check whether banditems.py is in the library path"
5455
raise SystemExit, 1
5556

5657
try:
57-
from gnuradio.polezero_plot import *
58+
from gnuradio.filter.polezero_plot import *
5859
except ImportError:
5960
print "Could not import from polezero_plot. Please check whether polezero_plot.py is in the library path"
6061
raise SystemExit, 1
6162

6263
try:
63-
from gnuradio.idealbanditems import *
64+
from gnuradio.filter.idealbanditems import *
6465
except ImportError:
6566
print "Could not import from idealbanditems. Please check whether idealbanditems.py is in the library path"
6667
raise SystemExit, 1
6768

6869
try:
69-
from gnuradio.api_object import *
70+
from gnuradio.filter.api_object import *
7071
except ImportError:
7172
print "Could not import from api_object. Please check whether api_object.py is in the library path"
7273
raise SystemExit, 1
7374

7475
try:
75-
from gnuradio.fir_design import *
76+
from gnuradio.filter.fir_design import *
7677
except ImportError:
7778
print "Could not import from fir_design. Please check whether fir_design.py is in the library path"
7879
raise SystemExit, 1
@@ -623,12 +624,12 @@ def __init__(self, qapp, options, callback=None, restype=""):
623624

624625
self.gui.nTapsEdit.setText("0")
625626

626-
self.filterWindows = {"Hamming Window" : gr.firdes.WIN_HAMMING,
627-
"Hann Window" : gr.firdes.WIN_HANN,
628-
"Blackman Window" : gr.firdes.WIN_BLACKMAN,
629-
"Rectangular Window" : gr.firdes.WIN_RECTANGULAR,
630-
"Kaiser Window" : gr.firdes.WIN_KAISER,
631-
"Blackman-harris Window" : gr.firdes.WIN_BLACKMAN_hARRIS}
627+
self.filterWindows = {"Hamming Window" : filter.firdes.WIN_HAMMING,
628+
"Hann Window" : filter.firdes.WIN_HANN,
629+
"Blackman Window" : filter.firdes.WIN_BLACKMAN,
630+
"Rectangular Window" : filter.firdes.WIN_RECTANGULAR,
631+
"Kaiser Window" : filter.firdes.WIN_KAISER,
632+
"Blackman-harris Window" : filter.firdes.WIN_BLACKMAN_hARRIS}
632633
self.EQUIRIPPLE_FILT = 6 # const for equiripple filter window types
633634
self.show()
634635

‎gr-filter/python/design/fir_design.py

+25-26
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#
@@ -19,7 +19,6 @@
1919
#
2020

2121
import scipy
22-
from gnuradio import gr
2322
from gnuradio import filter
2423
from PyQt4 import QtGui
2524

@@ -37,8 +36,8 @@ def design_win_lpf(fs, gain, wintype, mainwin):
3736
tb = sb - pb
3837

3938
try:
40-
taps = gr.firdes.low_pass_2(gain, fs, pb, tb,
41-
atten, wintype)
39+
taps = filter.firdes.low_pass_2(gain, fs, pb, tb,
40+
atten, wintype)
4241
except RuntimeError, e:
4342
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
4443
e.args[0], "&Ok")
@@ -64,8 +63,8 @@ def design_win_bpf(fs, gain, wintype, mainwin):
6463

6564
if(ret):
6665
try:
67-
taps = gr.firdes.band_pass_2(gain, fs, pb1, pb2, tb,
68-
atten, wintype)
66+
taps = filter.firdes.band_pass_2(gain, fs, pb1, pb2, tb,
67+
atten, wintype)
6968
except RuntimeError, e:
7069
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
7170
e.args[0], "&Ok")
@@ -91,8 +90,8 @@ def design_win_cbpf(fs, gain, wintype, mainwin):
9190

9291
if(ret):
9392
try:
94-
taps = gr.firdes.complex_band_pass_2(gain, fs, pb1, pb2, tb,
95-
atten, wintype)
93+
taps = filter.firdes.complex_band_pass_2(gain, fs, pb1, pb2, tb,
94+
atten, wintype)
9695
except RuntimeError, e:
9796
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
9897
e.args[0], "&Ok")
@@ -118,8 +117,8 @@ def design_win_bnf(fs, gain, wintype, mainwin):
118117

119118
if(ret):
120119
try:
121-
taps = gr.firdes.band_reject_2(gain, fs, pb1, pb2, tb,
122-
atten, wintype)
120+
taps = filter.firdes.band_reject_2(gain, fs, pb1, pb2, tb,
121+
atten, wintype)
123122
except RuntimeError, e:
124123
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
125124
e.args[0], "&Ok")
@@ -144,8 +143,8 @@ def design_win_hpf(fs, gain, wintype, mainwin):
144143
if(ret):
145144
tb = pb - sb
146145
try:
147-
taps = gr.firdes.high_pass_2(gain, fs, pb, tb,
148-
atten, wintype)
146+
taps = filter.firdes.high_pass_2(gain, fs, pb, tb,
147+
atten, wintype)
149148
except RuntimeError, e:
150149
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
151150
e.args[0], "&Ok")
@@ -163,12 +162,12 @@ def design_win_hb(fs, gain, wintype, mainwin):
163162
ret = r and ret
164163
trwidth,r = mainwin.gui.firhbtrEdit.text().toDouble()
165164
ret = r and ret
166-
filtwin = { gr.firdes.WIN_HAMMING : 'hamming',
167-
gr.firdes.WIN_HANN : 'hanning',
168-
gr.firdes.WIN_BLACKMAN : 'blackman',
169-
gr.firdes.WIN_RECTANGULAR: 'boxcar',
170-
gr.firdes.WIN_KAISER: ('kaiser', 4.0),
171-
gr.firdes.WIN_BLACKMAN_hARRIS: 'blackmanharris'}
165+
filtwin = { filter.firdes.WIN_HAMMING : 'hamming',
166+
filter.firdes.WIN_HANN : 'hanning',
167+
filter.firdes.WIN_BLACKMAN : 'blackman',
168+
filter.firdes.WIN_RECTANGULAR: 'boxcar',
169+
filter.firdes.WIN_KAISER: ('kaiser', 4.0),
170+
filter.firdes.WIN_BLACKMAN_hARRIS: 'blackmanharris'}
172171
if int(filtord) & 1:
173172
reply = QtGui.QMessageBox.information(mainwin, "Filter order should be even",
174173
"Filter order should be even","&Ok")
@@ -194,8 +193,8 @@ def design_win_rrc(fs, gain, wintype, mainwin):
194193

195194
if(ret):
196195
try:
197-
taps = gr.firdes.root_raised_cosine(gain, fs, sr,
198-
alpha, ntaps)
196+
taps = filter.firdes.root_raised_cosine(gain, fs, sr,
197+
alpha, ntaps)
199198
except RuntimeError, e:
200199
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
201200
e.args[0], "&Ok")
@@ -219,7 +218,7 @@ def design_win_gaus(fs, gain, wintype, mainwin):
219218
if(ret):
220219
spb = fs / sr
221220
try:
222-
taps = gr.firdes.gaussian(gain, spb, bt, ntaps)
221+
taps = filter.firdes.gaussian(gain, spb, bt, ntaps)
223222

224223
except RuntimeError, e:
225224
reply = QtGui.QMessageBox.information(mainwin, "Runtime Error",
@@ -247,7 +246,7 @@ def design_opt_lpf(fs, gain, mainwin):
247246
if(ret):
248247
try:
249248
taps = filter.optfir.low_pass(gain, fs, pb, sb,
250-
ripple, atten)
249+
ripple, atten)
251250
except RuntimeError, e:
252251
reply = QtGui.QMessageBox.information(mainwin, "Filter did not converge",
253252
e.args[0], "&Ok")
@@ -278,7 +277,7 @@ def design_opt_bpf(fs, gain, mainwin):
278277
sb2 = pb2 + tb
279278
try:
280279
taps = filter.optfir.band_pass(gain, fs, sb1, pb1, pb2, sb2,
281-
ripple, atten)
280+
ripple, atten)
282281
except RuntimeError, e:
283282
reply = QtGui.QMessageBox.information(mainwin, "Filter did not converge",
284283
e.args[0], "&Ok")
@@ -311,7 +310,7 @@ def design_opt_cbpf(fs, gain, mainwin):
311310
sb2 = pb2 + tb
312311
try:
313312
taps = filter.optfir.complex_band_pass(gain, fs, sb1, pb1, pb2, sb2,
314-
ripple, atten)
313+
ripple, atten)
315314
except RuntimeError, e:
316315
reply = QtGui.QMessageBox.information(mainwin, "Filter did not converge",
317316
e.args[0], "&Ok")
@@ -343,7 +342,7 @@ def design_opt_bnf(fs, gain, mainwin):
343342
pb2 = sb2 + tb
344343
try:
345344
taps = filter.optfir.band_reject(gain, fs, pb1, sb1, sb2, pb2,
346-
ripple, atten)
345+
ripple, atten)
347346
except RuntimeError, e:
348347
reply = QtGui.QMessageBox.information(mainwin, "Filter did not converge",
349348
e.args[0], "&Ok")
@@ -398,7 +397,7 @@ def design_opt_hpf(fs, gain, mainwin):
398397
if(ret):
399398
try:
400399
taps = filter.optfir.high_pass(gain, fs, sb, pb,
401-
atten, ripple)
400+
atten, ripple)
402401
except RuntimeError, e:
403402
reply = QtGui.QMessageBox.information(mainwin, "Filter did not converge",
404403
e.args[0], "&Ok")

‎gr-filter/python/gui/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ GR_PYTHON_INSTALL(
2828
idealbanditems.py
2929
polezero_plot.py
3030
pyqt_filter_stacked.py
31-
DESTINATION ${GR_PYTHON_DIR}/gnuradio
31+
DESTINATION ${GR_PYTHON_DIR}/gnuradio/filter
3232
COMPONENT "filter_python"
3333
)
3434

‎gr-filter/python/gui/bandgraphicsview.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#

‎gr-filter/python/gui/banditems.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#

‎gr-filter/python/gui/idealbanditems.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#

‎gr-filter/python/gui/polezero_plot.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009,2012 Free Software Foundation, Inc.
1+
# Copyright 2012 Free Software Foundation, Inc.
22
#
33
# This file is part of GNU Radio
44
#

0 commit comments

Comments
 (0)
Please sign in to comment.