gr-qtgui: Adding float interface to qtgui_time_sink and example program.

4 files changed, 292 insertions, 0 deletions

diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am
index 517a67097..72b4b1450 100644
--- a/gr-qtgui/lib/Makefile.am
+++ b/gr-qtgui/lib/Makefile.am
@@ -57,6 +57,7 @@ libgnuradio_qtgui_la_SOURCES = 	\
 	qtgui_sink_c.cc				\
 	qtgui_sink_f.cc				\
 	qtgui_time_sink_c.cc			\
+	qtgui_time_sink_f.cc			\
 	qtgui_util.cc
 
 nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES)
@@ -77,6 +78,7 @@ grinclude_HEADERS =			\
 	qtgui_sink_c.h			\
 	qtgui_sink_f.h			\
 	qtgui_time_sink_c.h		\
+	qtgui_time_sink_f.h		\
 	qtgui_util.h
 
 #QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB
diff --git a/gr-qtgui/lib/qtgui_time_sink_c.cc b/gr-qtgui/lib/qtgui_time_sink_c.cc
index c011e8297..f3bc168b2 100644
--- a/gr-qtgui/lib/qtgui_time_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_time_sink_c.cc
@@ -94,6 +94,7 @@ qtgui_time_sink_c::initialize()
 
   // initialize update time to 10 times a second
   set_update_time(0.1);
+  d_last_time = {0,0};
 }
 
 
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.cc b/gr-qtgui/lib/qtgui_time_sink_f.cc
new file mode 100644
index 000000000..056e6e119
--- /dev/null
+++ b/gr-qtgui/lib/qtgui_time_sink_f.cc
@@ -0,0 +1,197 @@
+/* -*- 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <qtgui_time_sink_f.h>
+#include <gr_io_signature.h>
+#include <string.h>
+
+#include <QTimer>
+
+qtgui_time_sink_f_sptr
+qtgui_make_time_sink_f (int size, double bw,
+			const std::string &name,
+			int nconnections,
+			QWidget *parent)
+{
+  return gnuradio::get_initial_sptr(new qtgui_time_sink_f (size, bw, name,
+							   nconnections, parent));
+}
+
+qtgui_time_sink_f::qtgui_time_sink_f (int size, double bw,
+				      const std::string &name,
+				      int nconnections,
+				      QWidget *parent)
+  : gr_block ("time_sink_f",
+	      gr_make_io_signature (nconnections, nconnections, sizeof(float)),
+	      gr_make_io_signature (0, 0, 0)),
+    d_size(size), d_bandwidth(bw), d_name(name),
+    d_nconnections(nconnections), d_parent(parent)
+{
+  d_main_gui = NULL;
+
+  d_index = 0;
+
+  for(int i = 0; i < d_nconnections; i++) {
+    d_residbufs.push_back(new double[d_size]);
+  }
+
+  initialize();
+}
+
+qtgui_time_sink_f::~qtgui_time_sink_f()
+{
+  // d_main_gui is a qwidget destroyed with its parent
+  for(int i = 0; i < d_nconnections; i++) {
+    delete [] d_residbufs[i];
+  }
+}
+
+void
+qtgui_time_sink_f::forecast(int noutput_items, gr_vector_int &ninput_items_required)
+{
+  unsigned int ninputs = ninput_items_required.size();
+  for (unsigned int i = 0; i < ninputs; i++) {
+    ninput_items_required[i] = std::min(d_size, 8191);
+  }
+}
+
+void
+qtgui_time_sink_f::initialize()
+{
+  if(qApp != NULL) {
+    d_qApplication = qApp;
+  }
+  else {
+    int argc=0;
+    char **argv = NULL;
+    d_qApplication = new QApplication(argc, argv);
+  }
+
+  d_main_gui = new TimeDisplayForm(d_nconnections, d_parent);
+
+  // initialize update time to 10 times a second
+  set_update_time(0.1);
+  d_last_time = {0,0};
+}
+
+
+void
+qtgui_time_sink_f::exec_()
+{
+  d_qApplication->exec();
+}
+
+QWidget*
+qtgui_time_sink_f::qwidget()
+{
+  return d_main_gui;
+}
+
+PyObject*
+qtgui_time_sink_f::pyqwidget()
+{
+  PyObject *w = PyLong_FromVoidPtr((void*)d_main_gui);
+  PyObject *retarg = Py_BuildValue("N", w);
+  return retarg;
+}
+
+void
+qtgui_time_sink_f::set_time_domain_axis(double min, double max)
+{
+  d_main_gui->setTimeDomainAxis(min, max);
+}
+
+void
+qtgui_time_sink_f::set_update_time(double t)
+{
+  d_update_time = t;
+  d_main_gui->setUpdateTime(d_update_time);
+}
+
+void
+qtgui_time_sink_f::set_title(int which, const std::string &title)
+{
+  d_main_gui->setTitle(which, title.c_str());
+}
+
+void
+qtgui_time_sink_f::set_color(int which, const std::string &color)
+{
+  d_main_gui->setColor(which, color.c_str());
+}
+
+int
+qtgui_time_sink_f::general_work (int noutput_items,
+				 gr_vector_int &ninput_items,
+				 gr_vector_const_void_star &input_items,
+				 gr_vector_void_star &output_items)
+{
+  int n=0, j=0, idx=0;
+  const float *in = (const float*)input_items[idx];
+
+  for(int i=0; i < noutput_items; i+=d_size) {
+    unsigned int datasize = noutput_items - i;
+    unsigned int resid = d_size-d_index;
+    idx = 0;
+    
+    // If we have enough input for one full plot, do it
+    if(datasize >= resid) {
+      d_current_time = get_highres_clock();
+      
+      // Fill up residbufs with d_size number of items
+      for(n = 0; n < d_nconnections; n++) {
+	in = (const float*)input_items[idx++];
+	for(unsigned int k = 0; k < resid; k++) {
+	  d_residbufs[n][d_index+k] = in[j+k];
+	}
+      }	
+
+      // Update the plot if its time
+      if(diff_timespec(d_current_time, d_last_time) > d_update_time) {
+	d_last_time = d_current_time;
+	d_qApplication->postEvent(d_main_gui,
+				  new TimeUpdateEvent(d_residbufs, d_size));	
+      }
+      
+      d_index = 0;
+      j += resid;
+    }
+    // Otherwise, copy what we received into the residbufs for next time
+    else {
+      for(n = 0; n < d_nconnections; n++) {
+	in = (const float*)input_items[idx++];
+	for(unsigned int k = 0; k < resid; k++) {
+	  d_residbufs[n][d_index+k] = in[j+k];
+	}
+      }
+      d_index += datasize;
+      j += datasize;
+    }
+  }
+  
+  consume_each(j);
+  return j;
+}
diff --git a/gr-qtgui/lib/qtgui_time_sink_f.h b/gr-qtgui/lib/qtgui_time_sink_f.h
new file mode 100644
index 000000000..d77a94ef1
--- /dev/null
+++ b/gr-qtgui/lib/qtgui_time_sink_f.h
@@ -0,0 +1,92 @@
+/* -*- 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_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;
+
+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 qtgui_time_sink_f : public gr_block
+{
+private:
+  friend 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 forecast(int noutput_items, gr_vector_int &ninput_items_required);
+
+  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;
+
+  timespec d_current_time;
+  timespec 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 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_TIME_SINK_F_H */