[Commit-gnuradio] r9165 - in gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src: lib lib/qtspectrum python

[trondeau]

Author: trondeau
Date: 2008-08-03 22:28:23 -0600 (Sun, 03 Aug 2008)
New Revision: 9165

Modified:
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.cpp
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.hpp
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.cpp
   
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.ui
   gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py
Log:
working on improving user interface interaction. Adds ability to change fft 
size and window type through combo boxes and does initialization of these boxes.

Modified: gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i        
2008-08-03 18:33:17 UTC (rev 9164)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui.i        
2008-08-04 04:28:23 UTC (rev 9165)
@@ -33,15 +33,15 @@
 
 GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
 
-  qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> 
&window,
+  qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
                                       float fmin=-0.5, float fmax=0.5, const 
std::string &name="Display");
 
 class qtgui_sink_c : public gr_block
 {
 private:
-  friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const 
std::vector<float> &window,
+  friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
                                              float fmin, float fmax, const 
std::string &name);
-  qtgui_sink_c (int fftsize, const std::vector<float> &window,
+  qtgui_sink_c (int fftsize, int wintype,
                float fmin, float fmax, const std::string &name);
 
 public:

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc    
    2008-08-03 18:33:17 UTC (rev 9164)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.cc    
    2008-08-04 04:28:23 UTC (rev 9165)
@@ -31,18 +31,18 @@
 #include <QTimer>
 
 qtgui_sink_c_sptr
-qtgui_make_sink_c (int fftsize, const std::vector<float> &window,
+qtgui_make_sink_c (int fftsize, int wintype,
                   float fmin, float fmax, const std::string &name)
 {
-  return qtgui_sink_c_sptr (new qtgui_sink_c (fftsize, window, fmin, fmax, 
name));
+  return qtgui_sink_c_sptr (new qtgui_sink_c (fftsize, wintype, fmin, fmax, 
name));
 }
 
-qtgui_sink_c::qtgui_sink_c (int fftsize, const std::vector<float> &window,
+qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
                            float fmin, float fmax, const std::string &name)
   : gr_block ("sink_c",
              gr_make_io_signature (1, 1, sizeof(gr_complex)),
              gr_make_io_signature (0, 0, 0)),
-    d_fftsize(fftsize), d_window(window), 
+    d_fftsize(fftsize), d_wintype((gr_firdes::win_type)(wintype)), 
     d_fmin(fmin), d_fmax(fmax), d_name(name)
 {
   d_main_gui = NULL;
@@ -53,15 +53,17 @@
 
   d_fft = new gri_fft_complex (d_fftsize, true);
 
-  fftdata = new gr_complex[d_fftsize];
+  d_fftdata = new gr_complex[d_fftsize];
 
   d_index = 0;
   d_residbuf = new gr_complex[d_fftsize];
+
+  buildwindow();
 }
 
 qtgui_sink_c::~qtgui_sink_c()
 {
-  delete [] fftdata;
+  delete [] d_fftdata;
   delete [] d_residbuf;
   delete d_main_gui;
   delete d_fft;
@@ -85,6 +87,8 @@
   uint64_t maxBufferSize = 32768;
   d_main_gui = new SpectrumGUIClass(maxBufferSize, d_fftsize, d_fmin, d_fmax);
   d_main_gui->SetDisplayTitle(d_name);
+  d_main_gui->SetFFTSize(d_fftsize);
+  d_main_gui->SetWindowType((int)d_wintype);
   d_main_gui->OpenSpectrumWindow(NULL);
 
   qtgui_obj object(d_qApplication);
@@ -99,7 +103,8 @@
 {
   if (d_window.size()) {
     gr_complex *dst = d_fft->get_inbuf();
-    for (int i = 0; i < size; i++)             // apply window
+    int i;
+    for (i = 0; i < size; i++)         // apply window
       dst[i] = data_in[i] * d_window[i];
   }
   else {
@@ -123,7 +128,55 @@
   }
 }
 
+void 
+qtgui_sink_c::windowreset()
+{
+  gr_firdes::win_type newwintype = 
(gr_firdes::win_type)d_main_gui->GetWindowType();  
+  if(d_wintype != newwintype) {
+    d_wintype = newwintype;
+    buildwindow();
+  }
+}
 
+void
+qtgui_sink_c::buildwindow()
+{
+  d_window.clear();
+  if(d_wintype != 0) {
+    d_window = gr_firdes::window(d_wintype, d_fftsize, 6.76);
+  }
+}
+
+void
+qtgui_sink_c::fftresize()
+{
+  int newfftsize = d_main_gui->GetFFTSize();
+
+  if(newfftsize != d_fftsize) {
+
+    // Resize the fftdata buffer; no need to preserve old data
+    delete [] d_fftdata;
+    d_fftdata = new gr_complex[newfftsize];
+
+    // Resize residbuf and replace data
+    delete [] d_residbuf;
+    d_residbuf = new gr_complex[newfftsize];
+
+    // Set new fft size and reset buffer index 
+    // (throws away any currently held data, but who cares?) 
+    d_fftsize = newfftsize;
+    d_index = 0;
+    
+    // Reset window to reflect new size
+    buildwindow();
+
+    // Reset FFTW plan for new size
+    delete d_fft;
+    d_fft = new gri_fft_complex (d_fftsize, true);
+  }
+}
+
+
 int
 qtgui_sink_c::general_work (int noutput_items,
                            gr_vector_int &ninput_items,
@@ -135,8 +188,13 @@
 
   pthread_mutex_lock(&d_pmutex);
 
+  // Update the FFT size from the application
+  fftresize();
+  windowreset();
+
   if(d_index) {
     int filler = std::min(d_fftsize - d_index, noutput_items);
+
     memcpy(&d_residbuf[d_index], &in[0], sizeof(gr_complex)*filler);
     d_index += filler;
     i = filler;
@@ -145,18 +203,18 @@
 
   if(d_index == d_fftsize) {
     d_index = 0;
-    fft(d_residbuf, d_fftsize, fftdata);
+    fft(d_residbuf, d_fftsize, d_fftdata);
     
-    d_main_gui->UpdateWindow(true, fftdata, d_fftsize, NULL, 0, 
(float*)d_residbuf, d_fftsize,
+    d_main_gui->UpdateWindow(true, d_fftdata, d_fftsize, NULL, 0, 
(float*)d_residbuf, d_fftsize,
                             1.0/4.0, convert_to_timespec(0.0), true);
   }
   
   for(; i < noutput_items; i+=d_fftsize) {
     if(noutput_items - i > d_fftsize) {
       j += d_fftsize;
-      fft(&in[i], d_fftsize, fftdata);
+      fft(&in[i], d_fftsize, d_fftdata);
       
-      d_main_gui->UpdateWindow(true, fftdata, d_fftsize, NULL, 0, 
(float*)&in[i], d_fftsize,
+      d_main_gui->UpdateWindow(true, d_fftdata, d_fftsize, NULL, 0, 
(float*)&in[i], d_fftsize,
                               1.0/4.0, convert_to_timespec(0.0), true);
     }
   }

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h 
2008-08-03 18:33:17 UTC (rev 9164)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtgui_sink_c.h 
2008-08-04 04:28:23 UTC (rev 9165)
@@ -24,6 +24,7 @@
 #define INCLUDED_QTGUI_SINK_C_H
 
 #include <gr_block.h>
+#include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
 #include <qtgui.h>
@@ -33,18 +34,19 @@
 class qtgui_sink_c;
 typedef boost::shared_ptr<qtgui_sink_c> qtgui_sink_c_sptr;
 
-qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const std::vector<float> 
&window,
+qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
                                     float fmin=-0.5, float fmax=0.5, const 
std::string &name="Display");
 
 class qtgui_sink_c : public gr_block
 {
 private:
-  friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, const 
std::vector<float> &window,
+  friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
                                              float fmin, float fmax, const 
std::string &name);
-  qtgui_sink_c (int fftsize, const std::vector<float> &window,
+  qtgui_sink_c (int fftsize, int wintype,
                float fmin, float fmax, const std::string &name);
   
   int d_fftsize;
+  gr_firdes::win_type d_wintype;
   std::vector<float> d_window;
   float d_fmin;
   float d_fmax;
@@ -54,13 +56,16 @@
 
   bool d_shift;
   gri_fft_complex *d_fft;
-  gr_complex *fftdata;
+  gr_complex *d_fftdata;
 
   int d_index;
   gr_complex *d_residbuf;
 
   SpectrumGUIClass *d_main_gui; 
 
+  void windowreset();
+  void buildwindow();
+  void fftresize();
   void fft(const gr_complex *data_in, int size, gr_complex *data_out);
   
 public:

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.cpp
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.cpp
        2008-08-03 18:33:17 UTC (rev 9164)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.cpp
        2008-08-04 04:28:23 UTC (rev 9165)
@@ -26,7 +26,7 @@
   _stopFrequency = newStopFrequency;
 
 #warning SPECIFY THIS LATER...
-  _windowType = 4;
+  _windowType = 5;
 
   timespec_reset(&_lastGUIUpdateTime);
 
@@ -276,6 +276,19 @@
   return returnValue;
 }
 
+int SpectrumGUIClass::GetFFTSizeIndex()const{
+  int fftsize = GetFFTSize();
+  switch(fftsize) {
+  case(1024): return 0; break;
+  case(2048): return 1; break;
+  case(4096): return 2; break;
+  case(8192): return 3; break;
+  case(16384): return 3; break;
+  case(32768): return 3; break;
+  default: return 0;
+  }
+}
+
 void SpectrumGUIClass::SetFFTSize(const int newSize){
   //_windowStateLock->Lock();
   _fftSize = newSize;

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.hpp
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.hpp
        2008-08-03 18:33:17 UTC (rev 9164)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/SpectrumGUIClass.hpp
        2008-08-04 04:28:23 UTC (rev 9165)
@@ -45,6 +45,7 @@
   void SetWindowType(const int);
 
   int GetFFTSize()const;
+  int GetFFTSizeIndex()const;
   void SetFFTSize(const int);
 
   timespec GetLastGUIUpdateTime()const;

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.cpp
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.cpp
     2008-08-03 18:33:17 UTC (rev 9164)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.cpp
     2008-08-04 04:28:23 UTC (rev 9165)
@@ -234,6 +234,8 @@
   if(e->type() == QEvent::User+3){
     if(_systemSpecifiedFlag){
       WindowComboBox->setCurrentIndex(_system->GetWindowType());
+      FFTSizeComboBox->setCurrentIndex(_system->GetFFTSizeIndex());
+      //FFTSizeComboBox->setCurrentIndex(1);
       PowerLineEdit_textChanged(PowerLineEdit->text());
     }
 

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.ui
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.ui
      2008-08-03 18:33:17 UTC (rev 9164)
+++ 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/lib/qtspectrum/spectrumdisplayform.ui
      2008-08-04 04:28:23 UTC (rev 9165)
@@ -41,12 +41,12 @@
    </property>
    <item>
     <property name="text" >
-     <string>None</string>
+     <string>Hamming</string>
     </property>
    </item>
    <item>
     <property name="text" >
-     <string>Blackman Harris</string>
+     <string>Hann</string>
     </property>
    </item>
    <item>
@@ -56,17 +56,17 @@
    </item>
    <item>
     <property name="text" >
-     <string>Bartlett</string>
+     <string>Rectangular</string>
     </property>
    </item>
    <item>
     <property name="text" >
-     <string>Hann</string>
+     <string>Kaiser</string>
     </property>
    </item>
    <item>
     <property name="text" >
-     <string>Hamming</string>
+     <string>Blackman-harris</string>
     </property>
    </item>
   </widget>

Modified: 
gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py 
2008-08-03 18:33:17 UTC (rev 9164)
+++ gnuradio/branches/developers/trondeau/qtgui/gr-qtgui/src/python/qttest_c.py 
2008-08-04 04:28:23 UTC (rev 9165)
@@ -9,13 +9,11 @@
 
         fftsize = 2048
 
-        win = gr.firdes.window(gr.firdes.WIN_BLACKMAN_hARRIS, fftsize, 0)
-
         src1 = gr.sig_source_c(1, gr.GR_SIN_WAVE, 0.1, 0.01, 0)
         src2 = gr.sig_source_c(1, gr.GR_SIN_WAVE, 0.015, 0.01, 0)
         src  = gr.add_cc()
         thr = gr.throttle(gr.sizeof_gr_complex, 20*fftsize)
-        self.snk = qtgui.sink_c(fftsize, win, -0.5, 0.5)
+        self.snk = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS, -0.5, 
0.5)
 
         self.connect(src1, (src,0))
         self.connect(src2, (src,1))