[Commit-gnuradio] r11245 - gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib

[trondeau]

Author: trondeau
Date: 2009-06-19 20:34:03 -0600 (Fri, 19 Jun 2009)
New Revision: 11245

Modified:
   gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui.i
   gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_c.h
   gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.cc
   gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.h
Log:
adding opengl flag to floating point sink

Modified: gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui.i
===================================================================
--- gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui.i   
2009-06-20 00:53:37 UTC (rev 11244)
+++ gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui.i   
2009-06-20 02:34:03 UTC (rev 11245)
@@ -84,6 +84,7 @@
                                     bool plotfreq=true, bool 
plotwaterfall=true,
                                     bool plotwaterfall3d=true, bool 
plottime=true,
                                     bool plotconst=true,
+                                    bool use_openGL=true,
                                     QWidget *parent=NULL);
 
 class qtgui_sink_f : public gr_block
@@ -95,6 +96,7 @@
                                              bool plotfreq, bool plotwaterfall,
                                              bool plotwaterfall3d, bool 
plottime,
                                              bool plotconst,
+                                             bool use_openGL,
                                              QWidget *parent);
   qtgui_sink_f (int fftsize, int wintype,
                float fmin, float fmax,
@@ -102,6 +104,7 @@
                bool plotfreq, bool plotwaterfall,
                bool plotwaterfall3d, bool plottime,
                bool plotconst,
+               bool use_openGL,
                QWidget *parent);
 
 public:

Modified: 
gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_c.h
===================================================================
--- gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_c.h    
2009-06-20 00:53:37 UTC (rev 11244)
+++ gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_c.h    
2009-06-20 02:34:03 UTC (rev 11245)
@@ -65,7 +65,7 @@
 
   // use opengl to force OpenGL on or off
   // this might be necessary for sessions over SSH
-  void initialize(const bool opengl);
+  void initialize(const bool opengl=true);
 
   int d_fftsize;
   gr_firdes::win_type d_wintype;

Modified: 
gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.cc
===================================================================
--- gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.cc   
2009-06-20 00:53:37 UTC (rev 11244)
+++ gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.cc   
2009-06-20 02:34:03 UTC (rev 11245)
@@ -37,6 +37,7 @@
                   bool plotfreq, bool plotwaterfall,
                   bool plotwaterfall3d, bool plottime,
                   bool plotconst,
+                  bool use_openGL,
                   QWidget *parent)
 {
   return qtgui_sink_f_sptr (new qtgui_sink_f (fftsize, wintype,
@@ -44,6 +45,7 @@
                                              plotfreq, plotwaterfall,
                                              plotwaterfall3d, plottime,
                                              plotconst,
+                                             use_openGL,
                                              parent));
 }
 
@@ -53,6 +55,7 @@
                            bool plotfreq, bool plotwaterfall,
                            bool plotwaterfall3d, bool plottime,
                            bool plotconst,
+                           bool use_openGL,
                            QWidget *parent)
   : gr_block ("sink_f",
              gr_make_io_signature (1, 1, sizeof(float)),
@@ -82,7 +85,7 @@
 
   buildwindow();
 
-  initialize();
+  initialize(use_openGL);
 }
 
 qtgui_sink_f::~qtgui_sink_f()
@@ -104,7 +107,7 @@
 }
 
 void
-qtgui_sink_f::initialize()
+qtgui_sink_f::initialize(const bool opengl)
 {
   if(qApp != NULL) {
     d_qApplication = qApp;
@@ -126,7 +129,8 @@
   d_main_gui->OpenSpectrumWindow(d_parent,
                                 d_plotfreq, d_plotwaterfall,
                                 d_plotwaterfall3d, d_plottime,
-                                d_plotconst);
+                                d_plotconst,
+                                opengl);
 
   d_object = new qtgui_obj(d_qApplication);
   qApp->postEvent(d_object, new qtgui_event(&d_pmutex));

Modified: 
gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.h
===================================================================
--- gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.h    
2009-06-20 00:53:37 UTC (rev 11244)
+++ gnuradio/branches/developers/trondeau/qt/gr-qtgui/src/lib/qtgui_sink_f.h    
2009-06-20 02:34:03 UTC (rev 11245)
@@ -40,6 +40,7 @@
                                     bool plotfreq=true, bool 
plotwaterfall=true,
                                     bool plotwaterfall3d=true, bool 
plottime=true,
                                     bool plotconst=true,
+                                    bool use_openGL=true,
                                     QWidget *parent=NULL);
 
 class qtgui_sink_f : public gr_block
@@ -51,6 +52,7 @@
                                              bool plotfreq, bool plotwaterfall,
                                              bool plotwaterfall3d, bool 
plottime,
                                              bool plotconst,
+                                             bool use_openGL,
                                              QWidget *parent);
   qtgui_sink_f (int fftsize, int wintype,
                float fmin, float fmax, 
@@ -58,9 +60,10 @@
                bool plotfreq, bool plotwaterfall,
                bool plotwaterfall3d, bool plottime,
                bool plotconst,
+               bool use_openGL,
                QWidget *parent);
 
-  void initialize();
+  void initialize(const bool opengl=true);
 
   int d_fftsize;
   gr_firdes::win_type d_wintype;