Merge branch 'patches/marcus/file_sink'

[debian/gnuradio] / gr-qtgui / src / lib / qtgui.i

diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i
index 1113d647c4e89b6338dd2838bd0edb61a80dec22..1f50bf43c91db0cfccfd087ce02ff67d0e829602 100644 (file)
--- a/gr-qtgui/src/lib/qtgui.i
+++ b/gr-qtgui/src/lib/qtgui.i
@@ -30,29 +30,32 @@
 GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
 
   qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
-                                      float fmin=-0.5, float fmax=0.5,
+                                      double fc=0, double bw=1.0,
                                       const std::string &name="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,
+                                             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,
+               double fc, double bw,
                const std::string &name,
                bool plotfreq, bool plotwaterfall,
                bool plotwaterfall3d, bool plottime,
                bool plotconst,
+               bool use_openGL,
                QWidget *parent);
 
 public:
@@ -60,8 +63,12 @@ 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_frequency_axis(double min, double max);
+  void set_constellation_pen_size(int size);
 };
 
 
@@ -72,33 +79,44 @@ public:
 GR_SWIG_BLOCK_MAGIC(qtgui,sink_f)
   
 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=0.0,
                                     const std::string &name="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);
 
 public:
   void exec_();
   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_frequency_axis(double min, double max);
+  void set_constellation_pen_size(int size);
 };