gr-qtgui: removed OpenGL calls; we still link against the QTOPENGL_LIBS because of some dependencies in Qwt.

9 files changed, 15 insertions, 34 deletions

diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 7c21bfc14..f9b5dd03e 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -72,7 +72,8 @@ grinclude_HEADERS =			\
 	qtgui_sink_c.h			\
 	qtgui_sink_f.h
 
-QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+#QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
+QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
 %.moc.cc : %.h
 	$(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@
 
diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc
index 3342c0cb3..1a519591d 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.cc
+++ b/gr-qtgui/lib/SpectrumGUIClass.cc
@@ -59,8 +59,7 @@ SpectrumGUIClass::~SpectrumGUIClass()
 void
 SpectrumGUIClass::OpenSpectrumWindow(QWidget* parent,
 				     const bool frequency, const bool waterfall,
-				     const bool time, const bool constellation,
-				     const bool use_openGL)
+				     const bool time, const bool constellation)
 {
   d_mutex.lock();
 
@@ -79,7 +78,7 @@ SpectrumGUIClass::OpenSpectrumWindow(QWidget* parent,
     }
     
     // Called from the Event Thread
-    _spectrumDisplayForm = new SpectrumDisplayForm(use_openGL, parent);
+    _spectrumDisplayForm = new SpectrumDisplayForm(parent);
     
     // Toggle Windows on/off
     _spectrumDisplayForm->ToggleTabFrequency(frequency);
diff --git a/gr-qtgui/lib/SpectrumGUIClass.h b/gr-qtgui/lib/SpectrumGUIClass.h
index 8ffb411b8..48f45a0f5 100644
--- a/gr-qtgui/lib/SpectrumGUIClass.h
+++ b/gr-qtgui/lib/SpectrumGUIClass.h
@@ -29,8 +29,7 @@ public:
 
   void OpenSpectrumWindow(QWidget*,
 			  const bool frequency=true, const bool waterfall=true,
-			  const bool time=true, const bool constellation=true,
-			  const bool use_openGL=true);
+			  const bool time=true, const bool constellation=true);
   void SetDisplayTitle(const std::string);
 
   bool GetWindowOpenFlag();
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index 4cbd47c55..2cfa67d75 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -36,14 +36,12 @@ qtgui_make_sink_c (int fftsize, int wintype,
 		   const std::string &name,
 		   bool plotfreq, bool plotwaterfall,
 		   bool plottime, bool plotconst,
-		   bool use_openGL,
 		   QWidget *parent)
 {
   return gnuradio::get_initial_sptr(new qtgui_sink_c (fftsize, wintype,
 					      fc, bw, name,
 					      plotfreq, plotwaterfall,
 					      plottime, plotconst,
-					      use_openGL,
 					      parent));
 }
 
@@ -52,7 +50,6 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
 			    const std::string &name,
 			    bool plotfreq, bool plotwaterfall,
 			    bool plottime, bool plotconst,
-			    bool use_openGL,
 			    QWidget *parent)
   : gr_block ("sink_c",
 	      gr_make_io_signature (1, -1, sizeof(gr_complex)),
@@ -77,7 +74,7 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
 
   buildwindow();
 
-  initialize(use_openGL);
+  initialize();
 }
 
 qtgui_sink_c::~qtgui_sink_c()
@@ -97,7 +94,7 @@ qtgui_sink_c::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 }
 
 void
-qtgui_sink_c::initialize(const bool opengl)
+qtgui_sink_c::initialize()
 {
   if(qApp != NULL) {
     d_qApplication = qApp;
@@ -124,8 +121,7 @@ qtgui_sink_c::initialize(const bool opengl)
 
   d_main_gui->OpenSpectrumWindow(d_parent, 
 				 d_plotfreq, d_plotwaterfall,
-				 d_plottime, d_plotconst,
-				 opengl);
+				 d_plottime, d_plotconst);
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/lib/qtgui_sink_c.h
index 22ca07f77..1c9561704 100644
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ b/gr-qtgui/lib/qtgui_sink_c.h
@@ -38,7 +38,6 @@ qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
 				     const std::string &name="Spectrum Display",
 				     bool plotfreq=true, bool plotwaterfall=true,
 				     bool plottime=true, bool plotconst=true,
-				     bool use_openGL=true,
 				     QWidget *parent=NULL);
 
 class qtgui_sink_c : public gr_block
@@ -49,21 +48,17 @@ private:
 					      const std::string &name,
 					      bool plotfreq, bool plotwaterfall,
 					      bool plottime, bool plotconst,
-					      bool use_openGL,
 					      QWidget *parent);
   qtgui_sink_c (int fftsize, int wintype,
 		double fc, double bw, 
 		const std::string &name,
 		bool plotfreq, bool plotwaterfall,
 		bool plottime, bool plotconst,
-		bool use_openGL,
 		QWidget *parent);
 
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
 
-  // use opengl to force OpenGL on or off
-  // this might be necessary for sessions over SSH
-  void initialize(const bool opengl=true);
+  void initialize();
 
   int d_fftsize;
   gr_firdes::win_type d_wintype;
diff --git a/gr-qtgui/lib/qtgui_sink_f.cc b/gr-qtgui/lib/qtgui_sink_f.cc
index 90d4d7a70..3312b9006 100644
--- a/gr-qtgui/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_sink_f.cc
@@ -36,14 +36,12 @@ qtgui_make_sink_f (int fftsize, int wintype,
 		   const std::string &name,
 		   bool plotfreq, bool plotwaterfall,
 		   bool plottime, bool plotconst,
-		   bool use_openGL,
 		   QWidget *parent)
 {
   return gnuradio::get_initial_sptr(new qtgui_sink_f (fftsize, wintype,
 					      fc, bw, name,
 					      plotfreq, plotwaterfall,
 					      plottime, plotconst,
-					      use_openGL,
 					      parent));
 }
 
@@ -52,7 +50,6 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
 			    const std::string &name,
 			    bool plotfreq, bool plotwaterfall,
 			    bool plottime, bool plotconst,
-			    bool use_openGL,
 			    QWidget *parent)
   : gr_block ("sink_f",
 	      gr_make_io_signature (1, 1, sizeof(float)),
@@ -77,7 +74,7 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
 
   buildwindow();
 
-  initialize(use_openGL);
+  initialize();
 }
 
 qtgui_sink_f::~qtgui_sink_f()
@@ -97,7 +94,7 @@ qtgui_sink_f::forecast(int noutput_items, gr_vector_int &ninput_items_required)
 }
 
 void
-qtgui_sink_f::initialize(const bool opengl)
+qtgui_sink_f::initialize()
 {
   if(qApp != NULL) {
     d_qApplication = qApp;
@@ -120,8 +117,7 @@ qtgui_sink_f::initialize(const bool opengl)
 
   d_main_gui->OpenSpectrumWindow(d_parent,
 				 d_plotfreq, d_plotwaterfall,
-				 d_plottime, d_plotconst,
-				 opengl);
+				 d_plottime, d_plotconst);
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/lib/qtgui_sink_f.h
index 8f27d120a..518aa3846 100644
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ b/gr-qtgui/lib/qtgui_sink_f.h
@@ -39,7 +39,6 @@ qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
 				     const std::string &name="Spectrum Display",
 				     bool plotfreq=true, bool plotwaterfall=true,
 				     bool plottime=true, bool plotconst=true,
-				     bool use_openGL=true,
 				     QWidget *parent=NULL);
 
 class qtgui_sink_f : public gr_block
@@ -50,19 +49,17 @@ private:
 					      const std::string &name,
 					      bool plotfreq, bool plotwaterfall,
 					      bool plottime, bool plotconst,
-					      bool use_openGL,
 					      QWidget *parent);
   qtgui_sink_f (int fftsize, int wintype,
 		double fc, double bw,
 		const std::string &name,
 		bool plotfreq, bool plotwaterfall,
 		bool plottime, bool plotconst,
-		bool use_openGL,
 		QWidget *parent);
 
   void forecast(int noutput_items, gr_vector_int &ninput_items_required);
 
-  void initialize(const bool opengl=true);
+  void initialize();
 
   int d_fftsize;
   gr_firdes::win_type d_wintype;
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index 101bbc52b..804dbdd62 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -3,12 +3,11 @@
 #include <QMessageBox>
 #include <spectrumdisplayform.h>
 
-SpectrumDisplayForm::SpectrumDisplayForm(bool useOpenGL, QWidget* parent)
+SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent)
   : QWidget(parent)
 {
   setupUi(this);
 
-  _useOpenGL = useOpenGL;
   _systemSpecifiedFlag = false;
   _intValidator = new QIntValidator(this);
   _intValidator->setBottom(0);
diff --git a/gr-qtgui/lib/spectrumdisplayform.h b/gr-qtgui/lib/spectrumdisplayform.h
index e760ccc13..794a8c58e 100644
--- a/gr-qtgui/lib/spectrumdisplayform.h
+++ b/gr-qtgui/lib/spectrumdisplayform.h
@@ -20,7 +20,7 @@ class SpectrumDisplayForm : public QWidget, public Ui::SpectrumDisplayForm
   Q_OBJECT
 
   public:
-  SpectrumDisplayForm(bool useOpenGL = true, QWidget* parent = 0);
+  SpectrumDisplayForm(QWidget* parent = 0);
   ~SpectrumDisplayForm();
   
   void setSystem( SpectrumGUIClass * newSystem, const uint64_t numFFTDataPoints,
@@ -76,7 +76,6 @@ protected:
 private:
   void _AverageHistory( const double * newBuffer );
 
-  bool _useOpenGL;
   int _historyEntryCount;
   int _historyEntry;
   std::vector<double*>* _historyVector;