qtgui: Updated qtgui to use gr-fft components.

Also updates qa code for style.
author: Tom Rondeau <trondeau@vt.edu> 2012-07-17 19:35:34 -0400
committer: Tom Rondeau <trondeau@vt.edu> 2012-07-17 19:35:34 -0400
commit: fbdf83e472da67239d4cbdcb47f83ea7df108aa8 (patch)
tree: 00aa7cc275798c8a67b1e527eb7f5f84aa33cd00 /gr-qtgui
parent: 93dfc3d4dcd18e43baec4f9166b7501fdf254944 (diff)
20 files changed, 91 insertions, 83 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt
index f6260bc7e9..1f69b2f821 100644
--- a/gr-qtgui/CMakeLists.txt
+++ b/gr-qtgui/CMakeLists.txt
@@ -47,6 +47,7 @@ GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI
     QT4_FOUND
     QWT_FOUND
     ENABLE_GR_CORE
+    ENABLE_GR_FFT
     PYTHONLIBS_FOUND
     ${qt_gui_python_deps}
 )
diff --git a/gr-qtgui/include/qtgui_freq_sink_c.h b/gr-qtgui/include/qtgui_freq_sink_c.h
index b7b7d747ca..fda185039d 100644
--- a/gr-qtgui/include/qtgui_freq_sink_c.h
+++ b/gr-qtgui/include/qtgui_freq_sink_c.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_sync_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include <freqdisplayform.h>
 #include <gruel/thread.h>
@@ -86,7 +86,7 @@ private:
 
   
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   std::vector<gr_complex*> d_residbufs;
diff --git a/gr-qtgui/include/qtgui_freq_sink_f.h b/gr-qtgui/include/qtgui_freq_sink_f.h
index 4315811a27..612e711077 100644
--- a/gr-qtgui/include/qtgui_freq_sink_f.h
+++ b/gr-qtgui/include/qtgui_freq_sink_f.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_sync_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include <freqdisplayform.h>
 #include <gruel/thread.h>
@@ -85,7 +85,7 @@ private:
   int d_nconnections;
 
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   std::vector<float*> d_residbufs;
diff --git a/gr-qtgui/include/qtgui_sink_c.h b/gr-qtgui/include/qtgui_sink_c.h
index 09879206a4..2d3279f401 100644
--- a/gr-qtgui/include/qtgui_sink_c.h
+++ b/gr-qtgui/include/qtgui_sink_c.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include <gruel/high_res_timer.h>
 #include "SpectrumGUIClass.h"
@@ -83,7 +83,7 @@ private:
   bool d_update_active;
 
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   gr_complex *d_residbuf;
diff --git a/gr-qtgui/include/qtgui_sink_f.h b/gr-qtgui/include/qtgui_sink_f.h
index e53b804e34..ea49b11d34 100644
--- a/gr-qtgui/include/qtgui_sink_f.h
+++ b/gr-qtgui/include/qtgui_sink_f.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include "SpectrumGUIClass.h"
 
@@ -80,7 +80,7 @@ private:
   std::string d_name;
 
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   float *d_residbuf;
diff --git a/gr-qtgui/include/qtgui_waterfall_sink_c.h b/gr-qtgui/include/qtgui_waterfall_sink_c.h
index 1be86898a8..90ba6533ef 100644
--- a/gr-qtgui/include/qtgui_waterfall_sink_c.h
+++ b/gr-qtgui/include/qtgui_waterfall_sink_c.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_sync_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include <waterfalldisplayform.h>
 
@@ -81,7 +81,7 @@ private:
   int d_nconnections;
 
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   std::vector<gr_complex*> d_residbufs;
diff --git a/gr-qtgui/include/qtgui_waterfall_sink_f.h b/gr-qtgui/include/qtgui_waterfall_sink_f.h
index 0c044b40ad..f4ac33d2b0 100644
--- a/gr-qtgui/include/qtgui_waterfall_sink_f.h
+++ b/gr-qtgui/include/qtgui_waterfall_sink_f.h
@@ -27,7 +27,7 @@
 #include <gr_qtgui_api.h>
 #include <gr_sync_block.h>
 #include <gr_firdes.h>
-#include <gri_fft.h>
+#include <fft/fft.h>
 #include <qapplication.h>
 #include <waterfalldisplayform.h>
 
@@ -81,7 +81,7 @@ private:
   int d_nconnections;
 
   bool d_shift;
-  gri_fft_complex *d_fft;
+  gr::fft::fft_complex *d_fft;
 
   int d_index;
   std::vector<float*> d_residbufs;
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index b755647ffe..a8b38b98ce 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -79,6 +79,7 @@ set(qtgui_srcs
 ########################################################################
 include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${GR_FFT_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
     ${VOLK_INCLUDE_DIRS}
 )
@@ -100,6 +101,7 @@ include_directories(${PYTHON_INCLUDE_PATH}) #deprecated for dirs (cmake 2.6)
 ########################################################################
 list(APPEND qtgui_libs
     gnuradio-core
+    gnuradio-fft
     volk
     ${QT_LIBRARIES}
     ${QWT_LIBRARIES}
diff --git a/gr-qtgui/lib/qtgui_const_sink_c.cc b/gr-qtgui/lib/qtgui_const_sink_c.cc
index df5e77ce45..2e74930fa2 100644
--- a/gr-qtgui/lib/qtgui_const_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_const_sink_c.cc
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <string.h>
 #include <volk/volk.h>
+#include <fft/fft.h>
 
 #include <QTimer>
 
@@ -56,8 +57,8 @@ qtgui_const_sink_c::qtgui_const_sink_c(int size,
   d_index = 0;
 
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs_real.push_back(gri_fft_malloc_double(d_size));
-    d_residbufs_imag.push_back(gri_fft_malloc_double(d_size));
+    d_residbufs_real.push_back(gr::fft::malloc_double(d_size));
+    d_residbufs_imag.push_back(gr::fft::malloc_double(d_size));
   }
 
   // Set alignment properties for VOLK
@@ -72,8 +73,8 @@ qtgui_const_sink_c::~qtgui_const_sink_c()
 {
   // d_main_gui is a qwidget destroyed with its parent
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs_real[i]);
-    gri_fft_free(d_residbufs_imag[i]);
+    gr::fft::free(d_residbufs_real[i]);
+    gr::fft::free(d_residbufs_imag[i]);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_freq_sink_c.cc b/gr-qtgui/lib/qtgui_freq_sink_c.cc
index 37ba5edecb..7d6c3d7c00 100644
--- a/gr-qtgui/lib/qtgui_freq_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_freq_sink_c.cc
@@ -64,13 +64,13 @@ qtgui_freq_sink_c::qtgui_freq_sink_c(int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex(d_fftsize, true);
-  d_fbuf = gri_fft_malloc_float(d_fftsize);
+  d_fft = new gr::fft::fft_complex(d_fftsize, true);
+  d_fbuf = gr::fft::malloc_float(d_fftsize);
 
   d_index = 0;
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_complex(d_fftsize));
-    d_magbufs.push_back(gri_fft_malloc_double(d_fftsize));
+    d_residbufs.push_back(gr::fft::malloc_complex(d_fftsize));
+    d_magbufs.push_back(gr::fft::malloc_double(d_fftsize));
   }
 
   buildwindow();
@@ -81,8 +81,8 @@ qtgui_freq_sink_c::qtgui_freq_sink_c(int fftsize, int wintype,
 qtgui_freq_sink_c::~qtgui_freq_sink_c()
 {
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
-    gri_fft_free(d_magbufs[i]);
+    gr::fft::free(d_residbufs[i]);
+    gr::fft::free(d_magbufs[i]);
   }
   delete d_fft;
   delete d_fbuf;
@@ -263,11 +263,11 @@ qtgui_freq_sink_c::fftresize()
   if(newfftsize != d_fftsize) {
     // Resize residbuf and replace data
     for(int i = 0; i < d_nconnections; i++) {
-      gri_fft_free(d_residbufs[i]);
-      gri_fft_free(d_magbufs[i]);
+      gr::fft::free(d_residbufs[i]);
+      gr::fft::free(d_magbufs[i]);
 
-      d_residbufs[i] = gri_fft_malloc_complex(newfftsize);
-      d_magbufs[i] = gri_fft_malloc_double(newfftsize);
+      d_residbufs[i] = gr::fft::malloc_complex(newfftsize);
+      d_magbufs[i] = gr::fft::malloc_double(newfftsize);
 
       memset(d_magbufs[i], 0, newfftsize*sizeof(double));
     }
@@ -282,10 +282,10 @@ qtgui_freq_sink_c::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex(d_fftsize, true);
+    d_fft = new gr::fft::fft_complex(d_fftsize, true);
     
-    gri_fft_free(d_fbuf);
-    d_fbuf = gri_fft_malloc_float(d_fftsize);
+    gr::fft::free(d_fbuf);
+    d_fbuf = gr::fft::malloc_float(d_fftsize);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_freq_sink_f.cc b/gr-qtgui/lib/qtgui_freq_sink_f.cc
index 88ea020a4a..c219edda6d 100644
--- a/gr-qtgui/lib/qtgui_freq_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_freq_sink_f.cc
@@ -64,13 +64,13 @@ qtgui_freq_sink_f::qtgui_freq_sink_f(int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex(d_fftsize, true);
-  d_fbuf = gri_fft_malloc_float(d_fftsize);
+  d_fft = new gr::fft::fft_complex(d_fftsize, true);
+  d_fbuf = gr::fft::malloc_float(d_fftsize);
 
   d_index = 0;
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_float(d_fftsize));
-    d_magbufs.push_back(gri_fft_malloc_double(d_fftsize));
+    d_residbufs.push_back(gr::fft::malloc_float(d_fftsize));
+    d_magbufs.push_back(gr::fft::malloc_double(d_fftsize));
   }
 
   buildwindow();
@@ -81,11 +81,11 @@ qtgui_freq_sink_f::qtgui_freq_sink_f(int fftsize, int wintype,
 qtgui_freq_sink_f::~qtgui_freq_sink_f()
 {
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
-    gri_fft_free(d_magbufs[i]);
+    gr::fft::free(d_residbufs[i]);
+    gr::fft::free(d_magbufs[i]);
   }
   delete d_fft;
-  gri_fft_free(d_fbuf);
+  gr::fft::free(d_fbuf);
 }
 
 void
@@ -257,11 +257,11 @@ qtgui_freq_sink_f::fftresize()
 
     // Resize residbuf and replace data
     for(int i = 0; i < d_nconnections; i++) {
-      gri_fft_free(d_residbufs[i]);
-      gri_fft_free(d_magbufs[i]);
+      gr::fft::free(d_residbufs[i]);
+      gr::fft::free(d_magbufs[i]);
 
-      d_residbufs.push_back(gri_fft_malloc_float(newfftsize));
-      d_magbufs.push_back(gri_fft_malloc_double(newfftsize));
+      d_residbufs.push_back(gr::fft::malloc_float(newfftsize));
+      d_magbufs.push_back(gr::fft::malloc_double(newfftsize));
     }
 
     // Set new fft size and reset buffer index 
@@ -274,10 +274,10 @@ qtgui_freq_sink_f::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex(d_fftsize, true);
+    d_fft = new gr::fft::fft_complex(d_fftsize, true);
 
-    gri_fft_free(d_fbuf);
-    d_fbuf = gri_fft_malloc_float(d_fftsize);
+    gr::fft::free(d_fbuf);
+    d_fbuf = gr::fft::malloc_float(d_fftsize);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index a907114721..c9975a1118 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -30,6 +30,7 @@
 
 #include <QTimer>
 #include <volk/volk.h>
+#include <fft/fft.h>
 
 qtgui_sink_c_sptr
 qtgui_make_sink_c (int fftsize, int wintype,
@@ -68,7 +69,7 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex (d_fftsize, true);
+  d_fft = new gr::fft::fft_complex (d_fftsize, true);
 
   d_index = 0;
   d_residbuf = new gr_complex[d_fftsize];
@@ -255,7 +256,7 @@ qtgui_sink_c::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex (d_fftsize, true);
+    d_fft = new gr::fft::fft_complex (d_fftsize, true);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_sink_f.cc b/gr-qtgui/lib/qtgui_sink_f.cc
index 33da0947d2..8e29089874 100644
--- a/gr-qtgui/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_sink_f.cc
@@ -68,7 +68,7 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex (d_fftsize, true);
+  d_fft = new gr::fft::fft_complex (d_fftsize, true);
 
   d_index = 0;
   d_residbuf = new float[d_fftsize];
@@ -251,7 +251,7 @@ qtgui_sink_f::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex (d_fftsize, true);
+    d_fft = new gr::fft::fft_complex (d_fftsize, true);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.cc b/gr-qtgui/lib/qtgui_time_sink_c.cc
index acb5dc92fd..ef9c39afb7 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_c.cc
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <string.h>
 #include <volk/volk.h>
+#include <fft/fft.h>
 
 #include <QTimer>
 
@@ -56,7 +57,7 @@ qtgui_time_sink_c::qtgui_time_sink_c(int size, double bw,
   d_index = 0;
 
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_double(d_size));
+    d_residbufs.push_back(gr::fft::malloc_double(d_size));
   }
 
   // Set alignment properties for VOLK
@@ -71,7 +72,7 @@ qtgui_time_sink_c::~qtgui_time_sink_c()
 {
   // d_main_gui is a qwidget destroyed with its parent
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
+    gr::fft::free(d_residbufs[i]);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.cc b/gr-qtgui/lib/qtgui_time_sink_f.cc
index 24fb5026b5..9ce5acd6ac 100644
--- a/gr-qtgui/lib/qtgui_time_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_f.cc
@@ -28,6 +28,7 @@
 #include <gr_io_signature.h>
 #include <string.h>
 #include <volk/volk.h>
+#include <fft/fft.h>
 
 #include <QTimer>
 
@@ -56,7 +57,7 @@ qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw,
   d_index = 0;
 
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_double(d_size));
+    d_residbufs.push_back(gr::fft::malloc_double(d_size));
   }
 
   // Set alignment properties for VOLK
@@ -71,7 +72,7 @@ qtgui_time_sink_f::~qtgui_time_sink_f()
 {
   // d_main_gui is a qwidget destroyed with its parent
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
+    gr::fft::free(d_residbufs[i]);
   }
 }
 
diff --git a/gr-qtgui/lib/qtgui_waterfall_sink_c.cc b/gr-qtgui/lib/qtgui_waterfall_sink_c.cc
index 9d81b5e65e..07f830d0e7 100644
--- a/gr-qtgui/lib/qtgui_waterfall_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_waterfall_sink_c.cc
@@ -64,12 +64,12 @@ qtgui_waterfall_sink_c::qtgui_waterfall_sink_c(int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex(d_fftsize, true);
+  d_fft = new gr::fft::fft_complex(d_fftsize, true);
 
   d_index = 0;
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_complex(d_fftsize));
-    d_magbufs.push_back(gri_fft_malloc_double(d_fftsize));
+    d_residbufs.push_back(gr::fft::malloc_complex(d_fftsize));
+    d_magbufs.push_back(gr::fft::malloc_double(d_fftsize));
   }
 
   buildwindow();
@@ -80,8 +80,8 @@ qtgui_waterfall_sink_c::qtgui_waterfall_sink_c(int fftsize, int wintype,
 qtgui_waterfall_sink_c::~qtgui_waterfall_sink_c()
 {
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
-    gri_fft_free(d_magbufs[i]);
+    gr::fft::free(d_residbufs[i]);
+    gr::fft::free(d_magbufs[i]);
   }
   delete d_fft;
 }
@@ -227,11 +227,11 @@ qtgui_waterfall_sink_c::fftresize()
 
     // Resize residbuf and replace data
     for(int i = 0; i < d_nconnections; i++) {
-      gri_fft_free(d_residbufs[i]);
-      gri_fft_free(d_magbufs[i]);
+      gr::fft::free(d_residbufs[i]);
+      gr::fft::free(d_magbufs[i]);
 
-      d_residbufs[i] = gri_fft_malloc_complex(newfftsize);
-      d_magbufs[i] = gri_fft_malloc_double(newfftsize);
+      d_residbufs[i] = gr::fft::malloc_complex(newfftsize);
+      d_magbufs[i] = gr::fft::malloc_double(newfftsize);
     }
 
     // Set new fft size and reset buffer index 
@@ -244,7 +244,7 @@ qtgui_waterfall_sink_c::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex(d_fftsize, true);
+    d_fft = new gr::fft::fft_complex(d_fftsize, true);
   }
 }
 
@@ -267,7 +267,7 @@ qtgui_waterfall_sink_c::work(int noutput_items,
     // If we have enough input for one full FFT, do it
     if(datasize >= resid) {
 
-      float *fbuf = gri_fft_malloc_float(d_fftsize);
+      float *fbuf = gr::fft::malloc_float(d_fftsize);
       for(int n = 0; n < d_nconnections; n++) {
 	// Fill up residbuf with d_fftsize number of items
 	in = (const gr_complex*)input_items[n];
@@ -276,7 +276,7 @@ qtgui_waterfall_sink_c::work(int noutput_items,
 	fft(fbuf, d_residbufs[n], d_fftsize);
 	volk_32f_convert_64f_a(d_magbufs[n], fbuf, d_fftsize);
       }
-      gri_fft_free(fbuf);
+      gr::fft::free(fbuf);
       
       if(gruel::high_res_timer_now() - d_last_time > d_update_time) {
 	d_last_time = gruel::high_res_timer_now();
diff --git a/gr-qtgui/lib/qtgui_waterfall_sink_f.cc b/gr-qtgui/lib/qtgui_waterfall_sink_f.cc
index 59592d17a8..7f7ebb3ede 100644
--- a/gr-qtgui/lib/qtgui_waterfall_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_waterfall_sink_f.cc
@@ -64,12 +64,12 @@ qtgui_waterfall_sink_f::qtgui_waterfall_sink_f(int fftsize, int wintype,
   // this is usually desired when plotting
   d_shift = true;
 
-  d_fft = new gri_fft_complex(d_fftsize, true);
+  d_fft = new gr::fft::fft_complex(d_fftsize, true);
 
   d_index = 0;
   for(int i = 0; i < d_nconnections; i++) {
-    d_residbufs.push_back(gri_fft_malloc_float(d_fftsize));
-    d_magbufs.push_back(gri_fft_malloc_double(d_fftsize));
+    d_residbufs.push_back(gr::fft::malloc_float(d_fftsize));
+    d_magbufs.push_back(gr::fft::malloc_double(d_fftsize));
   }
 
   buildwindow();
@@ -80,8 +80,8 @@ qtgui_waterfall_sink_f::qtgui_waterfall_sink_f(int fftsize, int wintype,
 qtgui_waterfall_sink_f::~qtgui_waterfall_sink_f()
 {
   for(int i = 0; i < d_nconnections; i++) {
-    gri_fft_free(d_residbufs[i]);
-    gri_fft_free(d_magbufs[i]);
+    gr::fft::free(d_residbufs[i]);
+    gr::fft::free(d_magbufs[i]);
   }
   delete d_fft;
 }
@@ -221,11 +221,11 @@ qtgui_waterfall_sink_f::fftresize()
 
     // Resize residbuf and replace data
     for(int i = 0; i < d_nconnections; i++) {
-      gri_fft_free(d_residbufs[i]);
-      gri_fft_free(d_magbufs[i]);
+      gr::fft::free(d_residbufs[i]);
+      gr::fft::free(d_magbufs[i]);
 
-      d_residbufs.push_back(gri_fft_malloc_float(newfftsize));
-      d_magbufs.push_back(gri_fft_malloc_double(newfftsize));
+      d_residbufs.push_back(gr::fft::malloc_float(newfftsize));
+      d_magbufs.push_back(gr::fft::malloc_double(newfftsize));
     }
 
     // Set new fft size and reset buffer index 
@@ -238,7 +238,7 @@ qtgui_waterfall_sink_f::fftresize()
 
     // Reset FFTW plan for new size
     delete d_fft;
-    d_fft = new gri_fft_complex(d_fftsize, true);
+    d_fft = new gr::fft::fft_complex(d_fftsize, true);
   }
 }
 
@@ -261,7 +261,7 @@ qtgui_waterfall_sink_f::work(int noutput_items,
     // If we have enough input for one full FFT, do it
     if(datasize >= resid) {
 
-      float *fbuf = gri_fft_malloc_float(d_fftsize);
+      float *fbuf = gr::fft::malloc_float(d_fftsize);
       for(int n = 0; n < d_nconnections; n++) {
 	// Fill up residbuf with d_fftsize number of items
 	in = (const float*)input_items[n];
@@ -270,7 +270,7 @@ qtgui_waterfall_sink_f::work(int noutput_items,
 	fft(fbuf, d_residbufs[n], d_fftsize);
 	volk_32f_convert_64f_a(d_magbufs[n], fbuf, d_fftsize);
       }
-      gri_fft_free(fbuf);
+      gr::fft::free(fbuf);
       
       if(gruel::high_res_timer_now() - d_last_time > d_update_time) {
 	d_last_time = gruel::high_res_timer_now();
diff --git a/gr-qtgui/python/__init__.py b/gr-qtgui/python/__init__.py
index c7024e4f72..82e36597be 100644
--- a/gr-qtgui/python/__init__.py
+++ b/gr-qtgui/python/__init__.py
@@ -27,4 +27,4 @@ sinks.
 # The presence of this file turns this directory into a Python package
 
 from qtgui_swig import *
-import qtgui_swig as qtgui # to preserve the old interface
+#import qtgui_swig as qtgui # to preserve the old interface
diff --git a/gr-qtgui/python/qa_qtgui.py b/gr-qtgui/python/qa_qtgui.py
index 562706701a..f77668d184 100755
--- a/gr-qtgui/python/qa_qtgui.py
+++ b/gr-qtgui/python/qa_qtgui.py
@@ -21,7 +21,7 @@
 #
 
 from gnuradio import gr, gr_unittest
-import qtgui_swig
+import qtgui_swig as qtgui
 
 class test_qtgui(gr_unittest.TestCase):
 
@@ -33,15 +33,15 @@ class test_qtgui(gr_unittest.TestCase):
 
     def test01 (self):
         # Test to make sure we can instantiate the sink
-        self.qtsnk = qtgui_swig.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                       0, 1, "Test",
-                                       True, True, True, True)
+        self.qtsnk = qtgui.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
+                                  0, 1, "Test",
+                                  True, True, True, True)
 
     def test02 (self):
         # Test to make sure we can instantiate the sink
-        self.qtsnk = qtgui_swig.sink_f(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
-                                       0, 1, "Test",
-                                       True, True, True, True)
+        self.qtsnk = qtgui.sink_f(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
+                                  0, 1, "Test",
+                                  True, True, True, True)
 
 
 if __name__ == '__main__':
diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt
index e164dc8061..ecf04a233f 100644
--- a/gr-qtgui/swig/CMakeLists.txt
+++ b/gr-qtgui/swig/CMakeLists.txt
@@ -28,6 +28,7 @@ set(GR_SWIG_TARGET_DEPS core_swig)
 set(GR_SWIG_INCLUDE_DIRS
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
     ${GR_QTGUI_INCLUDE_DIRS}
+    ${GR_FFT_INCLUDE_DIRS}
     ${QWT_INCLUDE_DIRS}
 )
author	Tom Rondeau <trondeau@vt.edu>	2012-07-17 19:35:34 -0400
committer	Tom Rondeau <trondeau@vt.edu>	2012-07-17 19:35:34 -0400
commit	fbdf83e472da67239d4cbdcb47f83ea7df108aa8 (patch)
tree	00aa7cc275798c8a67b1e527eb7f5f84aa33cd00 /gr-qtgui
parent	93dfc3d4dcd18e43baec4f9166b7501fdf254944 (diff)