diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-07 17:27:50 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-07 17:27:50 -0500 |
| commit | 27a222ad8dcd245e7b9b4ff51141bdf3d8675a3c (patch) | |
| tree | e32b4f9e5b249630f79cd26bb0b1aeecb23b0f92 | |
| parent | dd0a5cc3bac54f223984f2361323e18da4e383f9 (diff) | |
filter: imporint firdes from gr-filter; no longer in gnuradio-core.
| -rwxr-xr-x | gnuradio-core/src/examples/mp-sched/affinity_set.py | 2 | ||||
| -rwxr-xr-x | gr-analog/examples/tags/uhd_burst_detector.py | 2 | ||||
| -rw-r--r-- | gr-filter/grc/filter_fft_filter_xxx.xml | 2 | ||||
| -rwxr-xr-x | gr-howto-write-a-block/apps/howto_square.py | 2 | ||||
| -rwxr-xr-x | gr-howto-write-a-block/apps/howto_square_qt.py | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_freq_sink_x.xml | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_sink_x.xml | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_time_sink_x.xml | 2 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_waterfall_sink_x.xml | 2 | ||||
| -rw-r--r-- | grc/blocks/import.xml | 2 | ||||
| -rw-r--r-- | grc/blocks/options.xml | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/gnuradio-core/src/examples/mp-sched/affinity_set.py b/gnuradio-core/src/examples/mp-sched/affinity_set.py index c1c1a33932..8b032acd83 100755 --- a/gnuradio-core/src/examples/mp-sched/affinity_set.py +++ b/gnuradio-core/src/examples/mp-sched/affinity_set.py @@ -8,7 +8,7 @@ from gnuradio import eng_notation from gnuradio import gr from gnuradio import blocks from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes +from gnuradio.filter import firdes from optparse import OptionParser import sys diff --git a/gr-analog/examples/tags/uhd_burst_detector.py b/gr-analog/examples/tags/uhd_burst_detector.py index 6ebaef91fa..6e73e8ad1e 100755 --- a/gr-analog/examples/tags/uhd_burst_detector.py +++ b/gr-analog/examples/tags/uhd_burst_detector.py @@ -26,7 +26,7 @@ from gnuradio import filter, analog, blocks from gnuradio import uhd from gnuradio.fft import window from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes +from gnuradio.filter import firdes from optparse import OptionParser class uhd_burst_detector(gr.top_block): diff --git a/gr-filter/grc/filter_fft_filter_xxx.xml b/gr-filter/grc/filter_fft_filter_xxx.xml index 29612dffd6..ec627fe157 100644 --- a/gr-filter/grc/filter_fft_filter_xxx.xml +++ b/gr-filter/grc/filter_fft_filter_xxx.xml @@ -8,7 +8,7 @@ <name>FFT Filter</name> <key>fft_filter_xxx</key> <import>from gnuradio import filter</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <make>filter.fft_filter_$(type)($decim, $taps, $nthreads)</make> <callback>set_taps($taps)</callback> <callback>set_nthreads($nthreads)</callback> diff --git a/gr-howto-write-a-block/apps/howto_square.py b/gr-howto-write-a-block/apps/howto_square.py index 140067b59f..fd03b74c42 100755 --- a/gr-howto-write-a-block/apps/howto_square.py +++ b/gr-howto-write-a-block/apps/howto_square.py @@ -9,7 +9,7 @@ from gnuradio import eng_notation from gnuradio import gr from gnuradio import blocks from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes +from gnuradio.filter import firdes from gnuradio.wxgui import scopesink2 from grc_gnuradio import wxgui as grc_wxgui from optparse import OptionParser diff --git a/gr-howto-write-a-block/apps/howto_square_qt.py b/gr-howto-write-a-block/apps/howto_square_qt.py index 3215ea8ab4..c8ab2e9066 100755 --- a/gr-howto-write-a-block/apps/howto_square_qt.py +++ b/gr-howto-write-a-block/apps/howto_square_qt.py @@ -12,7 +12,7 @@ from gnuradio import eng_notation from gnuradio import gr from gnuradio import qtgui from gnuradio.eng_option import eng_option -from gnuradio.gr import firdes +from gnuradio.filter import firdes from optparse import OptionParser import howto import sip diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml b/gr-qtgui/grc/qtgui_freq_sink_x.xml index ce229b03de..35edf61ed8 100644 --- a/gr-qtgui/grc/qtgui_freq_sink_x.xml +++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml @@ -9,7 +9,7 @@ <key>qtgui_freq_sink_x</key> <import>from PyQt4 import Qt</import> <import>from gnuradio import qtgui</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml index 9ea9dc583f..6e13481397 100644 --- a/gr-qtgui/grc/qtgui_sink_x.xml +++ b/gr-qtgui/grc/qtgui_sink_x.xml @@ -9,7 +9,7 @@ <key>qtgui_sink_x</key> <import>from PyQt4 import Qt</import> <import>from gnuradio import qtgui</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index b02555b733..d64ce2e237 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -9,7 +9,7 @@ <key>qtgui_time_sink_x</key> <import>from PyQt4 import Qt</import> <import>from gnuradio import qtgui</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml index d49b4db224..5a17f7d511 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -9,7 +9,7 @@ <key>qtgui_waterfall_sink_x</key> <import>from PyQt4 import Qt</import> <import>from gnuradio import qtgui</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <import>import sip</import> <make>#set $win = 'self._%s_win'%$id qtgui.$(type.fcn)( diff --git a/grc/blocks/import.xml b/grc/blocks/import.xml index feea052d34..59f807bacb 100644 --- a/grc/blocks/import.xml +++ b/grc/blocks/import.xml @@ -19,7 +19,7 @@ Import additional python modules into the namespace. Examples: -from gnuradio.gr import firdes +from gnuradio.filter import firdes import math,cmath from math import pi </doc> diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml index 1cf0b77079..0c3a804fd7 100644 --- a/grc/blocks/options.xml +++ b/grc/blocks/options.xml @@ -10,7 +10,7 @@ <name>Options</name> <key>options</key> <import>from gnuradio import gr</import> - <import>from gnuradio.gr import firdes</import> + <import>from gnuradio.filter import firdes</import> <import>#if $generate_options() == 'wx_gui' from grc_gnuradio import wxgui as grc_wxgui import wx |