Fixed calls to ra_stripchartsink and ra_fftsink

[debian/gnuradio] / gr-radio-astronomy / src / python / usrp_ra_receiver.py

diff --git a/gr-radio-astronomy/src/python/usrp_ra_receiver.py b/gr-radio-astronomy/src/python/usrp_ra_receiver.py
index c6052a569739ee8654575ca54da842ae7ae5c961..e424e9c95500a71bd828857556c6af5449f11f20 100755 (executable)
--- a/gr-radio-astronomy/src/python/usrp_ra_receiver.py
+++ b/gr-radio-astronomy/src/python/usrp_ra_receiver.py
@@ -31,7 +31,7 @@ import wx
 import sys
 import Numeric 
 import time
-import FFT
+import numpy.fft
 import ephem
 
 class continuum_calibration(gr.feval_dd):
@@ -252,12 +252,12 @@ class app_flow_graph(stdgui2.std_top_block):
 
         # Set up FFT display
         if self.waterfall == False:
-           self.scope = ra_fftsink.ra_fft_sink_c (self, panel, 
+           self.scope = ra_fftsink.ra_fft_sink_c (panel, 
                fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
                fft_rate=int(self.fft_rate), title="Spectral",  
                ofunc=self.fft_outfunc, xydfunc=self.xydfunc)
         else:
-            self.scope = ra_waterfallsink.waterfall_sink_c (self, panel,
+            self.scope = ra_waterfallsink.waterfall_sink_c (panel,
                 fft_size=int(self.fft_size), sample_rate=self.fft_input_rate,
                 fft_rate=int(self.fft_rate), title="Spectral", ofunc=self.fft_outfunc, size=(1100, 600), xydfunc=self.xydfunc, ref_level=0, span=10)
 
@@ -272,7 +272,7 @@ class app_flow_graph(stdgui2.std_top_block):
         # Set up stripchart display
         self.stripsize = int(options.stripsize)
         if self.setimode == False:
-            self.chart = ra_stripchartsink.stripchart_sink_f (self, panel,
+            self.chart = ra_stripchartsink.stripchart_sink_f (panel,
                 stripsize=self.stripsize,
                 title="Continuum",
                 xlabel="LMST Offset (Seconds)",
@@ -1079,7 +1079,7 @@ class app_flow_graph(stdgui2.std_top_block):
                      break
                  tmptaps[idx] = complex(0.0, 0.0)
 
-         self.notch_taps = FFT.inverse_fft(tmptaps)
+         self.notch_taps = numpy.fft.ifft(tmptaps)
 
 def main ():
     app = stdgui2.stdapp(app_flow_graph, "RADIO ASTRONOMY SPECTRAL/CONTINUUM RECEIVER: $Revision$", nstatus=1)