diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-03-28 17:38:41 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-03-28 17:38:41 -0700 |
| commit | 65ab4929dad317edd18208fbb6deb1e54e89eaf0 (patch) | |
| tree | 669fff681029ab13bf5b1f418f74a4dad6efca99 | |
| parent | 7ccbd3356c2ad0b64ec363216d9eb766564811ba (diff) | |
| parent | 913fb503001d78f6c2ec6f4a5ade701437e1c20c (diff) | |
Merge remote-tracking branch 'tom/filter_design_pyqt4' into maint
| -rw-r--r-- | gr-filter/python/filter/design/filter_design.py | 2 | ||||
| -rw-r--r-- | gr-filter/python/filter/gui/polezero_plot.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-filter/python/filter/design/filter_design.py b/gr-filter/python/filter/design/filter_design.py index fe90681e34..f94b6b8340 100644 --- a/gr-filter/python/filter/design/filter_design.py +++ b/gr-filter/python/filter/design/filter_design.py @@ -1042,7 +1042,7 @@ class gr_plot_filter(QtGui.QMainWindow): w,h = signal.freqz(self.b,self.a) self.fftdB = 20 * scipy.log10 (abs(h)) self.freq = w/max(w) - self.fftDeg = scipy.unwrap(scipy.arctan2(imag(h),real(h))) + self.fftDeg = scipy.unwrap(scipy.arctan2(scipy.imag(h),scipy.real(h))) self.groupDelay = -scipy.diff(self.fftDeg) self.phaseDelay = -self.fftDeg[1:]/self.freq[1:] if self.gridview: diff --git a/gr-filter/python/filter/gui/polezero_plot.py b/gr-filter/python/filter/gui/polezero_plot.py index 839af0400d..8f35dc8d78 100644 --- a/gr-filter/python/filter/gui/polezero_plot.py +++ b/gr-filter/python/filter/gui/polezero_plot.py @@ -22,7 +22,10 @@ import sys from PyQt4 import Qt, QtCore from math import sin, cos, pi import PyQt4.Qwt5 as Qwt -from PyQt4.Qwt5.anynumpy import * +from numpy import zeros +from numpy import float as Float +from numpy import vectorize +from numpy import delete class PzPlot(Qwt.QwtPlot): @@ -531,4 +534,3 @@ class CanvasPicker(Qt.QObject): self.__showCursor(False) self.__selectedPoint = index self.__showCursor(True) - |