Merging trondeau/qt branch r11231:11360. This merge improves the usability and examples of the QT-based interface.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11361 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 10 insertions, 8 deletions

diff --git a/gr-qtgui/src/lib/qtgui_sink_f.h b/gr-qtgui/src/lib/qtgui_sink_f.h
index 31baa1def..4c24b4983 100644
--- a/gr-qtgui/src/lib/qtgui_sink_f.h
+++ b/gr-qtgui/src/lib/qtgui_sink_f.h
@@ -35,38 +35,41 @@ 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,
+				     double fc=0, double bw=1.0,
 				     const std::string &name="Spectrum Display",
 				     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
 {
 private:
   friend qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
-					      float fmin, float fmax,
+					      double fc, double bw,
 					      const std::string &name,
 					      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, 
+		double fc, double bw,
 		const std::string &name,
 		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;
   std::vector<float> d_window;
-  float d_fmin;
-  float d_fmax;
+  double d_center_freq;
+  double d_bandwidth;
   std::string d_name;
   
   pthread_mutex_t d_pmutex;
@@ -97,8 +100,7 @@ public:
   PyObject* pyqwidget();
 
   void set_frequency_range(const double centerfreq,
-			   const double startfreq,
-			   const double stopfreq);
+			   const double bandwidth);
 
   void set_time_domain_axis(double min, double max);
   void set_constellation_axis(double xmin, double xmax,