Merging trondeau/qt branch r11231:11360. This merge improves the usability and exampl...

[debian/gnuradio] / gr-qtgui / src / lib / qtgui_sink_c.h

diff --git a/gr-qtgui/src/lib/qtgui_sink_c.h b/gr-qtgui/src/lib/qtgui_sink_c.h
index 0b3ba99e27e124a242ae9fd6d0700df6d6f13ab5..1c9d592009a73c4877528f3f89b3c8564b712ebf 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_c.h
+++ b/gr-qtgui/src/lib/qtgui_sink_c.h
@@ -35,7 +35,7 @@ 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, int wintype,
-                                    float fmin=-0.5, float fmax=0.5,
+                                    double fc=0, double bandwidth=1.0,
                                     const std::string &name="Spectrum Display",
                                     bool plotfreq=true, bool plotwaterfall=true,
                                     bool plotwaterfall3d=true, bool plottime=true,
@@ -47,7 +47,7 @@ class qtgui_sink_c : public gr_block
 {
 private:
   friend qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
-                                             float fmin, float fmax,
+                                             double fc, double bw,
                                              const std::string &name,
                                              bool plotfreq, bool plotwaterfall,
                                              bool plotwaterfall3d, bool plottime,
@@ -55,7 +55,7 @@ private:
                                              bool use_openGL,
                                              QWidget *parent);
   qtgui_sink_c (int fftsize, int wintype,
-               float fmin, float fmax, 
+               double fc, double bw, 
                const std::string &name,
                bool plotfreq, bool plotwaterfall,
                bool plotwaterfall3d, bool plottime,
@@ -65,13 +65,13 @@ private:
 
   // 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;
   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;
@@ -102,8 +102,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,