From 75162ae5263e215ac99daa595b89ea6736a7c6dc Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 21 Apr 2011 19:13:50 -0400 Subject: gr-qtgui: adding .i file for time domain plot and updating Makefiles. --- gr-qtgui/swig/qtgui_time_sink_c.i | 51 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 gr-qtgui/swig/qtgui_time_sink_c.i (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i new file mode 100644 index 000000000..c58834cbb --- /dev/null +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -0,0 +1,51 @@ +/* -*- 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. + */ + +%include "gnuradio.i" + +%{ +#include +%} + +GR_SWIG_BLOCK_MAGIC(qtgui,time_sink_c) + +qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, + const std::string &name, + QWidget *parent); + +class qtgui_time_sink_c : public gr_block +{ +private: + friend qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, + const std::string &name, + QWidget *parent); + qtgui_time_sink_c(int size, double bw, + const std::string &name, + QWidget *parent); + +public: + void exec_(); + PyObject* pyqwidget(); + + void set_time_domain_axis(double min, double max); + void set_update_time(double t); +}; -- cgit From ca8e6096da49c825c14ac05962bb7747f84c2ba6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 23 Apr 2011 11:01:10 -0400 Subject: gr-qtgui: time domain sink now shows and receives updates. --- gr-qtgui/swig/qtgui_time_sink_c.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index c58834cbb..2ac0023ed 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -30,7 +30,7 @@ GR_SWIG_BLOCK_MAGIC(qtgui,time_sink_c) qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, const std::string &name, - QWidget *parent); + QWidget *parent=NULL); class qtgui_time_sink_c : public gr_block { @@ -40,7 +40,7 @@ private: QWidget *parent); qtgui_time_sink_c(int size, double bw, const std::string &name, - QWidget *parent); + QWidget *parent=NULL); public: void exec_(); -- cgit From bbb5e850224aca9dae15d24bd898cc56232327c9 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 23 Apr 2011 12:00:54 -0400 Subject: gr-qtgui: setting up ability to have multiple connections to the time sink. --- gr-qtgui/swig/qtgui_time_sink_c.i | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index 2ac0023ed..6e6491399 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -30,6 +30,7 @@ GR_SWIG_BLOCK_MAGIC(qtgui,time_sink_c) qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, const std::string &name, + int nconnections=1, QWidget *parent=NULL); class qtgui_time_sink_c : public gr_block @@ -37,9 +38,11 @@ class qtgui_time_sink_c : public gr_block private: friend 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); public: -- cgit From e251c885f19281ef918987e09c2aac1af6a952c2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Apr 2011 00:31:39 -0400 Subject: gr-qtgui: provide function and slot for setting the labels of a time curve. --- gr-qtgui/swig/qtgui_time_sink_c.i | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index 6e6491399..e5d4a91df 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -51,4 +51,5 @@ public: void set_time_domain_axis(double min, double max); void set_update_time(double t); + void set_title(int which, const std::string &title); }; -- cgit From 11de76b9214a59930ac8d8c031880b5bd293973d Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Apr 2011 01:47:05 -0400 Subject: gr-qtgui: adding function and slot to set a time display curve's color. --- gr-qtgui/swig/qtgui_time_sink_c.i | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index e5d4a91df..8f5c9f4f0 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -52,4 +52,5 @@ public: 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); }; -- cgit From 97fd10af58ecd4effcf1715eed502836e3c2e1da Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 9 May 2011 12:13:50 +0100 Subject: gr-qtgui: makes time sink a sync_block (since it is) and uses set_output_multiple instead of forecast. The result is that multiple streams maintain constant relationship, which they did not before. This should also prevent us from having to keep so much book-keeping of the indecies, and we will hopefully be able to clean this up soon. --- gr-qtgui/swig/qtgui_time_sink_c.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index 8f5c9f4f0..e7240aa69 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -33,7 +33,7 @@ qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, int nconnections=1, QWidget *parent=NULL); -class qtgui_time_sink_c : public gr_block +class qtgui_time_sink_c : public gr_sync_block { private: friend qtgui_time_sink_c_sptr qtgui_make_time_sink_c(int size, double bw, -- cgit From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future. The sed script was provided by Moritz Fischer. --- gr-qtgui/swig/qtgui_time_sink_c.i | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-qtgui/swig/qtgui_time_sink_c.i') diff --git a/gr-qtgui/swig/qtgui_time_sink_c.i b/gr-qtgui/swig/qtgui_time_sink_c.i index e7240aa69..b78ca5386 100644 --- a/gr-qtgui/swig/qtgui_time_sink_c.i +++ b/gr-qtgui/swig/qtgui_time_sink_c.i @@ -1,19 +1,19 @@ /* -*- 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, @@ -44,7 +44,7 @@ private: const std::string &name, int nconnections, QWidget *parent=NULL); - + public: void exec_(); PyObject* pyqwidget(); -- cgit