2 files changed, 26 insertions, 28 deletions
diff --git a/gr-filter/python/filter/design/filter_design.py b/gr-filter/python/filter/design/filter_design.py
index a31f1c7fa8..f11bf29ce3 100644
--- a/gr-filter/python/filter/design/filter_design.py
+++ b/gr-filter/python/filter/design/filter_design.py
@@ -26,19 +26,17 @@ except ImportError:
     raise SystemExit('Please install NumPy to run this script (https://www.np.org/)')
 
 try:
-    from numpy.fft import fftpack as fft_detail
+    import numpy.fft as fft_detail
 except ImportError:
-
-    print('Could not import fftpack, trying pocketfft')
-    # Numpy changed fft implementation in version 1.17
-    # from fftpack to pocketfft
-    try:
-        from numpy.fft import pocketfft as fft_detail
-    except ImportError:
-        raise SystemExit('Could not import fft implementation of numpy')
+    raise SystemExit('Could not import fft implementation of numpy')
     
 try:
-    from scipy import poly1d, signal
+    from numpy import poly1d
+except ImportError:
+    raise SystemExit('Please install NumPy to run this script (https://www.np.org)')
+
+try:
+    from scipy import signal
 except ImportError:
     raise SystemExit('Please install SciPy to run this script (https://www.scipy.org)')
 
@@ -1004,10 +1002,10 @@ class gr_plot_filter(QtGui.QMainWindow):
 
         # Set Data.
         if(type(self.taps[0]) == scipy.complex128):
-            self.rcurve.setData(scipy.arange(ntaps), self.taps.real)
-            self.icurve.setData(scipy.arange(ntaps), self.taps.imag)
+            self.rcurve.setData(np.arange(ntaps), self.taps.real)
+            self.icurve.setData(np.arange(ntaps), self.taps.imag)
         else:
-            self.rcurve.setData(scipy.arange(ntaps), self.taps)
+            self.rcurve.setData(np.arange(ntaps), self.taps)
             self.icurve.setData([],[]);
 
         if self.mttaps:
@@ -1023,11 +1021,11 @@ class gr_plot_filter(QtGui.QMainWindow):
                                                 np.dstack((np.zeros(self.taps.imag.shape[0], dtype=int),
                                                             self.taps.imag)).flatten())
 
-                self.mtimecurve_i.setData(scipy.arange(ntaps), self.taps.imag)
+                self.mtimecurve_i.setData(np.arange(ntaps), self.taps.imag)
 
             else:
-                self.mtimecurve.setData(scipy.arange(ntaps), self.taps)
-                self.mtimecurve_stems.setData(np.repeat(scipy.arange(ntaps), 2),
+                self.mtimecurve.setData(np.arange(ntaps), self.taps)
+                self.mtimecurve_stems.setData(np.repeat(np.arange(ntaps), 2),
                                                 np.dstack((np.zeros(self.taps.shape[0], dtype=int),
                                                         self.taps)).flatten())
 
@@ -1072,13 +1070,13 @@ class gr_plot_filter(QtGui.QMainWindow):
                                               np.dstack((np.zeros(stepres.imag.shape[0], dtype=int),
                                                          stepres.imag)).flatten())
 
-            self.steprescurve_i.setData(scipy.arange(ntaps), stepres.imag)
+            self.steprescurve_i.setData(np.arange(ntaps), stepres.imag)
         else:
-            self.steprescurve_stems.setData(np.repeat(scipy.arange(ntaps), 2),
+            self.steprescurve_stems.setData(np.repeat(np.arange(ntaps), 2),
                                             np.dstack((np.zeros(stepres.shape[0], dtype=int),
                                                        stepres)).flatten())
 
-            self.steprescurve.setData(scipy.arange(ntaps), stepres)
+            self.steprescurve.setData(np.arange(ntaps), stepres)
             self.steprescurve_i_stems.setData([],[])
             self.steprescurve_i.setData([],[])
 
@@ -1095,13 +1093,13 @@ class gr_plot_filter(QtGui.QMainWindow):
                                                 np.dstack((np.zeros(stepres.imag.shape[0], dtype=int),
                                                             stepres.imag)).flatten())
 
-                self.mtimecurve_i.setData(scipy.arange(ntaps), stepres.imag)
+                self.mtimecurve_i.setData(np.arange(ntaps), stepres.imag)
             else:
-                self.mtimecurve_stems.setData(np.repeat(scipy.arange(ntaps), 2),
+                self.mtimecurve_stems.setData(np.repeat(np.arange(ntaps), 2),
                                                 np.dstack((np.zeros(stepres.shape[0], dtype=int),
                                                         stepres)).flatten())
 
-                self.mtimecurve.setData(scipy.arange(ntaps), stepres)
+                self.mtimecurve.setData(np.arange(ntaps), stepres)
                 self.mtimecurve_i_stems.setData([],[])
                 self.mtimecurve_i.setData([],[])
 
@@ -1141,9 +1139,9 @@ class gr_plot_filter(QtGui.QMainWindow):
                                              np.dstack((np.zeros(impres.imag.shape[0], dtype=int),
                                                         impres.imag)).flatten())
 
-            self.imprescurve_i.setData(scipy.arange(ntaps), impres.imag)
+            self.imprescurve_i.setData(np.arange(ntaps), impres.imag)
         else:
-            self.imprescurve_stems.setData(np.repeat(scipy.arange(ntaps), 2),
+            self.imprescurve_stems.setData(np.repeat(np.arange(ntaps), 2),
                                            np.dstack((np.zeros(impres.shape[0], dtype=int),
                                                       impres)).flatten())
 
@@ -1160,13 +1158,13 @@ class gr_plot_filter(QtGui.QMainWindow):
                                                 np.dstack((np.zeros(impres.imag.shape[0], dtype=int),
                                                             impres.imag)).flatten())
 
-                self.mtimecurve_i.setData(scipy.arange(ntaps), impres.imag)
+                self.mtimecurve_i.setData(np.arange(ntaps), impres.imag)
             else:
-                self.mtimecurve_stems.setData(np.repeat(scipy.arange(ntaps), 2),
+                self.mtimecurve_stems.setData(np.repeat(np.arange(ntaps), 2),
                                             np.dstack((np.zeros(impres.shape[0], dtype=int),
                                                         impres)).flatten())
 
-                self.mtimecurve.setData(scipy.arange(ntaps), impres)
+                self.mtimecurve.setData(np.arange(ntaps), impres)
                 self.mtimecurve_i_stems.setData([],[])
                 self.mtimecurve_i.setData([],[])
 
diff --git a/gr-filter/python/filter/gui/pyqt_filter_stacked.py b/gr-filter/python/filter/gui/pyqt_filter_stacked.py
index c068dde467..9bd2ab8148 100644
--- a/gr-filter/python/filter/gui/pyqt_filter_stacked.py
+++ b/gr-filter/python/filter/gui/pyqt_filter_stacked.py
@@ -1229,7 +1229,7 @@ class Ui_MainWindow(object):
         self.mfilterspecView.setTabText(self.mfilterspecView.indexOf(self.mpoleZero), _translate("MainWindow", "Pole-Zero Plot"))
         self.mfilterspecView.setTabText(self.mfilterspecView.indexOf(self.mfcTab), _translate("MainWindow", "Filter Coefficients"))
         self.fselectComboBox.setItemText(0, _translate("MainWindow", "FIR"))
-        self.fselectComboBox.setItemText(1, _translate("MainWindow", "IIR(scipy)"))
+        self.fselectComboBox.setItemText(1, _translate("MainWindow", "IIR"))
         self.filterTypeComboBox.setItemText(0, _translate("MainWindow", "Low Pass"))
         self.filterTypeComboBox.setItemText(1, _translate("MainWindow", "High Pass"))
         self.filterTypeComboBox.setItemText(2, _translate("MainWindow", "Band Pass"))