From a20c127a9469aeac9ec60bf432c4128c49349f34 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Wed, 3 Nov 2010 20:53:07 -0700 Subject: Generation of python docstrings from doxygen xml. swig_doc.i is a swig interface file containing all the docstrings. It is generated using swig_doc.py and included by gnuradio.i. Minor changes to the swig make files have been made so that the generation of swig_doc.i occurs. --- gr-qtgui/src/lib/Makefile.swig.gen | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index f40f0d881..f4bf06df1 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -107,11 +107,12 @@ qtgui_python_PYTHON = \ ## Entry rule for running SWIG -qtgui.h qtgui.py qtgui.cc: qtgui.i +qtgui.h qtgui.py qtgui.cc: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i ## This rule will get called only when MAKE decides that one of the ## targets needs to be created or re-created, because: ## -## * The .i file is newer than any or all of the generated files; +## * The .i file or the swig_doc.i are newer than any or all of the +## generated files; ## ## * Any or all of the .cc, .h, or .py files does not exist and is ## needed (in the case this file is not needed, the rule for it is -- cgit From 44ad2b33d0b86f0ffe95d025fefa2c774cf80c85 Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 30 Jan 2011 13:36:24 -0700 Subject: Fixed Makefiles to generate swig_doc.i --- gr-qtgui/src/lib/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index 9c4c0b58c..f64fe4334 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -105,7 +105,7 @@ _qtgui_la_CXXFLAGS = \ $(qtgui_la_swig_cxxflags) python/qtgui.cc: qtgui.py -qtgui.py: qtgui.i +qtgui.py: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i # Include the python dependencies for this file -include python/qtgui.d -- cgit From 315f45c234e2fa84fc83641c8404cc5fcdb8412e Mon Sep 17 00:00:00 2001 From: Ben Reynwar Date: Sun, 27 Feb 2011 13:40:48 -0700 Subject: Removing docstring generation from this branch. --- gr-qtgui/src/lib/Makefile.swig.gen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index f64fe4334..b7a0f3c07 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -105,7 +105,7 @@ _qtgui_la_CXXFLAGS = \ $(qtgui_la_swig_cxxflags) python/qtgui.cc: qtgui.py -qtgui.py: qtgui.i $(top_srcdir)/gnuradio-core/src/lib/swig/swig_doc.i +qtgui.py: qtgui.i # Include the python dependencies for this file -include python/qtgui.d -- cgit From 7bad5690d486050fa192e8642bbcbbaa091582a6 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sat, 26 Mar 2011 17:03:54 -0400 Subject: gr-qtgui: adding QA code for qtgui; remarked out until a fix for the segfault can be found. --- gr-qtgui/src/python/.gitignore | 1 + gr-qtgui/src/python/Makefile.am | 21 ++++++++++++------ gr-qtgui/src/python/qa_qtgui.py | 46 ++++++++++++++++++++++++++++++++++++++++ gr-qtgui/src/python/run_tests.in | 10 +++++++++ 4 files changed, 71 insertions(+), 7 deletions(-) create mode 100755 gr-qtgui/src/python/qa_qtgui.py create mode 100644 gr-qtgui/src/python/run_tests.in (limited to 'gr-qtgui') diff --git a/gr-qtgui/src/python/.gitignore b/gr-qtgui/src/python/.gitignore index b336cc7ce..604b402c5 100644 --- a/gr-qtgui/src/python/.gitignore +++ b/gr-qtgui/src/python/.gitignore @@ -1,2 +1,3 @@ /Makefile /Makefile.in +/run_tests diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am index 31df63a44..0953a71e5 100644 --- a/gr-qtgui/src/python/Makefile.am +++ b/gr-qtgui/src/python/Makefile.am @@ -21,18 +21,25 @@ include $(top_srcdir)/Makefile.common +TESTS = +EXTRA_DIST += run_tests.in \ + qt_digital_window.ui + +if PYTHON +TESTS += run_tests +DISTCLEANFILES += run_tests + +qtguipythondir = $(grpythondir)/qtgui + noinst_PYTHON = \ pyqt_example_f.py \ pyqt_example.py \ qt_digital.py \ qt_digital_window.py \ usrp2_display.py \ - usrp_display.py - -EXTRA_DIST += \ - qt_digital_window.ui - -qtguipythondir = $(grpythondir)/qtgui + usrp_display.py \ + qa_qtgui.py -qtguipython_PYTHON = \ +qtguipython_PYTHON = \ __init__.py +endif diff --git a/gr-qtgui/src/python/qa_qtgui.py b/gr-qtgui/src/python/qa_qtgui.py new file mode 100755 index 000000000..fbf0de46e --- /dev/null +++ b/gr-qtgui/src/python/qa_qtgui.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# +# 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. +# + +from gnuradio import gr, gr_unittest +import qtgui +from PyQt4 import QtGui, QtCore +import sys, sip + +class test_qtgui(gr_unittest.TestCase): + + def setUp (self): + self.tb = gr.top_block () + + def tearDown (self): + self.tb = None + + def test01 (self): + pass + # Test to make sure we can instantiate these + #self.qapp = QtGui.QApplication(sys.argv) + #self.qtsnk = qtgui.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS, + # 0, 1, "Test", + # True, True, False, True, True) + + +if __name__ == '__main__': + gr_unittest.run(test_qtgui, "test_qtgui.xml") diff --git a/gr-qtgui/src/python/run_tests.in b/gr-qtgui/src/python/run_tests.in new file mode 100644 index 000000000..909194752 --- /dev/null +++ b/gr-qtgui/src/python/run_tests.in @@ -0,0 +1,10 @@ +#!/bin/sh + +# 1st parameter is absolute path to component source directory +# 2nd parameter is absolute path to component build directory +# 3rd parameter is path to Python QA directory + +@top_builddir@/run_tests.sh \ + @abs_top_srcdir@/gr-qtgui \ + @abs_top_builddir@/gr-qtgui \ + @srcdir@ -- cgit