diff options
Diffstat (limited to 'gr-qtgui')
| -rw-r--r-- | gr-qtgui/src/lib/.gitignore | 3 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.am | 24 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/Makefile.swig.gen | 214 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/plot_waterfall.h | 2 | ||||
| -rw-r--r-- | gr-qtgui/src/lib/qtgui.i | 9 | ||||
| -rw-r--r-- | gr-qtgui/src/python/Makefile.am | 2 |
6 files changed, 70 insertions, 184 deletions
diff --git a/gr-qtgui/src/lib/.gitignore b/gr-qtgui/src/lib/.gitignore index 11bb4342a..61b9ca8c1 100644 --- a/gr-qtgui/src/lib/.gitignore +++ b/gr-qtgui/src/lib/.gitignore @@ -11,3 +11,6 @@ /spectrumdisplayform.ui.h /FrequencyDisplayPlot.moc.cc /ConstellationDisplayPlot.moc.cc +/gnuradio +/guile +/python diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 1ee3c8e3d..b45b25c9d 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -20,6 +20,9 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +EXTRA_DIST += spectrumdisplayform.ui AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(QT_INCLUDES) $(WITH_INCLUDES) @@ -34,9 +37,7 @@ QMAKE_SOURCES = \ ConstellationDisplayPlot.moc.cc \ spectrumdisplayform.ui.h -EXTRA_DIST = spectrumdisplayform.ui - -BUILT_SOURCES = $(QMAKE_SOURCES) +BUILT_SOURCES += $(QMAKE_SOURCES) # Build the normal library for C++ apps to link against lib_LTLIBRARIES = libgnuradio-qtgui.la @@ -55,7 +56,7 @@ libgnuradio_qtgui_la_SOURCES = \ qtgui_sink_c.cc \ qtgui_sink_f.cc -nodist_libgnuradio_qtgui_la_SOURCES=$(BUILT_SOURCES) +nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES) # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ @@ -88,9 +89,9 @@ libgnuradio_qtgui_la_LIBADD = \ -lstdc++ \ $(QT_LIBS) -if PYTHON + ############################## -# SWIG interface and library +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ qtgui.i @@ -105,14 +106,3 @@ qtgui_pythondir_category = \ # additional libraries for linking with the SWIG-generated library qtgui_la_swig_libadd = \ libgnuradio-qtgui.la - -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES += \ - $(swig_built_sources) -endif - -# Do not distribute built sources, they may contain generated paths -# which are invalid on other systems -no_dist_files = $(BUILT_SOURCES) diff --git a/gr-qtgui/src/lib/Makefile.swig.gen b/gr-qtgui/src/lib/Makefile.swig.gen index f40f0d881..9c4c0b58c 100644 --- a/gr-qtgui/src/lib/Makefile.swig.gen +++ b/gr-qtgui/src/lib/Makefile.swig.gen @@ -38,6 +38,16 @@ qtgui_pylibdir_category ?= $(qtgui_pythondir_category) qtgui_pythondir = $(pythondir)/$(qtgui_pythondir_category) qtgui_pylibdir = $(pyexecdir)/$(qtgui_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_scmlibdir = $(libdir) + +# The scm files for the guile modules get installed where ever guile +# is installed, usually /usr/share/guile/site/qtgui +# FIXME: determince whether these should be installed with gnuradio. +qtgui_scmdir = $(guiledir) + ## SWIG headers are always installed into the same directory. qtgui_swigincludedir = $(swigincludedir) @@ -57,23 +67,10 @@ qtgui_swigincludedir = $(swigincludedir) ## right thing. For more info, see < ## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > -## Stamps used to ensure parallel make does the right thing. These -## are removed by "make clean", but otherwise unused except during the -## parallel built. These will not be included in a tarball, because -## the SWIG-generated files will be removed from the distribution. - -STAMPS += $(DEPDIR)/qtgui-generate-* - ## Other cleaned files: dependency files generated by SWIG or this Makefile MOSTLYCLEANFILES += $(DEPDIR)/*.S* -## Add the .py and .cc files to the list of SWIG built sources. The -## .h file is sometimes built, but not always ... so that one has to -## be added manually by the including Makefile.am . - -swig_built_sources += qtgui.py qtgui.cc - ## Various SWIG variables. These can be overloaded in the including ## Makefile.am by setting the variable value there, then including ## Makefile.swig . @@ -82,13 +79,18 @@ qtgui_swiginclude_HEADERS = \ qtgui.i \ $(qtgui_swiginclude_headers) +if PYTHON qtgui_pylib_LTLIBRARIES = \ _qtgui.la _qtgui_la_SOURCES = \ - qtgui.cc \ + python/qtgui.cc \ $(qtgui_la_swig_sources) +qtgui_python_PYTHON = \ + qtgui.py \ + $(qtgui_python) + _qtgui_la_LIBADD = \ $(STD_SWIG_LA_LIB_ADD) \ $(qtgui_la_swig_libadd) @@ -99,161 +101,45 @@ _qtgui_la_LDFLAGS = \ _qtgui_la_CXXFLAGS = \ $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ $(qtgui_la_swig_cxxflags) -qtgui_python_PYTHON = \ - qtgui.py \ - $(qtgui_python) +python/qtgui.cc: qtgui.py +qtgui.py: qtgui.i -## Entry rule for running SWIG +# Include the python dependencies for this file +-include python/qtgui.d -qtgui.h qtgui.py qtgui.cc: qtgui.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; -## -## * 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 -## ignored); or -## -## * Some SWIG-based dependecy of the .cc file isn't met and hence the -## .cc file needs be be regenerated. Explanation: Because MAKE -## knows how to handle dependencies for .cc files (regardless of -## their name or extension), then the .cc file is used as a target -## instead of the .i file -- but with the dependencies of the .i -## file. It is this last reason why the line: -## -## if test -f $@; then :; else -## -## cannot be used in this case: If a .i file dependecy is not met, -## then the .cc file needs to be rebuilt. But if the stamp is newer -## than the .cc file, and the .cc file exists, then in the original -## version (with the 'test' above) the internal MAKE call will not -## be issued and hence the .cc file will not be rebuilt. -## -## Once execution gets to here, it should always proceed no matter the -## state of a stamp (as discussed in link above). The -## $(DEPDIR)/qtgui-generate stuff is used to allow for parallel -## builds to "do the right thing". The stamp has no relationship with -## either the target files or dependency file; it is used solely for -## the protection of multiple builds during a given call to MAKE. -## -## Catch signals SIGHUP (1), SIGINT (2), SIGPIPE (13), and SIGTERM -## (15). At a caught signal, the quoted command will be issued before -## exiting. In this case, remove any stamp, whether temporary of not. -## The trap is valid until the process exits; the process includes all -## commands appended via "\"s. -## - trap 'rm -rf $(DEPDIR)/qtgui-generate-*' 1 2 13 15; \ -## -## Create a temporary directory, which acts as a lock. The first -## process to create the directory will succeed and issue the MAKE -## command to do the actual work, while all subsequent processes will -## fail -- leading them to wait for the first process to finish. -## - if mkdir $(DEPDIR)/qtgui-generate-lock 2>/dev/null; then \ -## -## This code is being executed by the first process to succeed in -## creating the directory lock. -## -## Remove the stamp associated with this filename. -## - rm -f $(DEPDIR)/qtgui-generate-stamp; \ -## -## Tell MAKE to run the rule for creating this stamp. -## - $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/qtgui-generate-stamp WHAT=$<; \ -## -## Now that the .cc, .h, and .py files have been (re)created from the -## .i file, future checking of this rule during the same MAKE -## execution will come back that the rule doesn't need to be executed -## because none of the conditions mentioned at the start of this rule -## will be positive. Remove the the directory lock, which frees up -## any waiting process(es) to continue. -## - rmdir $(DEPDIR)/qtgui-generate-lock; \ - else \ -## -## This code is being executed by any follower processes while the -## directory lock is in place. -## -## Wait until the first process is done, testing once per second. -## - while test -d $(DEPDIR)/qtgui-generate-lock; do \ - sleep 1; \ - done; \ -## -## Succeed if and only if the first process succeeded; exit this -## process returning the status of the generated stamp. -## - test -f $(DEPDIR)/qtgui-generate-stamp; \ - exit $$?; \ - fi; +endif # end of if python -$(DEPDIR)/qtgui-generate-stamp: -## This rule will be called only by the first process issuing the -## above rule to succeed in creating the lock directory, after -## removing the actual stamp file in order to guarantee that MAKE will -## execute this rule. -## -## Call SWIG to generate the various output files; special -## post-processing on 'mingw32' host OS for the dependency file. -## - if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(qtgui_swig_args) \ - -MD -MF $(DEPDIR)/qtgui.Std \ - -module qtgui -o qtgui.cc $(WHAT); then \ - if test $(host_os) = mingw32; then \ - $(RM) $(DEPDIR)/qtgui.Sd; \ - $(SED) 's,\\\\,/,g' < $(DEPDIR)/qtgui.Std \ - > $(DEPDIR)/qtgui.Sd; \ - $(RM) $(DEPDIR)/qtgui.Std; \ - $(MV) $(DEPDIR)/qtgui.Sd $(DEPDIR)/qtgui.Std; \ - fi; \ - else \ - $(RM) $(DEPDIR)/qtgui.S*; exit 1; \ - fi; -## -## Mess with the SWIG output .Std dependency file, to create a -## dependecy file valid for the input .i file: Basically, simulate the -## dependency file created for libraries by GNU's libtool for C++, -## where all of the dependencies for the target are first listed, then -## each individual dependency is listed as a target with no further -## dependencies. -## -## (1) remove the current dependency file -## - $(RM) $(DEPDIR)/qtgui.d -## -## (2) Copy the whole SWIG file: -## - cp $(DEPDIR)/qtgui.Std $(DEPDIR)/qtgui.d -## -## (3) all a carriage return to the end of the dependency file. -## - echo "" >> $(DEPDIR)/qtgui.d -## -## (4) from the SWIG file, remove the first line (the target); remove -## trailing " \" and " " from each line. Append ":" to each line, -## followed by 2 carriage returns, then append this to the end of -## the dependency file. -## - $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/qtgui.Std | \ - awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/qtgui.d -## -## (5) remove the SWIG-generated file -## - $(RM) $(DEPDIR)/qtgui.Std -## -## Create the stamp for this filename generation, to signal success in -## executing this rule; allows other threads waiting on this process -## to continue. -## - touch $(DEPDIR)/qtgui-generate-stamp +if GUILE + +qtgui_scmlib_LTLIBRARIES = \ + libguile-gnuradio-qtgui.la +libguile_gnuradio_qtgui_la_SOURCES = \ + guile/qtgui.cc \ + $(qtgui_la_swig_sources) +nobase_qtgui_scm_DATA = \ + gnuradio/qtgui.scm \ + gnuradio/qtgui-primitive.scm +libguile_gnuradio_qtgui_la_LIBADD = \ + $(STD_SWIG_LA_LIB_ADD) \ + $(qtgui_la_swig_libadd) +libguile_gnuradio_qtgui_la_LDFLAGS = \ + $(STD_SWIG_LA_LD_FLAGS) \ + $(qtgui_la_swig_ldflags) +libguile_gnuradio_qtgui_la_CXXFLAGS = \ + $(STD_SWIG_CXX_FLAGS) \ + -I$(top_builddir) \ + $(qtgui_la_swig_cxxflags) + +guile/qtgui.cc: gnuradio/qtgui.scm +gnuradio/qtgui.scm: qtgui.i +gnuradio/qtgui-primitive.scm: gnuradio/qtgui.scm + +# Include the guile dependencies for this file +-include guile/qtgui.d -# KLUDGE: Force runtime include of a SWIG dependency file. This is -# not guaranteed to be portable, but will probably work. If it works, -# we have accurate dependencies for our swig stuff, which is good. +endif # end of GUILE -@am__include@ @am__quote@./$(DEPDIR)/qtgui.d@am__quote@ diff --git a/gr-qtgui/src/lib/plot_waterfall.h b/gr-qtgui/src/lib/plot_waterfall.h index 2be677b10..91746e3f3 100644 --- a/gr-qtgui/src/lib/plot_waterfall.h +++ b/gr-qtgui/src/lib/plot_waterfall.h @@ -16,8 +16,6 @@ class QwtColorMap; ( the intensity ) is displayed using colors. The colors are calculated from the values using a color map. - \image html spectrogram3.png - \sa QwtRasterData, QwtColorMap */ diff --git a/gr-qtgui/src/lib/qtgui.i b/gr-qtgui/src/lib/qtgui.i index 1f50bf43c..bb64c6ae2 100644 --- a/gr-qtgui/src/lib/qtgui.i +++ b/gr-qtgui/src/lib/qtgui.i @@ -120,3 +120,12 @@ public: void set_constellation_pen_size(int size); }; +#if SWIGGUILE +%scheme %{ +(load-extension-global "libguile-gnuradio-qtgui" "scm_init_gnuradio_qtgui_module") +%} + +%goops %{ +(use-modules (gnuradio gnuradio_core_runtime)) +%} +#endif diff --git a/gr-qtgui/src/python/Makefile.am b/gr-qtgui/src/python/Makefile.am index 5544748df..31df63a44 100644 --- a/gr-qtgui/src/python/Makefile.am +++ b/gr-qtgui/src/python/Makefile.am @@ -29,7 +29,7 @@ noinst_PYTHON = \ usrp2_display.py \ usrp_display.py -EXTRA_DIST = \ +EXTRA_DIST += \ qt_digital_window.ui qtguipythondir = $(grpythondir)/qtgui |