diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-04-24 02:47:56 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-04-24 02:51:58 -0400 |
| commit | 475f9770aa03072b4b6214f61bd75c1a083fae88 (patch) | |
| tree | b88b6d6ce5e97523b3353e0eb5d17a6dce4b0404 /gr-qtgui | |
| parent | f11a20190f36d3f7864f932118d157425e988d0a (diff) | |
gr-qtgui: splitting qtgui.i into its complex and float .i files to keep with the general standard.
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/swig/Makefile.am | 3 | ||||
| -rw-r--r-- | gr-qtgui/swig/qtgui_sink_c.i (renamed from gr-qtgui/swig/qtgui.i) | 47 | ||||
| -rw-r--r-- | gr-qtgui/swig/qtgui_sink_f.i | 66 | ||||
| -rw-r--r-- | gr-qtgui/swig/qtgui_swig.i | 3 |
4 files changed, 71 insertions, 48 deletions
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am index 86d4290746..1d8319987d 100644 --- a/gr-qtgui/swig/Makefile.am +++ b/gr-qtgui/swig/Makefile.am @@ -51,6 +51,7 @@ qtgui_swig_la_swig_libadd = \ # additional SWIG files to be installed qtgui_swig_swiginclude_headers = \ - qtgui.i \ + qtgui_sink_c.i \ + qtgui_sink_f.i \ qtgui_time_sink_c.i \ qtgui_time_sink_f.i diff --git a/gr-qtgui/swig/qtgui.i b/gr-qtgui/swig/qtgui_sink_c.i index 77c6ccdd79..ff62414825 100644 --- a/gr-qtgui/swig/qtgui.i +++ b/gr-qtgui/swig/qtgui_sink_c.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2008,2009 Free Software Foundation, Inc. + * Copyright 2008,2009,2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,7 +24,6 @@ %{ #include <qtgui_sink_c.h> -#include <qtgui_sink_f.h> %} GR_SWIG_BLOCK_MAGIC(qtgui,sink_c) @@ -65,47 +64,3 @@ public: void set_constellation_pen_size(int size); void set_update_time(double t); }; - - - -/*********************************************************************/ - - -GR_SWIG_BLOCK_MAGIC(qtgui,sink_f) - -qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, - double fc=0, double bw=0.0, - const std::string &name="Display", - bool plotfreq=true, bool plotwaterfall=true, - bool plottime=true, bool plotconst=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, - double fc, double bw, - const std::string &name, - bool plotfreq, bool plotwaterfall, - bool plottime, bool plotconst, - QWidget *parent); - qtgui_sink_f (int fftsize, int wintype, - double fc, double bw, - const std::string &name, - bool plotfreq, bool plotwaterfall, - bool plottime, bool plotconst, - 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); - void set_update_time(double t); -}; diff --git a/gr-qtgui/swig/qtgui_sink_f.i b/gr-qtgui/swig/qtgui_sink_f.i new file mode 100644 index 0000000000..c5eb656b9d --- /dev/null +++ b/gr-qtgui/swig/qtgui_sink_f.i @@ -0,0 +1,66 @@ +/* -*- c++ -*- */ +/* + * Copyright 2008,2009,2011 Free Software Foundation, Inc. + * + * This file is part of GNU Radio + * + * GNU Radio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * GNU Radio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GNU Radio; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 51 Franklin Street, + * Boston, MA 02110-1301, USA. + */ + +%include "gnuradio.i" + +%{ +#include <qtgui_sink_f.h> +%} + +GR_SWIG_BLOCK_MAGIC(qtgui,sink_f) + +qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype, + double fc=0, double bw=0.0, + const std::string &name="Display", + bool plotfreq=true, bool plotwaterfall=true, + bool plottime=true, bool plotconst=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, + double fc, double bw, + const std::string &name, + bool plotfreq, bool plotwaterfall, + bool plottime, bool plotconst, + QWidget *parent); + qtgui_sink_f (int fftsize, int wintype, + double fc, double bw, + const std::string &name, + bool plotfreq, bool plotwaterfall, + bool plottime, bool plotconst, + 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); + void set_update_time(double t); +}; diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i index b7bee17712..5a4ffd6fb8 100644 --- a/gr-qtgui/swig/qtgui_swig.i +++ b/gr-qtgui/swig/qtgui_swig.i @@ -29,6 +29,7 @@ #include <qtgui_time_sink_f.h> %} -%include "qtgui.i" +%include "qtgui_sink_c.i" +%include "qtgui_sink_f.i" %include "qtgui_time_sink_c.i" %include "qtgui_time_sink_f.i" |