Fixes a lot of warnings by cleaning up namespace issues.

[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 a6bd59f279af250fff337952921713c09202508e..9aee665031169d523bc13798f82af10ce260c89c 100644 (file)
--- a/gr-qtgui/src/lib/qtgui_sink_c.h
+++ b/gr-qtgui/src/lib/qtgui_sink_c.h
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2008 Free Software Foundation, Inc.
+ * Copyright 2008,2009 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -23,6 +23,7 @@
 #ifndef INCLUDED_QTGUI_SINK_C_H
 #define INCLUDED_QTGUI_SINK_C_H
 
+#include <Python.h>
 #include <gr_block.h>
 #include <gr_firdes.h>
 #include <gri_fft.h>
@@ -30,52 +31,92 @@
 #include <qtgui.h>
 #include "SpectrumGUIClass.h"
 
-
 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, const std::string &name="Display");
+                                    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,
+                                    bool plotconst=true,
+                                    bool use_openGL=true,
+                                    QWidget *parent=NULL);
 
 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, const std::string &name);
+                                             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_c (int fftsize, int wintype,
-               float fmin, float fmax, const std::string &name);
-  
+               double fc, double bw, 
+               const std::string &name,
+               bool plotfreq, bool plotwaterfall,
+               bool plotwaterfall3d, 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);
+
   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;
   gr_complex *d_residbuf;
 
-  SpectrumGUIClass *d_main_gui; 
+  bool d_plotfreq, d_plotwaterfall, d_plottime, d_plotconst;
+  
+  double d_update_time;
+
+  QWidget *d_parent;
+  SpectrumGUIClass *d_main_gui;
 
   void windowreset();
   void buildwindow();
   void fftresize();
-  void fft(const gr_complex *data_in, int size, gr_complex *data_out);
+  void fft(const gr_complex *data_in, int size);
   
 public:
   ~qtgui_sink_c();
-  void start_app();
+  void exec_();
   void lock();
   void unlock();
+  QWidget*  qwidget();
+  PyObject* pyqwidget();
+
+  void set_frequency_range(const double centerfreq,
+                          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
-;
+  QApplication *d_qApplication;
+  qtgui_obj *d_object;
 
   int general_work (int noutput_items,
                    gr_vector_int &ninput_items,