[Commit-gnuradio] r10840 - gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib

[trondeau]

Author: trondeau
Date: 2009-04-14 18:46:36 -0600 (Tue, 14 Apr 2009)
New Revision: 10840

Modified:
   
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.cc
   
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.h
Log:
updating floating point sink for same constructor format as complex version.

Modified: 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.cc 
    2009-04-14 23:23:08 UTC (rev 10839)
+++ 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.cc 
    2009-04-15 00:46:36 UTC (rev 10840)
@@ -34,16 +34,25 @@
 qtgui_make_sink_f (int fftsize, int wintype,
                   float fmin, float fmax,
                   const std::string &name,
+                  bool plotfreq, bool plotwaterfall,
+                  bool plotwaterfall3d, bool plottime,
+                  bool plotconst,
                   QWidget *parent)
 {
   return qtgui_sink_f_sptr (new qtgui_sink_f (fftsize, wintype,
                                              fmin, fmax, name,
+                                             plotfreq, plotwaterfall,
+                                             plotwaterfall3d, plottime,
+                                             plotconst,
                                              parent));
 }
 
 qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
                            float fmin, float fmax,
                            const std::string &name,
+                           bool plotfreq, bool plotwaterfall,
+                           bool plotwaterfall3d, bool plottime,
+                           bool plotconst,
                            QWidget *parent)
   : gr_block ("sink_f",
              gr_make_io_signature (1, 1, sizeof(float)),
@@ -51,6 +60,9 @@
     d_fftsize(fftsize),
     d_wintype((gr_firdes::win_type)(wintype)),
     d_fmin(fmin), d_fmax(fmax), d_name(name),
+    d_plotfreq(plotfreq), d_plotwaterfall(plotwaterfall),
+    d_plotwaterfall3d(plotwaterfall3d), d_plottime(plottime),
+    d_plotconst(plotconst),
     d_parent(parent)
 {
   d_main_gui = NULL;
@@ -111,7 +123,10 @@
   d_main_gui->SetFFTSize(d_fftsize);
   d_main_gui->SetWindowType((int)d_wintype);
 
-  d_main_gui->OpenSpectrumWindow(d_parent);
+  d_main_gui->OpenSpectrumWindow(d_parent,
+                                d_plotfreq, d_plotwaterfall,
+                                d_plotwaterfall3d, d_plottime,
+                                d_plotconst);
 
   d_object = new qtgui_obj(d_qApplication);
   qApp->postEvent(d_object, new qtgui_event(&d_pmutex));

Modified: 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.h
===================================================================
--- 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.h  
    2009-04-14 23:23:08 UTC (rev 10839)
+++ 
gnuradio/branches/developers/trondeau/qtdevel2/gr-qtgui/src/lib/qtgui_sink_f.h  
    2009-04-15 00:46:36 UTC (rev 10840)
@@ -31,13 +31,15 @@
 #include <Python.h>
 #include "SpectrumGUIClass.h"
 
-
 class qtgui_sink_f;
 typedef boost::shared_ptr<qtgui_sink_f> qtgui_sink_f_sptr;
 
 qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
                                     float fmin=-0.5, float fmax=0.5,
                                     const std::string &name="Spectrum Display",
+                                    bool plotfreq=true, bool 
plotwaterfall=true,
+                                    bool plotwaterfall3d=true, bool 
plottime=true,
+                                    bool plotconst=true,
                                     QWidget *parent=NULL);
 
 class qtgui_sink_f : public gr_block
@@ -46,10 +48,16 @@
   friend qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
                                              float fmin, float fmax,
                                              const std::string &name,
+                                             bool plotfreq, bool plotwaterfall,
+                                             bool plotwaterfall3d, bool 
plottime,
+                                             bool plotconst,
                                              QWidget *parent);
   qtgui_sink_f (int fftsize, int wintype,
                float fmin, float fmax, 
                const std::string &name,
+               bool plotfreq, bool plotwaterfall,
+               bool plotwaterfall3d, bool plottime,
+               bool plotconst,
                QWidget *parent);
 
   void initialize();
@@ -70,6 +78,8 @@
   int d_index;
   float *d_residbuf;
 
+  bool d_plotfreq, d_plotwaterfall, d_plotwaterfall3d, d_plottime, d_plotconst;
+
   QWidget *d_parent;
   SpectrumGUIClass *d_main_gui;