X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-qtgui%2Fsrc%2Flib%2Fqtgui_sink_f.h;h=5b96136f0a2276632ed96c244e4d79fc74ad5788;hb=0be1b700a2ca7886c92a9a913d5ae00e3d17fa9e;hp=676a3f80b8d80d12ca1c6fd768a01a28d8d9ff6c;hpb=ba59e6384ac558f97a4530a69f8b8fc1b99ace0b;p=debian%2Fgnuradio

diff --git a/gr-qtgui/src/lib/qtgui_sink_f.h b/gr-qtgui/src/lib/qtgui_sink_f.h
index 676a3f80..5b96136f 100644
--- a/gr-qtgui/src/lib/qtgui_sink_f.h
+++ b/gr-qtgui/src/lib/qtgui_sink_f.h
@@ -35,50 +35,56 @@ 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 forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+  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;
 
   bool d_shift;
   gri_fft_complex *d_fft;
-  gr_complex *d_fftdata;
 
   int d_index;
   float *d_residbuf;
 
-  bool d_plotfreq, d_plotwaterfall, d_plotwaterfall3d, d_plottime, d_plotconst;
+  bool d_plotfreq, d_plotwaterfall, d_plottime, d_plotconst;
+
+  double d_update_time;
 
   QWidget *d_parent;
   SpectrumGUIClass *d_main_gui; 
@@ -86,7 +92,7 @@ private:
   void windowreset();
   void buildwindow();
   void fftresize();
-  void fft(const float *data_in, int size, gr_complex *data_out);
+  void fft(const float *data_in, int size);
   
 public:
   ~qtgui_sink_f();
@@ -97,12 +103,15 @@ 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,
 			      double ymin, double ymax);
+  void set_constellation_pen_size(int size);
+  void set_frequency_axis(double min, double max);
+
+  void set_update_time(double t);
 
   QApplication *d_qApplication;
   qtgui_obj *d_object;