diff options
Diffstat (limited to 'gr-qtgui')
85 files changed, 268 insertions, 269 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 74d16462cb..b3a0271b44 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -107,7 +107,7 @@ CPACK_COMPONENT("qtgui_swig" ######################################################################## # Add subdirectories ######################################################################## -add_subdirectory(include/qtgui) +add_subdirectory(include/gnuradio/qtgui) add_subdirectory(lib) add_subdirectory(doc) if(ENABLE_PYTHON) diff --git a/gr-qtgui/include/qtgui/CMakeLists.txt b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt index 8f95837fec..8f95837fec 100644 --- a/gr-qtgui/include/qtgui/CMakeLists.txt +++ b/gr-qtgui/include/gnuradio/qtgui/CMakeLists.txt diff --git a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h index 041e72d45f..52a74b6d40 100644 --- a/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/ConstellationDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying constellaton (I&Q) plots. diff --git a/gr-qtgui/include/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h index aee9ce5880..bafc712aac 100644 --- a/gr-qtgui/include/qtgui/DisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h @@ -37,7 +37,7 @@ #include <qwt_plot_magnifier.h> #include <qwt_plot_marker.h> #include <qwt_symbol.h> -#include <qtgui/utils.h> +#include <gnuradio/qtgui/utils.h> #if QWT_VERSION >= 0x060000 #include <qwt_compat.h> diff --git a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h index a835e7de08..220dcd7546 100644 --- a/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/FrequencyDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying frequency domain (PSD) plots. diff --git a/gr-qtgui/include/qtgui/SpectrumGUIClass.h b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h index ebe08bdb85..f95ab6477a 100644 --- a/gr-qtgui/include/qtgui/SpectrumGUIClass.h +++ b/gr-qtgui/include/gnuradio/qtgui/SpectrumGUIClass.h @@ -23,15 +23,15 @@ #ifndef SPECTRUM_GUI_CLASS_HPP #define SPECTRUM_GUI_CLASS_HPP -#include <thread/thread.h> +#include <gnuradio/thread/thread.h> #include <qwidget.h> #include <qapplication.h> #include <qlabel.h> #include <qslider.h> -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> class SpectrumDisplayForm; -#include <qtgui/spectrumdisplayform.h> +#include <gnuradio/qtgui/spectrumdisplayform.h> #include <cmath> diff --git a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h index 4f1883a1cf..1ef5ddd85c 100644 --- a/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeDomainDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> /*! * \brief QWidget for displaying time domain plots. diff --git a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h index 9d89e0ffa4..f22028c3c9 100644 --- a/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h @@ -27,13 +27,13 @@ #include <cstdio> #include <vector> #include <qwt_plot_rasteritem.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/timeRasterGlobalData.h> -#include <qtgui/plot_raster.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/timeRasterGlobalData.h> +#include <gnuradio/qtgui/plot_raster.h> +#include <gnuradio/high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <qtgui/plot_waterfall.h> +#include <gnuradio/qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h index a31c5b9b21..62ea41a87c 100644 --- a/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h @@ -27,12 +27,12 @@ #include <cstdio> #include <vector> #include <qwt_plot_spectrogram.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/waterfallGlobalData.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> +#include <gnuradio/high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <qtgui/plot_waterfall.h> +#include <gnuradio/qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/include/qtgui/api.h b/gr-qtgui/include/gnuradio/qtgui/api.h index 888dd656c8..0a05544842 100644 --- a/gr-qtgui/include/qtgui/api.h +++ b/gr-qtgui/include/gnuradio/qtgui/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_QTGUI_API_H #define INCLUDED_QTGUI_API_H -#include <attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_qtgui_EXPORTS # define QTGUI_API __GR_ATTR_EXPORT diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index ee92d6fe22..d430b6ffdd 100644 --- a/gr-qtgui/include/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -24,10 +24,10 @@ #define INCLUDED_QTGUI_CONST_SINK_C_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { @@ -41,7 +41,7 @@ namespace gr { * This is a QT-based graphical sink the takes set of a complex * streams and plots them on an IQ constellation plot. */ - class QTGUI_API const_sink_c : virtual public gr_sync_block + class QTGUI_API const_sink_c : virtual public sync_block { public: // gr::qtgui::const_sink_c::sptr diff --git a/gr-qtgui/include/qtgui/constellationdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h index 48c70beaed..8e04218ed0 100644 --- a/gr-qtgui/include/qtgui/constellationdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/constellationdisplayform.h @@ -23,12 +23,12 @@ #ifndef CONSTELLATION_DISPLAY_FORM_H #define CONSTELLATION_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing constellaton (I&Q) plots. diff --git a/gr-qtgui/include/qtgui/displayform.h b/gr-qtgui/include/gnuradio/qtgui/displayform.h index ac7ee9bf8d..df0d5a94d6 100644 --- a/gr-qtgui/include/qtgui/displayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h @@ -23,15 +23,15 @@ #ifndef DISPLAY_FORM_H #define DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> #include <qwt_plot_grid.h> #include <qwt_plot_layout.h> -#include <qtgui/DisplayPlot.h> -#include <qtgui/form_menus.h> +#include <gnuradio/qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/form_menus.h> /*! * \brief Base class for setting up and managing QTGUI plot forms. diff --git a/gr-qtgui/include/qtgui/form_menus.h b/gr-qtgui/include/gnuradio/qtgui/form_menus.h index 7f5b8ae6e7..1158f337a2 100644 --- a/gr-qtgui/include/qtgui/form_menus.h +++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h @@ -27,8 +27,8 @@ #include <vector> #include <QtGui/QtGui> #include <qwt_symbol.h> -#include <filter/firdes.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/qtgui/qtgui_types.h> class LineColorMenu: public QMenu { diff --git a/gr-qtgui/include/qtgui/freq_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h index c0b053060c..667ee95e18 100644 --- a/gr-qtgui/include/qtgui/freq_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_c.h @@ -24,10 +24,10 @@ #define INCLUDED_QTGUI_FREQ_SINK_C_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { @@ -44,7 +44,7 @@ namespace gr { * functions can be used to change the lable and color for a given * input number. */ - class QTGUI_API freq_sink_c : virtual public gr_sync_block + class QTGUI_API freq_sink_c : virtual public sync_block { public: // gr::qtgui::freq_sink_c::sptr @@ -54,7 +54,7 @@ namespace gr { * \brief Build a complex PSD sink. * * \param fftsize size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/freq_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h index 501c377483..77e9159fe3 100644 --- a/gr-qtgui/include/qtgui/freq_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/freq_sink_f.h @@ -24,10 +24,10 @@ #define INCLUDED_QTGUI_FREQ_SINK_F_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { @@ -44,7 +44,7 @@ namespace gr { * functions can be used to change the lable and color for a given * input number. */ - class QTGUI_API freq_sink_f : virtual public gr_sync_block + class QTGUI_API freq_sink_f : virtual public sync_block { public: // gr::qtgui::freq_sink_f::sptr @@ -54,7 +54,7 @@ namespace gr { * \brief Build a floating point PSD sink. * * \param fftsize size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/freqdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h index e54b507993..48dd1a6377 100644 --- a/gr-qtgui/include/qtgui/freqdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/freqdisplayform.h @@ -23,13 +23,13 @@ #ifndef FREQ_DISPLAY_FORM_H #define FREQ_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing frequency (PSD) plots. diff --git a/gr-qtgui/include/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h index 2a5159e00e..6352e9f0db 100644 --- a/gr-qtgui/include/qtgui/plot_raster.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h @@ -24,7 +24,7 @@ #define PLOT_TIMERASTER_H #include <qglobal.h> -#include <qtgui/timeRasterGlobalData.h> +#include <gnuradio/qtgui/timeRasterGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/include/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h index ed8edbbd0c..bd550ec676 100644 --- a/gr-qtgui/include/qtgui/plot_waterfall.h +++ b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h @@ -24,7 +24,7 @@ #define PLOT_WATERFALL_H #include <qglobal.h> -#include <qtgui/waterfallGlobalData.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/include/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h index 135350dbb8..f71ab9eda3 100644 --- a/gr-qtgui/include/qtgui/qtgui_types.h +++ b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h @@ -25,7 +25,7 @@ #include <qwt_color_map.h> #include <qwt_scale_draw.h> -#include <high_res_timer.h> +#include <gnuradio/high_res_timer.h> class FreqOffsetAndPrecisionClass { diff --git a/gr-qtgui/include/qtgui/sink_c.h b/gr-qtgui/include/gnuradio/qtgui/sink_c.h index 8d8a1e97ab..9b30e74c95 100644 --- a/gr-qtgui/include/qtgui/sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_c.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_SINK_C_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/block.h> #include <qapplication.h> #include <qwt_symbol.h> @@ -46,7 +46,7 @@ namespace gr { * appropriate boolean value in the constructor to False. */ - class QTGUI_API sink_c : virtual public gr_block + class QTGUI_API sink_c : virtual public block { public: // gr::qtgui::sink_c::sptr @@ -56,7 +56,7 @@ namespace gr { * \brief Build a complex qtgui sink. * * \param fftsize size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/sink_f.h b/gr-qtgui/include/gnuradio/qtgui/sink_f.h index 6a7783db50..99e499421b 100644 --- a/gr-qtgui/include/qtgui/sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/sink_f.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_SINK_F_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/block.h> #include <qapplication.h> #include <qwt_symbol.h> @@ -46,7 +46,7 @@ namespace gr { * constructor to False. */ - class QTGUI_API sink_f : virtual public gr_block + class QTGUI_API sink_f : virtual public block { public: // gr::qtgui::sink_f::sptr @@ -56,7 +56,7 @@ namespace gr { * \brief Build a floating point qtgui sink. * * \param fftsize size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h index df61f7fdb2..361610d095 100644 --- a/gr-qtgui/include/qtgui/spectrumUpdateEvents.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumUpdateEvents.h @@ -28,7 +28,7 @@ #include <QString> #include <complex> #include <vector> -#include <high_res_timer.h> +#include <gnuradio/high_res_timer.h> static const int SpectrumUpdateEventType = 10005; static const int SpectrumWindowCaptionEventType = 10008; diff --git a/gr-qtgui/include/qtgui/spectrumdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h index 37a481245c..6b43661cb4 100644 --- a/gr-qtgui/include/qtgui/spectrumdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/spectrumdisplayform.h @@ -26,13 +26,13 @@ #include <spectrumdisplayform.ui.h> class SpectrumGUIClass; -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> -#include <qtgui/SpectrumGUIClass.h> -#include <qtgui/FrequencyDisplayPlot.h> -#include <qtgui/WaterfallDisplayPlot.h> -#include <qtgui/TimeDomainDisplayPlot.h> -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <QValidator> #include <QTimer> #include <vector> diff --git a/gr-qtgui/include/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h index 0a414432d1..0a414432d1 100644 --- a/gr-qtgui/include/qtgui/timeRasterGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h diff --git a/gr-qtgui/include/qtgui/time_raster_sink_b.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h index 083a6a2d24..22130e56aa 100644 --- a/gr-qtgui/include/qtgui/time_raster_sink_b.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_b.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> #include <qwt_symbol.h> @@ -46,7 +46,7 @@ namespace gr { * byte). It will display packed bytes but the display will have * to be autoscaled. */ - class QTGUI_API time_raster_sink_b : virtual public gr_sync_block + class QTGUI_API time_raster_sink_b : virtual public sync_block { public: // gr::qtgui::time_raster_sink_b::sptr diff --git a/gr-qtgui/include/qtgui/time_raster_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h index 07deb25fc0..5a82587074 100644 --- a/gr-qtgui/include/qtgui/time_raster_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_raster_sink_f.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> #include <qwt_symbol.h> @@ -43,7 +43,7 @@ namespace gr { * point streams and plots a time_raster (spectrogram) plot. * */ - class QTGUI_API time_raster_sink_f : virtual public gr_sync_block + class QTGUI_API time_raster_sink_f : virtual public sync_block { public: // gr::qtgui::time_raster_sink_f::sptr diff --git a/gr-qtgui/include/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index d3234b94bb..8563cf5cd1 100644 --- a/gr-qtgui/include/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_TIME_SINK_C_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> namespace gr { @@ -44,7 +44,7 @@ namespace gr { * functions can be used to change the lable and color for a given * input number. */ - class QTGUI_API time_sink_c : virtual public gr_sync_block + class QTGUI_API time_sink_c : virtual public sync_block { public: // gr::qtgui::time_sink_c::sptr diff --git a/gr-qtgui/include/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index cf0df05337..f9457f7a72 100644 --- a/gr-qtgui/include/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -24,8 +24,8 @@ #define INCLUDED_QTGUI_TIME_SINK_F_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> namespace gr { @@ -42,7 +42,7 @@ namespace gr { * different color, and the \a set_title and \a set_color functions * can be used to change the lable and color for a given input number. */ - class QTGUI_API time_sink_f : virtual public gr_sync_block + class QTGUI_API time_sink_f : virtual public sync_block { public: // gr::qtgui::time_sink_f::sptr diff --git a/gr-qtgui/include/qtgui/timedisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h index 4e216abb0c..07118a4baa 100644 --- a/gr-qtgui/include/qtgui/timedisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h @@ -23,12 +23,12 @@ #ifndef TIME_DISPLAY_FORM_H #define TIME_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing time domain plots. diff --git a/gr-qtgui/include/qtgui/timerasterdisplayform.h b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h index 7d6af9f5dd..24933c3c05 100644 --- a/gr-qtgui/include/qtgui/timerasterdisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/timerasterdisplayform.h @@ -23,13 +23,13 @@ #ifndef TIMERASTER_DISPLAY_FORM_H #define TIMERASTER_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/TimeRasterDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/TimeRasterDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing time raster plots. diff --git a/gr-qtgui/include/qtgui/utils.h b/gr-qtgui/include/gnuradio/qtgui/utils.h index f490c48567..c4271288fa 100644 --- a/gr-qtgui/include/qtgui/utils.h +++ b/gr-qtgui/include/gnuradio/qtgui/utils.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_UTILS_H #include <qevent.h> -#include <qtgui/api.h> +#include <gnuradio/qtgui/api.h> #include <qwt_plot_picker.h> #include <qwt_picker_machine.h> diff --git a/gr-qtgui/include/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h index 8ab9590d0b..8ab9590d0b 100644 --- a/gr-qtgui/include/qtgui/waterfallGlobalData.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h diff --git a/gr-qtgui/include/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 060c0f14b6..74b94bb4b4 100644 --- a/gr-qtgui/include/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -24,10 +24,10 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_C_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { @@ -50,7 +50,7 @@ namespace gr { * here, it's probably best to sum the signals together and * connect that here. */ - class QTGUI_API waterfall_sink_c : virtual public gr_sync_block + class QTGUI_API waterfall_sink_c : virtual public sync_block { public: // gr::qtgui::waterfall_sink_c::sptr @@ -61,7 +61,7 @@ namespace gr { * \brief Build a complex waterfall sink. * * \param size size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index a550d3d2d2..8b6fce2651 100644 --- a/gr-qtgui/include/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -24,10 +24,10 @@ #define INCLUDED_QTGUI_WATERFALL_SINK_F_H #include <Python.h> -#include <qtgui/api.h> -#include <gr_sync_block.h> +#include <gnuradio/qtgui/api.h> +#include <gnuradio/sync_block.h> #include <qapplication.h> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> namespace gr { namespace qtgui { @@ -50,7 +50,7 @@ namespace gr { * here, it's probably best to sum the signals together and * connect that here. */ - class QTGUI_API waterfall_sink_f : virtual public gr_sync_block + class QTGUI_API waterfall_sink_f : virtual public sync_block { public: // gr::qtgui::waterfall_sink_f::sptr @@ -60,7 +60,7 @@ namespace gr { * \brief Build a floating point waterfall sink. * * \param size size of the FFT to compute and display - * \param wintype type of window to apply (see filter/firdes.h) + * \param wintype type of window to apply (see gnuradio/filter/firdes.h) * \param fc center frequency of signal (use for x-axis labels) * \param bw bandwidth of signal (used to set x-axis labels) * \param name title for the plot diff --git a/gr-qtgui/include/qtgui/waterfalldisplayform.h b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h index 00e678bd0c..8d78bb015a 100644 --- a/gr-qtgui/include/qtgui/waterfalldisplayform.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfalldisplayform.h @@ -23,13 +23,13 @@ #ifndef WATERFALL_DISPLAY_FORM_H #define WATERFALL_DISPLAY_FORM_H -#include <qtgui/spectrumUpdateEvents.h> -#include <qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include <filter/firdes.h> +#include <gnuradio/filter/firdes.h> -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> /*! * \brief DisplayForm child for managing waterfall (spectrogram) plots. diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index 7114c6c390..2df8b31555 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -20,7 +20,7 @@ ######################################################################## # Setup the QT file generations stuff ######################################################################## -set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui) +set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/qtgui) set(qtgui_moc_hdrs ${qtgui_mod_includedir}/spectrumdisplayform.h ${qtgui_mod_includedir}/displayform.h diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index 7e2f11e6d6..f483867776 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc @@ -23,7 +23,7 @@ #ifndef CONSTELLATION_DISPLAY_PLOT_C #define CONSTELLATION_DISPLAY_PLOT_C -#include <qtgui/ConstellationDisplayPlot.h> +#include <gnuradio/qtgui/ConstellationDisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/DisplayPlot.cc b/gr-qtgui/lib/DisplayPlot.cc index 227cf9cc9e..3fe16f68bd 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/DisplayPlot.h> +#include <gnuradio/qtgui/DisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index 56e63100c7..087a176d5e 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef FREQUENCY_DISPLAY_PLOT_C #define FREQUENCY_DISPLAY_PLOT_C -#include <qtgui/FrequencyDisplayPlot.h> +#include <gnuradio/qtgui/FrequencyDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> #include <qwt_legend_item.h> diff --git a/gr-qtgui/lib/SpectrumGUIClass.cc b/gr-qtgui/lib/SpectrumGUIClass.cc index 020cd8218a..c0c78dad14 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.cc +++ b/gr-qtgui/lib/SpectrumGUIClass.cc @@ -23,7 +23,7 @@ #ifndef SPECTRUM_GUI_CLASS_CPP #define SPECTRUM_GUI_CLASS_CPP -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> //Added by qt3to4: #include <QEvent> #include <QCustomEvent> diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 13e24c2a97..a7e6a821bc 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -23,7 +23,7 @@ #ifndef TIME_DOMAIN_DISPLAY_PLOT_C #define TIME_DOMAIN_DISPLAY_PLOT_C -#include <qtgui/TimeDomainDisplayPlot.h> +#include <gnuradio/qtgui/TimeDomainDisplayPlot.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc index 66b38c52f2..89e32cab9c 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc +++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef TIMERASTER_DISPLAY_PLOT_C #define TIMERASTER_DISPLAY_PLOT_C -#include <qtgui/TimeRasterDisplayPlot.h> +#include <gnuradio/qtgui/TimeRasterDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index aa78000741..0e38808b94 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -23,9 +23,9 @@ #ifndef WATERFALL_DISPLAY_PLOT_C #define WATERFALL_DISPLAY_PLOT_C -#include <qtgui/WaterfallDisplayPlot.h> +#include <gnuradio/qtgui/WaterfallDisplayPlot.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/qtgui_types.h> #include <qwt_color_map.h> #include <qwt_scale_draw.h> #include <qwt_legend.h> diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 9064be4ebe..33e0cc5a22 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -25,10 +25,10 @@ #endif #include "const_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("const_sink_c", - gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("const_sink_c", + io_signature::make(nconnections, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_size(size), d_name(name), d_nconnections(nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 02b25409e6..fb9481fb15 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_CONST_SINK_C_IMPL_H #define INCLUDED_QTGUI_CONST_SINK_C_IMPL_H -#include <qtgui/const_sink_c.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/constellationdisplayform.h> +#include <gnuradio/qtgui/const_sink_c.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/constellationdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index bfd17b9c11..52691ee67a 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/constellationdisplayform.h> +#include <gnuradio/qtgui/constellationdisplayform.h> #include <iostream> ConstellationDisplayForm::ConstellationDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc index 3439db31ee..ecc878b0a8 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/displayform.h> +#include <gnuradio/qtgui/displayform.h> #include <iostream> #include <QPixmap> #include <QFileDialog> diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 4508750457..b0646904cf 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "freq_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("freq_sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("freq_sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index ef17079567..06ae4f80f3 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_FREQ_SINK_C_IMPL_H #define INCLUDED_QTGUI_FREQ_SINK_C_IMPL_H -#include <qtgui/freq_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freq_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 6028c8ec4e..2f9f1956f3 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "freq_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("freq_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("freq_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index 6f4d9d2062..a5bdc3c076 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_FREQ_SINK_F_IMPL_H #define INCLUDED_QTGUI_FREQ_SINK_F_IMPL_H -#include <qtgui/freq_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freq_sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index adcc09dc4b..948d845895 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/freqdisplayform.h> +#include <gnuradio/qtgui/freqdisplayform.h> #include <iostream> FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc index 6d31a2596c..62eac5e13f 100644 --- a/gr-qtgui/lib/plot_raster.cc +++ b/gr-qtgui/lib/plot_raster.cc @@ -27,7 +27,7 @@ #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <qtgui/plot_raster.h> +#include <gnuradio/qtgui/plot_raster.h> #if QWT_VERSION < 0x060000 #include "qwt_double_interval.h" diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index 5a378767be..b96d573e3d 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -26,7 +26,7 @@ #include "qwt_painter.h" #include "qwt_scale_map.h" #include "qwt_color_map.h" -#include <qtgui/plot_waterfall.h> +#include <gnuradio/qtgui/plot_waterfall.h> #if QWT_VERSION < 0x060000 #include "qwt_double_interval.h" diff --git a/gr-qtgui/lib/qtgui_util.cc b/gr-qtgui/lib/qtgui_util.cc index 70dcb483fb..539f7bac8f 100644 --- a/gr-qtgui/lib/qtgui_util.cc +++ b/gr-qtgui/lib/qtgui_util.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <qtgui/utils.h> +#include <gnuradio/qtgui/utils.h> #include <QDebug> QwtPickerDblClickPointMachine::QwtPickerDblClickPointMachine() diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index aab5be54bf..b33853482d 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -54,9 +54,9 @@ namespace gr { bool plotfreq, bool plotwaterfall, bool plottime, bool plotconst, QWidget *parent) - : gr_block("sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : block("sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index 77ddf79a0e..ce4bbac11b 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_QTGUI_SINK_C_IMPL_H #define INCLUDED_QTGUI_SINK_C_IMPL_H -#include <qtgui/sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 1fb2bbdbb7..679593b1ad 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -54,9 +54,9 @@ namespace gr { bool plotfreq, bool plotwaterfall, bool plottime, bool plotconst, QWidget *parent) - : gr_block("sink_f", - gr_make_io_signature(1, 1, sizeof(float)), - gr_make_io_signature (0, 0, 0)), + : block("sink_f", + io_signature::make(1, 1, sizeof(float)), + io_signature::make (0, 0, 0)), d_fftsize(fftsize), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 24dff8d6b3..c6b4ec3cb5 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -23,11 +23,11 @@ #ifndef INCLUDED_QTGUI_SINK_F_IMPL_H #define INCLUDED_QTGUI_SINK_F_IMPL_H -#include <qtgui/sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <qtgui/SpectrumGUIClass.h> +#include <gnuradio/qtgui/sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc index 21b1f4d6d9..7d7f689f25 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.cc +++ b/gr-qtgui/lib/spectrumUpdateEvents.cc @@ -23,7 +23,7 @@ #ifndef SPECTRUM_UPDATE_EVENTS_C #define SPECTRUM_UPDATE_EVENTS_C -#include <qtgui/spectrumUpdateEvents.h> +#include <gnuradio/qtgui/spectrumUpdateEvents.h> SpectrumUpdateEvent::SpectrumUpdateEvent(const float* fftPoints, const uint64_t numFFTDataPoints, diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 24f15886ba..7731e41454 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -23,8 +23,8 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/spectrumdisplayform.h> -#include <qtgui/qtgui_types.h> +#include <gnuradio/qtgui/spectrumdisplayform.h> +#include <gnuradio/qtgui/qtgui_types.h> SpectrumDisplayForm::SpectrumDisplayForm(QWidget* parent) : QWidget(parent) diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index e1ebfa8197..f6f21c6472 100644 --- a/gr-qtgui/lib/spectrumdisplayform.ui +++ b/gr-qtgui/lib/spectrumdisplayform.ui @@ -522,10 +522,10 @@ <tabstop>WaterfallMinimumIntensitySlider</tabstop> </tabstops> <includes> - <include location="global">qtgui/SpectrumGUIClass.h</include> - <include location="global">qtgui/FrequencyDisplayPlot.h</include> - <include location="global">qtgui/WaterfallDisplayPlot.h</include> - <include location="global">qtgui/TimeDomainDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/SpectrumGUIClass.h</include> + <include location="global">gnuradio/qtgui/FrequencyDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/WaterfallDisplayPlot.h</include> + <include location="global">gnuradio/qtgui/TimeDomainDisplayPlot.h</include> <include location="global">qvalidator.h</include> <include location="global">vector</include> <include location="local">qwt_slider.h</include> diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc index 6ebef5f47e..bd88ead8d3 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.cc +++ b/gr-qtgui/lib/timeRasterGlobalData.cc @@ -23,7 +23,7 @@ #ifndef TIMERASTER_GLOBAL_DATA_CPP #define TIMERASTER_GLOBAL_DATA_CPP -#include <qtgui/timeRasterGlobalData.h> +#include <gnuradio/qtgui/timeRasterGlobalData.h> #include <cstdio> #include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index 6ec6c6075b..4b3d1594cd 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_b_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -57,9 +57,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_raster_sink_b", - gr_make_io_signature(1, -1, sizeof(char)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_b", + io_signature::make(1, -1, sizeof(char)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(nconnections), d_parent(parent), d_rows(rows), d_cols(cols), d_mult(std::vector<float>(nconnections,1)), diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 09c471fcfc..17a492b799 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_B_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_B_IMPL_H -#include <qtgui/time_raster_sink_b.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/time_raster_sink_b.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.cc b/gr-qtgui/lib/time_raster_sink_c_impl.cc index 1c71258030..93eba63a3f 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -47,9 +47,9 @@ namespace gr { unsigned int cols, const std::string &name, QWidget *parent) - : gr_sync_block("time_raster_sink_c", - gr_make_io_signature(1, -1, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_c", + io_signature::make(1, -1, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(1), d_parent(parent), d_rows(rows), d_cols(cols) { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index 9f8a463bf8..8263046702 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.h +++ b/gr-qtgui/lib/time_raster_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_C_IMPL_H -#include <qtgui/time_raster_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/time_rasterdisplayform.h> +#include <gnuradio/qtgui/time_raster_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/time_rasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index b6b0a1fc7d..0f60e45463 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "time_raster_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -57,9 +57,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_raster_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_raster_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_name(name), d_nconnections(nconnections), d_parent(parent), d_rows(rows), d_cols(cols), d_mult(std::vector<float>(nconnections,1)), diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index fad731570c..42e0c787e2 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_TIME_RASTER_SINK_F_IMPL_H #define INCLUDED_QTGUI_TIME_RASTER_SINK_F_IMPL_H -#include <qtgui/time_raster_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/time_raster_sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index f8ff758218..c9f3e963c7 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -25,10 +25,10 @@ #endif #include "time_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_sink_c", - gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_sink_c", + io_signature::make(nconnections, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_size(size), d_samp_rate(samp_rate), d_name(name), d_nconnections(2*nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 2f9765c2c5..724d38e2ae 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_TIME_SINK_C_IMPL_H #define INCLUDED_QTGUI_TIME_SINK_C_IMPL_H -#include <qtgui/time_sink_c.h> -#include <qtgui/timedisplayform.h> -#include <thread/thread.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/time_sink_c.h> +#include <gnuradio/qtgui/timedisplayform.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/high_res_timer.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 6011751b2b..081da98134 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -25,10 +25,10 @@ #endif #include "time_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> -#include <fft/fft.h> +#include <gnuradio/fft/fft.h> #include <qwt_symbol.h> namespace gr { @@ -48,9 +48,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("time_sink_f", - gr_make_io_signature(nconnections, nconnections, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("time_sink_f", + io_signature::make(nconnections, nconnections, sizeof(float)), + io_signature::make(0, 0, 0)), d_size(size), d_samp_rate(samp_rate), d_name(name), d_nconnections(nconnections), d_parent(parent) { diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 1012ffbd77..c3bd7cd838 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -23,10 +23,10 @@ #ifndef INCLUDED_QTGUI_TIME_SINK_F_IMPL_H #define INCLUDED_QTGUI_TIME_SINK_F_IMPL_H -#include <qtgui/time_sink_f.h> -#include <qtgui/timedisplayform.h> -#include <thread/thread.h> -#include <high_res_timer.h> +#include <gnuradio/qtgui/time_sink_f.h> +#include <gnuradio/qtgui/timedisplayform.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/high_res_timer.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 3ae6f93d0c..4b26808cf6 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <qtgui/timedisplayform.h> +#include <gnuradio/qtgui/timedisplayform.h> #include <iostream> TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/lib/timerasterdisplayform.cc b/gr-qtgui/lib/timerasterdisplayform.cc index 50c63ad545..e6f341875d 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/timerasterdisplayform.h> +#include <gnuradio/qtgui/timerasterdisplayform.h> #include <iostream> TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc index 2085acf8fc..a7e8db0928 100644 --- a/gr-qtgui/lib/waterfallGlobalData.cc +++ b/gr-qtgui/lib/waterfallGlobalData.cc @@ -23,7 +23,7 @@ #ifndef WATERFALL_GLOBAL_DATA_CPP #define WATERFALL_GLOBAL_DATA_CPP -#include <qtgui/waterfallGlobalData.h> +#include <gnuradio/qtgui/waterfallGlobalData.h> #include <cstdio> WaterfallData::WaterfallData(const double minimumFrequency, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 817a5a126e..34ad0de38d 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -25,7 +25,7 @@ #endif #include "waterfall_sink_c_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> #include <qwt_symbol.h> @@ -52,9 +52,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("waterfall_sink_c", - gr_make_io_signature(1, nconnections, sizeof(gr_complex)), - gr_make_io_signature(0, 0, 0)), + : sync_block("waterfall_sink_c", + io_signature::make(1, nconnections, sizeof(gr_complex)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 7483989c00..bd548bc944 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_WATERFALL_SINK_C_IMPL_H #define INCLUDED_QTGUI_WATERFALL_SINK_C_IMPL_H -#include <qtgui/waterfall_sink_c.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfall_sink_c.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index aad2ffe5c7..d226ca6a96 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -25,7 +25,7 @@ #endif #include "waterfall_sink_f_impl.h" -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include <string.h> #include <volk/volk.h> @@ -51,9 +51,9 @@ namespace gr { const std::string &name, int nconnections, QWidget *parent) - : gr_sync_block("waterfall_sink_f", - gr_make_io_signature(1, -1, sizeof(float)), - gr_make_io_signature(0, 0, 0)), + : sync_block("waterfall_sink_f", + io_signature::make(1, -1, sizeof(float)), + io_signature::make(0, 0, 0)), d_fftsize(fftsize), d_fftavg(1.0), d_wintype((filter::firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 02556fd9d6..16a54e0f36 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -23,12 +23,12 @@ #ifndef INCLUDED_QTGUI_WATERFALL_SINK_F_IMPL_H #define INCLUDED_QTGUI_WATERFALL_SINK_F_IMPL_H -#include <qtgui/waterfall_sink_f.h> -#include <filter/firdes.h> -#include <fft/fft.h> -#include <high_res_timer.h> -#include <thread/thread.h> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfall_sink_f.h> +#include <gnuradio/filter/firdes.h> +#include <gnuradio/fft/fft.h> +#include <gnuradio/high_res_timer.h> +#include <gnuradio/thread/thread.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index fb5df230c2..1021a4f8d3 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <qtgui/waterfalldisplayform.h> +#include <gnuradio/qtgui/waterfalldisplayform.h> #include <iostream> WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) diff --git a/gr-qtgui/python/qtgui/__init__.py b/gr-qtgui/python/qtgui/__init__.py index aaea875f04..e9aeea7a86 100644 --- a/gr-qtgui/python/qtgui/__init__.py +++ b/gr-qtgui/python/qtgui/__init__.py @@ -20,8 +20,7 @@ # ''' -This is the gr-qtgui package. This package includes QT-based graphical -sinks. +Provides a GUI interface using the QT backend. ''' # The presence of this file turns this directory into a Python package diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt index 15b2147d6f..1c9a182625 100644 --- a/gr-qtgui/swig/CMakeLists.txt +++ b/gr-qtgui/swig/CMakeLists.txt @@ -39,7 +39,7 @@ if(ENABLE_GR_CTRLPORT) endif(ENABLE_GR_CTRLPORT) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/gnuradio/qtgui) set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc) set(GR_SWIG_LIBRARIES gnuradio-qtgui) diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i index 27f34fc3cd..a04267dffc 100644 --- a/gr-qtgui/swig/qtgui_swig.i +++ b/gr-qtgui/swig/qtgui_swig.i @@ -29,36 +29,36 @@ %include "qtgui_swig_doc.i" // So we understand the firdes window types -%import "filter/firdes.h" +%import "gnuradio/filter/firdes.h" %{ -#include "qtgui/form_menus.h" -#include "qtgui/DisplayPlot.h" -#include "qtgui/displayform.h" -#include "qtgui/sink_c.h" -#include "qtgui/sink_f.h" -#include "qtgui/time_sink_c.h" -#include "qtgui/time_sink_f.h" -#include "qtgui/time_raster_sink_b.h" -#include "qtgui/time_raster_sink_f.h" -#include "qtgui/freq_sink_c.h" -#include "qtgui/freq_sink_f.h" -#include "qtgui/const_sink_c.h" -#include "qtgui/waterfall_sink_c.h" -#include "qtgui/waterfall_sink_f.h" +#include "gnuradio/qtgui/form_menus.h" +#include "gnuradio/qtgui/DisplayPlot.h" +#include "gnuradio/qtgui/displayform.h" +#include "gnuradio/qtgui/sink_c.h" +#include "gnuradio/qtgui/sink_f.h" +#include "gnuradio/qtgui/time_sink_c.h" +#include "gnuradio/qtgui/time_sink_f.h" +#include "gnuradio/qtgui/time_raster_sink_b.h" +#include "gnuradio/qtgui/time_raster_sink_f.h" +#include "gnuradio/qtgui/freq_sink_c.h" +#include "gnuradio/qtgui/freq_sink_f.h" +#include "gnuradio/qtgui/const_sink_c.h" +#include "gnuradio/qtgui/waterfall_sink_c.h" +#include "gnuradio/qtgui/waterfall_sink_f.h" %} -%include "qtgui/sink_c.h" -%include "qtgui/sink_f.h" -%include "qtgui/time_sink_c.h" -%include "qtgui/time_sink_f.h" -%include "qtgui/time_raster_sink_b.h" -%include "qtgui/time_raster_sink_f.h" -%include "qtgui/freq_sink_c.h" -%include "qtgui/freq_sink_f.h" -%include "qtgui/const_sink_c.h" -%include "qtgui/waterfall_sink_c.h" -%include "qtgui/waterfall_sink_f.h" +%include "gnuradio/qtgui/sink_c.h" +%include "gnuradio/qtgui/sink_f.h" +%include "gnuradio/qtgui/time_sink_c.h" +%include "gnuradio/qtgui/time_sink_f.h" +%include "gnuradio/qtgui/time_raster_sink_b.h" +%include "gnuradio/qtgui/time_raster_sink_f.h" +%include "gnuradio/qtgui/freq_sink_c.h" +%include "gnuradio/qtgui/freq_sink_f.h" +%include "gnuradio/qtgui/const_sink_c.h" +%include "gnuradio/qtgui/waterfall_sink_c.h" +%include "gnuradio/qtgui/waterfall_sink_f.h" GR_SWIG_BLOCK_MAGIC2(qtgui, sink_c); GR_SWIG_BLOCK_MAGIC2(qtgui, sink_f); |