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

Conflicts: gr-digital/include/digital_constellation.h
author: Josh Blum <josh@joshknows.com> 2011-10-11 21:35:35 -0700
committer: Josh Blum <josh@joshknows.com> 2011-10-11 21:35:35 -0700
commit: 1259a01a9479071bd1729a9c9496444f0a72509b (patch)
tree: 55350454454a119fb230cdbaadfb27d361f191ec /gr-qtgui/lib
parent: 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff)
parent: 06860c309153890a6a42babfbedf230eb24f0042 (diff)
8 files changed, 4 insertions, 507 deletions
diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt
index 6cd9e200a4..3290b1e776 100644
--- a/gr-qtgui/lib/CMakeLists.txt
+++ b/gr-qtgui/lib/CMakeLists.txt
@@ -63,8 +63,7 @@ set(qtgui_srcs
 ########################################################################
 include_directories(
     ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
+    ${GR_QTGUI_INCLUDE_DIRS}
 )
 
 include_directories(${Boost_INCLUDE_DIRS})
@@ -111,10 +110,6 @@ install(FILES
     spectrumdisplayform.h
     SpectrumGUIClass.h
     spectrumUpdateEvents.h
-    qtgui_sink_c.h
-    qtgui_sink_f.h
-    qtgui_util.h
-    gr_qtgui_api.h
     DESTINATION ${GR_INCLUDE_DIR}/gnuradio
     COMPONENT "qtgui_devel"
 )
diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 849ee8360a..b87230b23b 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -24,8 +24,8 @@ include $(top_srcdir)/Makefile.common
 EXTRA_DIST += spectrumdisplayform.ui
 
 AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
-              $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(WITH_INCLUDES) \
-              -Dlibgnuradio_qtgui_EXPORTS
+	$(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GR_QTGUI_INCLUDES) \
+	$(WITH_INCLUDES) -Dlibgnuradio_qtgui_EXPORTS
 
 # Only include these files in the build if qtgui passes configure checks
 # This is mostly to help make distcheck pass
@@ -74,13 +74,7 @@ grinclude_HEADERS =			\
 	spectrumdisplayform.h		\
 	timedisplayform.h		\
 	SpectrumGUIClass.h		\
-	spectrumUpdateEvents.h		\
-	gr_qtgui_api.h			\
-	qtgui_sink_c.h			\
-	qtgui_sink_f.h			\
-	qtgui_time_sink_c.h		\
-	qtgui_time_sink_f.h		\
-	qtgui_util.h
+	spectrumUpdateEvents.h
 
 #QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
 QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
diff --git a/gr-qtgui/lib/gr_qtgui_api.h b/gr-qtgui/lib/gr_qtgui_api.h
deleted file mode 100644
index 65033a0933..0000000000
--- a/gr-qtgui/lib/gr_qtgui_api.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2010 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.
- */
-
-#ifndef INCLUDED_GR_QTGUI_API_H
-#define INCLUDED_GR_QTGUI_API_H
-
-#include <gruel/attributes.h>
-
-#ifdef libgnuradio_qtgui_EXPORTS
-#  define GR_QTGUI_API __GR_ATTR_EXPORT
-#else
-#  define GR_QTGUI_API __GR_ATTR_IMPORT
-#endif
-
-#endif /* INCLUDED_GR_QTGUI_API_H */
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/lib/qtgui_sink_c.h
deleted file mode 100644
index b0946885cc..0000000000
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* -*- 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.
- */
-
-#ifndef INCLUDED_QTGUI_SINK_C_H
-#define INCLUDED_QTGUI_SINK_C_H
-
-#include <Python.h>
-#include <gr_qtgui_api.h>
-#include <gr_block.h>
-#include <gr_firdes.h>
-#include <gri_fft.h>
-#include <qapplication.h>
-#include "SpectrumGUIClass.h"
-
-class qtgui_sink_c;
-typedef boost::shared_ptr<qtgui_sink_c> qtgui_sink_c_sptr;
-
-GR_QTGUI_API qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
-				     double fc=0, double bandwidth=1.0,
-				     const std::string &name="Spectrum Display",
-				     bool plotfreq=true, bool plotwaterfall=true,
-				     bool plottime=true, bool plotconst=true,
-				     QWidget *parent=NULL);
-
-class GR_QTGUI_API qtgui_sink_c : public gr_block
-{
-private:
-  friend GR_QTGUI_API 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);
-
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
-  void initialize();
-
-  int d_fftsize;
-  gr_firdes::win_type d_wintype;
-  std::vector<float> d_window;
-  double d_center_freq;
-  double d_bandwidth;
-  std::string d_name;
-  
-  bool d_shift;
-  gri_fft_complex *d_fft;
-
-  int d_index;
-  gr_complex *d_residbuf;
-
-  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);
-  
-public:
-  ~qtgui_sink_c();
-  void exec_();
-  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;
-
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_QTGUI_SINK_C_H */
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/lib/qtgui_sink_f.h
deleted file mode 100644
index 30db05eea0..0000000000
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- 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.
- */
-
-#ifndef INCLUDED_QTGUI_SINK_F_H
-#define INCLUDED_QTGUI_SINK_F_H
-
-#include <Python.h>
-#include <gr_qtgui_api.h>
-#include <gr_block.h>
-#include <gr_firdes.h>
-#include <gri_fft.h>
-#include <qapplication.h>
-//#include <qtgui.h>
-#include "SpectrumGUIClass.h"
-
-class qtgui_sink_f;
-typedef boost::shared_ptr<qtgui_sink_f> qtgui_sink_f_sptr;
-
-GR_QTGUI_API qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
-				     double fc=0, double bw=1.0,
-				     const std::string &name="Spectrum Display",
-				     bool plotfreq=true, bool plotwaterfall=true,
-				     bool plottime=true, bool plotconst=true,
-				     QWidget *parent=NULL);
-
-class GR_QTGUI_API qtgui_sink_f : public gr_block
-{
-private:
-  friend GR_QTGUI_API 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);
-
-  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
-
-  void initialize();
-
-  int d_fftsize;
-  gr_firdes::win_type d_wintype;
-  std::vector<float> d_window;
-  double d_center_freq;
-  double d_bandwidth;
-  std::string d_name;
-  
-  bool d_shift;
-  gri_fft_complex *d_fft;
-
-  int d_index;
-  float *d_residbuf;
-
-  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 float *data_in, int size);
-  
-public:
-  ~qtgui_sink_f();
-  void exec_();
-  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;
-
-  int general_work (int noutput_items,
-		    gr_vector_int &ninput_items,
-		    gr_vector_const_void_star &input_items,
-		    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_QTGUI_SINK_F_H */
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.h b/gr-qtgui/lib/qtgui_time_sink_c.h
deleted file mode 100644
index 51d5ad1833..0000000000
--- a/gr-qtgui/lib/qtgui_time_sink_c.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * 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.
- */
-
-#ifndef INCLUDED_QTGUI_TIME_SINK_C_H
-#define INCLUDED_QTGUI_TIME_SINK_C_H
-
-#include <Python.h>
-#include <gr_qtgui_api.h>
-#include <gr_sync_block.h>
-#include <gr_firdes.h>
-#include <gri_fft.h>
-#include <qapplication.h>
-#include <timedisplayform.h>
-
-class qtgui_time_sink_c;
-typedef boost::shared_ptr<qtgui_time_sink_c> qtgui_time_sink_c_sptr;
-
-GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
-							   const std::string &name,
-							   int nconnectons=1,
-							   QWidget *parent=NULL);
-
-class GR_QTGUI_API qtgui_time_sink_c : public gr_sync_block
-{
-private:
-  friend GR_QTGUI_API qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw,
-								    const std::string &name,
-								    int nconnections,
-								    QWidget *parent);
-  qtgui_time_sink_c(int size, double bw,
-		    const std::string &name,
-		    int nconnections,
-		    QWidget *parent=NULL);
-  
-  void initialize();
-
-  int d_size;
-  double d_bandwidth;
-  std::string d_name;
-  int d_nconnections;
-
-  int d_index;
-  std::vector<double*> d_residbufs;
-
-  double d_update_time;
-
-  QWidget *d_parent;
-  TimeDisplayForm *d_main_gui;
-
-  gruel::high_res_timer_type d_current_time;
-  gruel::high_res_timer_type d_last_time;
-
-public:
-  ~qtgui_time_sink_c();
-  void exec_();
-  QWidget*  qwidget();
-  PyObject* pyqwidget();
-
-  void set_time_domain_axis(double min, double max);
-  void set_update_time(double t);
-  void set_title(int which, const std::string &title);
-  void set_color(int which, const std::string &color);
-
-  QApplication *d_qApplication;
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_QTGUI_TIME_SINK_C_H */
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h
deleted file mode 100644
index a69d328772..0000000000
--- a/gr-qtgui/lib/qtgui_time_sink_f.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- c++ -*- */
-/*
- * 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.
- */
-
-#ifndef INCLUDED_QTGUI_TIME_SINK_F_H
-#define INCLUDED_QTGUI_TIME_SINK_F_H
-
-#include <Python.h>
-#include <gr_qtgui_api.h>
-#include <gr_sync_block.h>
-#include <gr_firdes.h>
-#include <gri_fft.h>
-#include <qapplication.h>
-#include <timedisplayform.h>
-
-class qtgui_time_sink_f;
-typedef boost::shared_ptr<qtgui_time_sink_f> qtgui_time_sink_f_sptr;
-
-GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
-					      const std::string &name,
-					      int nconnectons=1,
-					      QWidget *parent=NULL);
-
-class GR_QTGUI_API qtgui_time_sink_f : public gr_sync_block
-{
-private:
-  friend GR_QTGUI_API qtgui_time_sink_f_sptr qtgui_make_time_sink_f(int size, double bw,
-						       const std::string &name,
-						       int nconnections,
-						       QWidget *parent);
-  qtgui_time_sink_f(int size, double bw,
-		    const std::string &name,
-		    int nconnections,
-		    QWidget *parent=NULL);
-  
-  void initialize();
-
-  int d_size;
-  double d_bandwidth;
-  std::string d_name;
-  int d_nconnections;
-
-  int d_index;
-  std::vector<double*> d_residbufs;
-
-  double d_update_time;
-
-  QWidget *d_parent;
-  TimeDisplayForm *d_main_gui;
-
-  gruel::high_res_timer_type d_current_time;
-  gruel::high_res_timer_type d_last_time;
-
-public:
-  ~qtgui_time_sink_f();
-  void exec_();
-  QWidget*  qwidget();
-  PyObject* pyqwidget();
-
-  void set_time_domain_axis(double min, double max);
-  void set_update_time(double t);
-  void set_title(int which, const std::string &title);
-  void set_color(int which, const std::string &color);
-
-  QApplication *d_qApplication;
-
-  int work (int noutput_items,
-	    gr_vector_const_void_star &input_items,
-	    gr_vector_void_star &output_items);
-};
-
-#endif /* INCLUDED_QTGUI_TIME_SINK_F_H */
diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/lib/qtgui_util.h
deleted file mode 100644
index 5b129c7b56..0000000000
--- a/gr-qtgui/lib/qtgui_util.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- c++ -*- */
-/*
- * 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.
- */
-
-#ifndef INCLUDED_QTGUI_UTIL_H
-#define INCLUDED_QTGUI_UTIL_H
-
-#include <qevent.h>
-#include <gr_qtgui_api.h>
-#include <qwt_plot_picker.h>
-#include <qwt_picker_machine.h>
-
-
-class GR_QTGUI_API QwtDblClickPlotPicker: public QwtPlotPicker
-{
-public:
-    QwtDblClickPlotPicker(QwtPlotCanvas *);
-    ~QwtDblClickPlotPicker();
-
-    virtual QwtPickerMachine * stateMachine(int) const;
-};
-
-class GR_QTGUI_API QwtPickerDblClickPointMachine: public QwtPickerMachine
-{
-public:
-  QwtPickerDblClickPointMachine();
-  ~QwtPickerDblClickPointMachine();
-  
-  virtual CommandList transition( const QwtEventPattern &eventPattern, const QEvent *e);
-};
-
-#endif /* INCLUDED_QTGUI_UTIL_H */
author	Josh Blum <josh@joshknows.com>	2011-10-11 21:35:35 -0700
committer	Josh Blum <josh@joshknows.com>	2011-10-11 21:35:35 -0700
commit	1259a01a9479071bd1729a9c9496444f0a72509b (patch)
tree	55350454454a119fb230cdbaadfb27d361f191ec /gr-qtgui/lib
parent	71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff)
parent	06860c309153890a6a42babfbedf230eb24f0042 (diff)