Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid

Conflicts:
	volk/Makefile.common
	volk/lib/qa_utils.cc

6 files changed, 368 insertions, 0 deletions

diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gr-qtgui/swig/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am
new file mode 100644
index 000000000..8c695ba5b
--- /dev/null
+++ b/gr-qtgui/swig/Makefile.am
@@ -0,0 +1,54 @@
+#
+# Copyright 2004-2006,2008-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 $(top_srcdir)/Makefile.common
+include $(top_srcdir)/Makefile.swig
+
+TESTS =
+EXTRA_DIST += $(nobase_guile_DATA)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gr-qtgui/lib \
+	-I$(top_builddir)/gr-qtgui/lib \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(QT_INCLUDES) \
+	$(WITH_INCLUDES)
+
+##############################
+# SWIG interface and library
+TOP_SWIG_IFILES = \
+	qtgui_swig.i
+
+# Install so that they end up available as:
+#   import gnuradio.qtgui
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui
+qtgui_swig_pythondir_category = \
+	gnuradio/qtgui
+
+# additional libraries for linking with the SWIG-generated library
+qtgui_swig_la_swig_libadd = \
+	$(abs_top_builddir)/gr-qtgui/lib/libgnuradio-qtgui.la
+
+# additional SWIG files to be installed
+qtgui_swig_swiginclude_headers = 	\
+	qtgui.i
diff --git a/gr-qtgui/swig/Makefile.swig.gen b/gr-qtgui/swig/Makefile.swig.gen
new file mode 100644
index 000000000..3659601c3
--- /dev/null
+++ b/gr-qtgui/swig/Makefile.swig.gen
@@ -0,0 +1,145 @@
+# -*- Makefile -*-
+#
+# Copyright 2009 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.
+# 
+
+# Makefile.swig.gen for qtgui_swig.i
+
+## Default install locations for these files:
+##
+## Default location for the Python directory is:
+##  ${prefix}/lib/python${python_version}/site-packages/[category]/qtgui_swig
+## Default location for the Python exec directory is:
+##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/qtgui_swig
+##
+## The following can be overloaded to change the install location, but
+## this has to be done in the including Makefile.am -before-
+## Makefile.swig is included.
+
+qtgui_swig_pythondir_category ?= gnuradio/qtgui_swig
+qtgui_swig_pylibdir_category ?= $(qtgui_swig_pythondir_category)
+qtgui_swig_pythondir = $(pythondir)/$(qtgui_swig_pythondir_category)
+qtgui_swig_pylibdir = $(pyexecdir)/$(qtgui_swig_pylibdir_category)
+
+# The .so libraries for the guile modules get installed whereever guile
+# is installed, usually /usr/lib/guile/gnuradio/
+# FIXME: determince whether these should be installed with gnuradio.
+qtgui_swig_scmlibdir = $(libdir)
+
+# The scm files for the guile modules get installed where ever guile
+# is installed, usually /usr/share/guile/site/qtgui_swig
+# FIXME: determince whether these should be installed with gnuradio.
+qtgui_swig_scmdir = $(guiledir)
+
+## SWIG headers are always installed into the same directory.
+
+qtgui_swig_swigincludedir = $(swigincludedir)
+
+## This is a template file for a "generated" Makefile addition (in
+## this case, "Makefile.swig.gen").  By including the top-level
+## Makefile.swig, this file will be used to generate the SWIG
+## dependencies.  Assign the variable TOP_SWIG_FILES to be the list of
+## SWIG .i files to generated wrappings for; there can be more than 1
+## so long as the names are unique (no sorting is done on the
+## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i
+## file will generate .cc, .py, and possibly .h files -- meaning that
+## all of these files will have the same base name (that provided for
+## the SWIG .i file).
+##
+## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the
+## right thing.  For more info, see <
+## http://sources.redhat.com/automake/automake.html#Multiple-Outputs >
+
+## Other cleaned files: dependency files generated by SWIG or this Makefile
+
+MOSTLYCLEANFILES += $(DEPDIR)/*.S*
+
+## Various SWIG variables.  These can be overloaded in the including
+## Makefile.am by setting the variable value there, then including
+## Makefile.swig .
+
+qtgui_swig_swiginclude_HEADERS =		\
+	qtgui_swig.i			\
+	$(qtgui_swig_swiginclude_headers)
+
+if PYTHON
+qtgui_swig_pylib_LTLIBRARIES =		\
+	_qtgui_swig.la
+
+_qtgui_swig_la_SOURCES = 			\
+	python/qtgui_swig.cc		\
+	$(qtgui_swig_la_swig_sources)
+
+qtgui_swig_python_PYTHON =			\
+	qtgui_swig.py			\
+	$(qtgui_swig_python)
+
+_qtgui_swig_la_LIBADD =			\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(qtgui_swig_la_swig_libadd)
+
+_qtgui_swig_la_LDFLAGS =			\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(qtgui_swig_la_swig_ldflags)
+
+_qtgui_swig_la_CXXFLAGS =			\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(qtgui_swig_la_swig_cxxflags)
+
+python/qtgui_swig.cc: qtgui_swig.py
+qtgui_swig.py: qtgui_swig.i
+
+# Include the python dependencies for this file
+-include python/qtgui_swig.d
+
+endif		# end of if python
+
+if GUILE
+
+qtgui_swig_scmlib_LTLIBRARIES = 		\
+	libguile-gnuradio-qtgui_swig.la
+libguile_gnuradio_qtgui_swig_la_SOURCES =	\
+	guile/qtgui_swig.cc			\
+	$(qtgui_swig_la_swig_sources)
+nobase_qtgui_swig_scm_DATA = 		\
+	gnuradio/qtgui_swig.scm 		\
+	gnuradio/qtgui_swig-primitive.scm
+libguile_gnuradio_qtgui_swig_la_LIBADD = 	\
+	$(STD_SWIG_LA_LIB_ADD)		\
+	$(qtgui_swig_la_swig_libadd)
+libguile_gnuradio_qtgui_swig_la_LDFLAGS = 	\
+	$(STD_SWIG_LA_LD_FLAGS)		\
+	$(qtgui_swig_la_swig_ldflags)
+libguile_gnuradio_qtgui_swig_la_CXXFLAGS = 	\
+	$(STD_SWIG_CXX_FLAGS)		\
+	-I$(top_builddir) 		\
+	$(qtgui_swig_la_swig_cxxflags)
+
+guile/qtgui_swig.cc: gnuradio/qtgui_swig.scm
+gnuradio/qtgui_swig.scm: qtgui_swig.i
+gnuradio/qtgui_swig-primitive.scm: gnuradio/qtgui_swig.scm
+
+# Include the guile dependencies for this file
+-include guile/qtgui_swig.d
+
+endif				# end of GUILE
+
+
diff --git a/gr-qtgui/swig/__init__.py b/gr-qtgui/swig/__init__.py
new file mode 100644
index 000000000..3986f2513
--- /dev/null
+++ b/gr-qtgui/swig/__init__.py
@@ -0,0 +1,24 @@
+#
+# Copyright 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.
+# 
+
+# The presence of this file turns this directory into a Python package
+
+from qtgui_swig import *
diff --git a/gr-qtgui/swig/qtgui.i b/gr-qtgui/swig/qtgui.i
new file mode 100644
index 000000000..77c6ccdd7
--- /dev/null
+++ b/gr-qtgui/swig/qtgui.i
@@ -0,0 +1,111 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2008,2009 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_c.h>
+#include <qtgui_sink_f.h>
+%}
+
+GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
+
+qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
+				     double fc=0, double bw=1.0,
+				     const std::string &name="Display",
+				     bool plotfreq=true, bool plotwaterfall=true,
+				     bool plottime=true, bool plotconst=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,
+					      double fc, double bw,
+					      const std::string &name,
+					      bool plotfreq, bool plotwaterfall,
+					      bool plottime, bool plotconst,
+					      QWidget *parent);
+  qtgui_sink_c (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);
+};
+
+
+
+/*********************************************************************/
+
+
+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
new file mode 100644
index 000000000..c250cdd04
--- /dev/null
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -0,0 +1,32 @@
+/* -*- 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_c.h>
+#include <qtgui_sink_f.h>
+%}
+
+%include "qtgui.i"
+
+