diff options
Diffstat (limited to 'gr-qtgui')
73 files changed, 167 insertions, 162 deletions
diff --git a/gr-qtgui/apps/gr_constellation_plot b/gr-qtgui/apps/gr_constellation_plot index 068744321..559b643c5 100755 --- a/gr-qtgui/apps/gr_constellation_plot +++ b/gr-qtgui/apps/gr_constellation_plot @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio.eng_option import eng_option from optparse import OptionParser import os, sys @@ -67,7 +68,7 @@ class my_top_block(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) - self.skip = gr.skiphead(gr.sizeof_gr_complex, self._start) + self.skip = blocks.skiphead(gr.sizeof_gr_complex, self._start) self.gui_snk = qtgui.const_sink_c(self._nsamps, "GNU Radio Constellation Plot", self._nsigs) @@ -77,7 +78,7 @@ class my_top_block(gr.top_block): self._data_max = -sys.maxint - 1 for f in filelist: data,_min,_max = read_samples_c(f, self._start, self._nsamps) - self.srcs.append(gr.vector_source_c(data)) + self.srcs.append(blocks.vector_source_c(data)) if(_min < self._data_min): self._data_min = _min diff --git a/gr-qtgui/apps/gr_psd_plot_c b/gr-qtgui/apps/gr_psd_plot_c index f2789ef34..6ade908bd 100755 --- a/gr-qtgui/apps/gr_psd_plot_c +++ b/gr-qtgui/apps/gr_psd_plot_c @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio import filter import scipy @@ -46,7 +47,7 @@ class psd_plot_c(plot_base.plot_base): self.read_samples = plot_base.read_samples_c self.dsize = gr.sizeof_gr_complex - self.src_type = gr.vector_source_c + self.src_type = blocks.vector_source_c self.gui_snk = qtgui.freq_sink_c(self._psd_size, filter.firdes.WIN_BLACKMAN_hARRIS, self._center_freq, self._samp_rate, "GNU Radio PSD Plot", self._nsigs) diff --git a/gr-qtgui/apps/gr_psd_plot_f b/gr-qtgui/apps/gr_psd_plot_f index c6b70baf2..792b04290 100755 --- a/gr-qtgui/apps/gr_psd_plot_f +++ b/gr-qtgui/apps/gr_psd_plot_f @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio import filter import scipy @@ -46,7 +47,7 @@ class psd_plot_f(plot_base.plot_base): self.read_samples = plot_base.read_samples_f self.dsize = gr.sizeof_float - self.src_type = gr.vector_source_f + self.src_type = blocks.vector_source_f self.gui_snk = qtgui.freq_sink_f(self._psd_size, filter.firdes.WIN_BLACKMAN_hARRIS, self._center_freq, self._samp_rate, "GNU Radio PSD Plot", self._nsigs) diff --git a/gr-qtgui/apps/gr_spectrogram_plot_c b/gr-qtgui/apps/gr_spectrogram_plot_c index 059f65cd9..bb4fad1b7 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_c +++ b/gr-qtgui/apps/gr_spectrogram_plot_c @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio import filter import scipy @@ -46,7 +47,7 @@ class spectrogram_plot_c(plot_base.plot_base): self.read_samples = plot_base.read_samples_c self.dsize = gr.sizeof_gr_complex - self.src_type = gr.vector_source_c + self.src_type = blocks.vector_source_c self.gui_snk = qtgui.waterfall_sink_c(self._psd_size, filter.firdes.WIN_BLACKMAN_hARRIS, self._center_freq, self._samp_rate, "GNU Radio Spectrogram Plot", self._nsigs) diff --git a/gr-qtgui/apps/gr_spectrogram_plot_f b/gr-qtgui/apps/gr_spectrogram_plot_f index be9c98153..dcb0305bf 100755 --- a/gr-qtgui/apps/gr_spectrogram_plot_f +++ b/gr-qtgui/apps/gr_spectrogram_plot_f @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks from gnuradio import filter import scipy @@ -46,7 +47,7 @@ class spectrogram_plot_f(plot_base.plot_base): self.read_samples = plot_base.read_samples_f self.dsize = gr.sizeof_float - self.src_type = gr.vector_source_f + self.src_type = blocks.vector_source_f self.gui_snk = qtgui.waterfall_sink_f(self._psd_size, filter.firdes.WIN_BLACKMAN_hARRIS, self._center_freq, self._samp_rate, "GNU Radio Spectrogram Plot", self._nsigs) diff --git a/gr-qtgui/apps/gr_time_plot_c b/gr-qtgui/apps/gr_time_plot_c index a7c39a24b..174b3ee1e 100755 --- a/gr-qtgui/apps/gr_time_plot_c +++ b/gr-qtgui/apps/gr_time_plot_c @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks import scipy try: @@ -45,7 +46,7 @@ class plot_time_c(plot_base.plot_base): auto_scale) self.read_samples = plot_base.read_samples_c self.dsize = gr.sizeof_gr_complex - self.src_type = gr.vector_source_c + self.src_type = blocks.vector_source_c self.gui_snk = qtgui.time_sink_c(self._nsamps, self._samp_rate, "GNU Radio Time Plot", self._nsigs) self._nsigs *= 2 # complex plots have real/imag diff --git a/gr-qtgui/apps/gr_time_plot_f b/gr-qtgui/apps/gr_time_plot_f index 9b29709b1..9140b6122 100755 --- a/gr-qtgui/apps/gr_time_plot_f +++ b/gr-qtgui/apps/gr_time_plot_f @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks import scipy try: @@ -45,7 +46,7 @@ class plot_time_f(plot_base.plot_base): auto_scale) self.read_samples = plot_base.read_samples_f self.dsize = gr.sizeof_float - self.src_type = gr.vector_source_f + self.src_type = blocks.vector_source_f self.gui_snk = qtgui.time_sink_f(self._nsamps, self._samp_rate, "GNU Radio Time Plot", self._nsigs) self.setup() diff --git a/gr-qtgui/apps/gr_time_raster_b b/gr-qtgui/apps/gr_time_raster_b index a326a126c..3e81c317d 100755 --- a/gr-qtgui/apps/gr_time_raster_b +++ b/gr-qtgui/apps/gr_time_raster_b @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks import scipy try: @@ -48,7 +49,7 @@ class plot_time_raster_b(plot_base.plot_base): self._ncols = ncols self.read_samples = plot_base.read_samples_b self.dsize = gr.sizeof_char - self.src_type = gr.vector_source_b + self.src_type = blocks.vector_source_b self.gui_snk = qtgui.time_raster_sink_b(self._samp_rate, self._nrows, self._ncols, [], [], "GNU Radio Time Plot", self._nsigs) self.setup() diff --git a/gr-qtgui/apps/gr_time_raster_f b/gr-qtgui/apps/gr_time_raster_f index a6cb897c0..6b5e5c20e 100755 --- a/gr-qtgui/apps/gr_time_raster_f +++ b/gr-qtgui/apps/gr_time_raster_f @@ -21,6 +21,7 @@ # from gnuradio import gr +from gnuradio import blocks import scipy try: @@ -48,7 +49,7 @@ class plot_time_raster_f(plot_base.plot_base): self._ncols = ncols self.read_samples = plot_base.read_samples_f self.dsize = gr.sizeof_float - self.src_type = gr.vector_source_f + self.src_type = blocks.vector_source_f self.gui_snk = qtgui.time_raster_sink_f(self._samp_rate, self._nrows, self._ncols, [], [], "GNU Radio Time Plot", self._nsigs) self.setup() diff --git a/gr-qtgui/apps/plot_base.py b/gr-qtgui/apps/plot_base.py index 52c888cff..b279e1e97 100644 --- a/gr-qtgui/apps/plot_base.py +++ b/gr-qtgui/apps/plot_base.py @@ -91,7 +91,7 @@ def read_samples_b(filename, start, in_size, min_size=0): scipy.int8, gr.sizeof_char) # Bit of a hack since we want to read the data as signed ints, but - # the gr.vector_source_b will only accept unsigned. We read in as + # the blocks.vector_source_b will only accept unsigned. We read in as # signed, do our min/max and things on that, then convert here. d = scipy.array(d, dtype=scipy.uint8).tolist() return d,mn,mx @@ -122,7 +122,7 @@ class source_ints_to_float(gr.hier_block2): gr.hier_block2.__init__(self, "ints_to_floats", gr.io_signature(0, 0, 0), gr.io_signature(1, 1, gr.sizeof_float)) - self.src = gr.vector_source_i(data) + self.src = blocks.vector_source_i(data) self.cvt = blocks.int_to_float() self.connect(self.src, self.cvt, self) @@ -134,7 +134,7 @@ class source_shorts_to_float(gr.hier_block2): gr.hier_block2.__init__(self, "shorts_to_floats", gr.io_signature(0, 0, 0), gr.io_signature(1, 1, gr.sizeof_float)) - self.src = gr.vector_source_s(data) + self.src = blocks.vector_source_s(data) self.cvt = blocks.short_to_float() self.connect(self.src, self.cvt, self) @@ -146,7 +146,7 @@ class source_chars_to_float(gr.hier_block2): gr.hier_block2.__init__(self, "chars_to_floats", gr.io_signature(0, 0, 0), gr.io_signature(1, 1, gr.sizeof_float)) - self.src = gr.vector_source_b(data) + self.src = blocks.vector_source_b(data) self.cvt = blocks.char_to_float() self.connect(self.src, self.cvt, self) diff --git a/gr-qtgui/apps/plot_psd_base.py b/gr-qtgui/apps/plot_psd_base.py index a4a6cb871..bb1567e01 100644 --- a/gr-qtgui/apps/plot_psd_base.py +++ b/gr-qtgui/apps/plot_psd_base.py @@ -72,7 +72,7 @@ class plot_base(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) def setup(self): - self.skip = gr.skiphead(self.dsize, self._start) + self.skip = blocks.skiphead(self.dsize, self._start) n = 0 self.srcs = list() diff --git a/gr-qtgui/apps/plot_spectrogram_base.py b/gr-qtgui/apps/plot_spectrogram_base.py index adfbfd032..a3fdf6511 100644 --- a/gr-qtgui/apps/plot_spectrogram_base.py +++ b/gr-qtgui/apps/plot_spectrogram_base.py @@ -72,7 +72,7 @@ class plot_base(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) def setup(self): - self.skip = gr.skiphead(self.dsize, self._start) + self.skip = blocks.skiphead(self.dsize, self._start) n = 0 self.srcs = list() diff --git a/gr-qtgui/apps/plot_time_base.py b/gr-qtgui/apps/plot_time_base.py index c80bace1b..942500c62 100644 --- a/gr-qtgui/apps/plot_time_base.py +++ b/gr-qtgui/apps/plot_time_base.py @@ -71,7 +71,7 @@ class plot_base(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) def setup(self): - self.skip = gr.skiphead(self.dsize, self._start) + self.skip = blocks.skiphead(self.dsize, self._start) n = 0 self.srcs = list() diff --git a/gr-qtgui/apps/plot_time_raster_base.py b/gr-qtgui/apps/plot_time_raster_base.py index ff3cc2869..2fc498ba2 100644 --- a/gr-qtgui/apps/plot_time_raster_base.py +++ b/gr-qtgui/apps/plot_time_raster_base.py @@ -71,7 +71,7 @@ class plot_base(gr.top_block): self.qapp = QtGui.QApplication(sys.argv) def setup(self): - self.skip = gr.skiphead(self.dsize, self._start) + self.skip = blocks.skiphead(self.dsize, self._start) n = 0 self.srcs = list() diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py index 445d6d4fc..fef4f448b 100755 --- a/gr-qtgui/apps/qt_digital.py +++ b/gr-qtgui/apps/qt_digital.py @@ -182,7 +182,7 @@ class my_top_block(gr.top_block): fftsize = 2048 self.data = scipy.random.randint(0, 255, 1000) - self.src = gr.vector_source_b(self.data.tolist(), True) + self.src = blocks.vector_source_b(self.data.tolist(), True) self.mod = digital.dqpsk_mod(self.gray_code, samples_per_symbol=self.sps, excess_bw=self.excess_bw, diff --git a/gr-qtgui/examples/pyqt_time_raster_b.py b/gr-qtgui/examples/pyqt_time_raster_b.py index b29403819..4cad9de60 100755 --- a/gr-qtgui/examples/pyqt_time_raster_b.py +++ b/gr-qtgui/examples/pyqt_time_raster_b.py @@ -22,6 +22,7 @@ from gnuradio import gr from gnuradio import blocks +from gnuradio import blocks import sys try: @@ -58,10 +59,10 @@ class my_top_block(gr.top_block): nrows = 100 fs = 200 - src0 = gr.vector_source_b(data0, True) - src1 = gr.vector_source_b(data1, True) + src0 = blocks.vector_source_b(data0, True) + src1 = blocks.vector_source_b(data1, True) thr = blocks.throttle(gr.sizeof_char, 50000) - head = gr.head(gr.sizeof_char, 10000000) + head = blocks.head(gr.sizeof_char, 10000000) self.snk1 = qtgui.time_raster_sink_b(fs, nrows, ncols, [], [], "Time Raster Example", 2) diff --git a/gr-qtgui/examples/pyqt_time_raster_f.py b/gr-qtgui/examples/pyqt_time_raster_f.py index 957e694b3..c5261520d 100755 --- a/gr-qtgui/examples/pyqt_time_raster_f.py +++ b/gr-qtgui/examples/pyqt_time_raster_f.py @@ -58,10 +58,10 @@ class my_top_block(gr.top_block): nrows = 100 fs = 200 - src0 = gr.vector_source_f(data0, True) - src1 = gr.vector_source_f(data1, True) + src0 = blocks.vector_source_f(data0, True) + src1 = blocks.vector_source_f(data1, True) thr = blocks.throttle(gr.sizeof_float, 50000) - hed = gr.head(gr.sizeof_float, 10000000) + hed = blocks.head(gr.sizeof_float, 10000000) self.snk1 = qtgui.time_raster_sink_f(fs, nrows, ncols, [], [], "Float Time Raster Example", 2) diff --git a/gr-qtgui/include/qtgui/CMakeLists.txt b/gr-qtgui/include/qtgui/CMakeLists.txt index f3ef6808e..8f95837fe 100644 --- a/gr-qtgui/include/qtgui/CMakeLists.txt +++ b/gr-qtgui/include/qtgui/CMakeLists.txt @@ -21,19 +21,41 @@ # Install the header files ######################################################################## install(FILES - api.h - time_sink_c.h - time_sink_f.h - time_raster_sink_b.h - time_raster_sink_f.h - freq_sink_c.h - freq_sink_f.h - const_sink_c.h - waterfall_sink_c.h - waterfall_sink_f.h - sink_c.h - sink_f.h - utils.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio/qtgui - COMPONENT "qtgui_devel" + api.h + CMakeLists.txt + constellationdisplayform.h + ConstellationDisplayPlot.h + const_sink_c.h + displayform.h + DisplayPlot.h + form_menus.h + freqdisplayform.h + freq_sink_c.h + freq_sink_f.h + FrequencyDisplayPlot.h + plot_raster.h + plot_waterfall.h + qtgui_types.h + sink_c.h + sink_f.h + spectrumdisplayform.h + SpectrumGUIClass.h + spectrumUpdateEvents.h + timedisplayform.h + TimeDomainDisplayPlot.h + timerasterdisplayform.h + TimeRasterDisplayPlot.h + timeRasterGlobalData.h + time_raster_sink_b.h + time_raster_sink_f.h + time_sink_c.h + time_sink_f.h + utils.h + waterfalldisplayform.h + WaterfallDisplayPlot.h + waterfallGlobalData.h + waterfall_sink_c.h + waterfall_sink_f.h + DESTINATION ${GR_INCLUDE_DIR}/gnuradio/qtgui + COMPONENT "qtgui_devel" ) diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.h b/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h index b68b01f6d..2c33a7430 100644 --- a/gr-qtgui/lib/ConstellationDisplayPlot.h +++ b/gr-qtgui/include/qtgui/ConstellationDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include "DisplayPlot.h" +#include <qtgui/DisplayPlot.h> class ConstellationDisplayPlot : public DisplayPlot { diff --git a/gr-qtgui/lib/DisplayPlot.h b/gr-qtgui/include/qtgui/DisplayPlot.h index d9ee16e08..d9ee16e08 100644 --- a/gr-qtgui/lib/DisplayPlot.h +++ b/gr-qtgui/include/qtgui/DisplayPlot.h diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h index 22d2be005..ae438f143 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.h +++ b/gr-qtgui/include/qtgui/FrequencyDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include "DisplayPlot.h" +#include <qtgui/DisplayPlot.h> class FrequencyDisplayPlot: public DisplayPlot { diff --git a/gr-qtgui/lib/SpectrumGUIClass.h b/gr-qtgui/include/qtgui/SpectrumGUIClass.h index 9a2233d16..844c6509d 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.h +++ b/gr-qtgui/include/qtgui/SpectrumGUIClass.h @@ -28,10 +28,10 @@ #include <qapplication.h> #include <qlabel.h> #include <qslider.h> -#include <spectrumUpdateEvents.h> +#include <qtgui/spectrumUpdateEvents.h> class SpectrumDisplayForm; -#include <spectrumdisplayform.h> +#include <qtgui/spectrumdisplayform.h> #include <cmath> diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h index 9996f84fc..f7e695d51 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.h +++ b/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h @@ -26,7 +26,7 @@ #include <stdint.h> #include <cstdio> #include <vector> -#include "DisplayPlot.h" +#include <qtgui/DisplayPlot.h> class TimeDomainDisplayPlot: public DisplayPlot { diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.h b/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h index e4e292a54..c1ea42776 100644 --- a/gr-qtgui/lib/TimeRasterDisplayPlot.h +++ b/gr-qtgui/include/qtgui/TimeRasterDisplayPlot.h @@ -27,13 +27,13 @@ #include <cstdio> #include <vector> #include <qwt_plot_rasteritem.h> -#include "DisplayPlot.h" -#include "timeRasterGlobalData.h" -#include "plot_raster.h" +#include <qtgui/DisplayPlot.h> +#include <qtgui/timeRasterGlobalData.h> +#include <qtgui/plot_raster.h> #include <gruel/high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <plot_waterfall.h> +#include <qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.h b/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h index 6637adc59..654577432 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.h +++ b/gr-qtgui/include/qtgui/WaterfallDisplayPlot.h @@ -27,12 +27,12 @@ #include <cstdio> #include <vector> #include <qwt_plot_spectrogram.h> -#include "DisplayPlot.h" -#include "waterfallGlobalData.h" +#include <qtgui/DisplayPlot.h> +#include <qtgui/waterfallGlobalData.h> #include <gruel/high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <plot_waterfall.h> +#include <qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif diff --git a/gr-qtgui/include/qtgui/const_sink_c.h b/gr-qtgui/include/qtgui/const_sink_c.h index e0c358bca..b81c53295 100644 --- a/gr-qtgui/include/qtgui/const_sink_c.h +++ b/gr-qtgui/include/qtgui/const_sink_c.h @@ -28,6 +28,7 @@ #include <gr_sync_block.h> #include <qapplication.h> #include <filter/firdes.h> + namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/constellationdisplayform.h b/gr-qtgui/include/qtgui/constellationdisplayform.h index 06a8e7ed5..40cfe8999 100644 --- a/gr-qtgui/lib/constellationdisplayform.h +++ b/gr-qtgui/include/qtgui/constellationdisplayform.h @@ -23,12 +23,12 @@ #ifndef CONSTELLATION_DISPLAY_FORM_H #define CONSTELLATION_DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> -#include <ConstellationDisplayPlot.h> +#include <qtgui/spectrumUpdateEvents.h> +#include <qtgui/ConstellationDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include "displayform.h" +#include <qtgui/displayform.h> class ConstellationDisplayForm : public DisplayForm { diff --git a/gr-qtgui/lib/displayform.h b/gr-qtgui/include/qtgui/displayform.h index 31dc757bb..47f17ad41 100644 --- a/gr-qtgui/lib/displayform.h +++ b/gr-qtgui/include/qtgui/displayform.h @@ -23,15 +23,15 @@ #ifndef DISPLAY_FORM_H #define DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> +#include <qtgui/spectrumUpdateEvents.h> #include <QtGui/QtGui> #include <vector> #include <qwt_plot_grid.h> #include <qwt_plot_layout.h> -#include "DisplayPlot.h" -#include "form_menus.h" +#include <qtgui/DisplayPlot.h> +#include <qtgui/form_menus.h> class DisplayForm : public QWidget { diff --git a/gr-qtgui/lib/form_menus.h b/gr-qtgui/include/qtgui/form_menus.h index 63ab35ed9..7f5b8ae6e 100644 --- a/gr-qtgui/lib/form_menus.h +++ b/gr-qtgui/include/qtgui/form_menus.h @@ -28,7 +28,7 @@ #include <QtGui/QtGui> #include <qwt_symbol.h> #include <filter/firdes.h> -#include "qtgui_types.h" +#include <qtgui/qtgui_types.h> class LineColorMenu: public QMenu { diff --git a/gr-qtgui/lib/freqdisplayform.h b/gr-qtgui/include/qtgui/freqdisplayform.h index b22cd93c5..2daba9091 100644 --- a/gr-qtgui/lib/freqdisplayform.h +++ b/gr-qtgui/include/qtgui/freqdisplayform.h @@ -23,13 +23,13 @@ #ifndef FREQ_DISPLAY_FORM_H #define FREQ_DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> -#include <FrequencyDisplayPlot.h> +#include <qtgui/spectrumUpdateEvents.h> +#include <qtgui/FrequencyDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <filter/firdes.h> -#include "displayform.h" +#include <qtgui/displayform.h> class FreqDisplayForm : public DisplayForm { diff --git a/gr-qtgui/lib/plot_raster.h b/gr-qtgui/include/qtgui/plot_raster.h index 7bea0a4d5..5692cc4ba 100644 --- a/gr-qtgui/lib/plot_raster.h +++ b/gr-qtgui/include/qtgui/plot_raster.h @@ -24,7 +24,7 @@ #define PLOT_TIMERASTER_H #include <qglobal.h> -#include <timeRasterGlobalData.h> +#include <qtgui/timeRasterGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/lib/plot_waterfall.h b/gr-qtgui/include/qtgui/plot_waterfall.h index 40ee4eccb..4c764fd76 100644 --- a/gr-qtgui/lib/plot_waterfall.h +++ b/gr-qtgui/include/qtgui/plot_waterfall.h @@ -24,7 +24,7 @@ #define PLOT_WATERFALL_H #include <qglobal.h> -#include <waterfallGlobalData.h> +#include <qtgui/waterfallGlobalData.h> #include <qwt_plot_rasteritem.h> #if QWT_VERSION >= 0x060000 diff --git a/gr-qtgui/lib/qtgui_types.h b/gr-qtgui/include/qtgui/qtgui_types.h index f4b16dfef..f4b16dfef 100644 --- a/gr-qtgui/lib/qtgui_types.h +++ b/gr-qtgui/include/qtgui/qtgui_types.h diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h index 97d9c9014..97d9c9014 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.h +++ b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h diff --git a/gr-qtgui/lib/spectrumdisplayform.h b/gr-qtgui/include/qtgui/spectrumdisplayform.h index c5b714e73..37a481245 100644 --- a/gr-qtgui/lib/spectrumdisplayform.h +++ b/gr-qtgui/include/qtgui/spectrumdisplayform.h @@ -23,16 +23,16 @@ #ifndef SPECTRUM_DISPLAY_FORM_H #define SPECTRUM_DISPLAY_FORM_H -#include "spectrumdisplayform.ui.h" +#include <spectrumdisplayform.ui.h> class SpectrumGUIClass; -#include <SpectrumGUIClass.h> +#include <qtgui/SpectrumGUIClass.h> -#include <SpectrumGUIClass.h> -#include <FrequencyDisplayPlot.h> -#include <WaterfallDisplayPlot.h> -#include <TimeDomainDisplayPlot.h> -#include <ConstellationDisplayPlot.h> +#include <qtgui/SpectrumGUIClass.h> +#include <qtgui/FrequencyDisplayPlot.h> +#include <qtgui/WaterfallDisplayPlot.h> +#include <qtgui/TimeDomainDisplayPlot.h> +#include <qtgui/ConstellationDisplayPlot.h> #include <QValidator> #include <QTimer> #include <vector> diff --git a/gr-qtgui/lib/timeRasterGlobalData.h b/gr-qtgui/include/qtgui/timeRasterGlobalData.h index 0a414432d..0a414432d 100644 --- a/gr-qtgui/lib/timeRasterGlobalData.h +++ b/gr-qtgui/include/qtgui/timeRasterGlobalData.h diff --git a/gr-qtgui/lib/timedisplayform.h b/gr-qtgui/include/qtgui/timedisplayform.h index 4bc99f622..4df4698e3 100644 --- a/gr-qtgui/lib/timedisplayform.h +++ b/gr-qtgui/include/qtgui/timedisplayform.h @@ -23,12 +23,12 @@ #ifndef TIME_DISPLAY_FORM_H #define TIME_DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> -#include <TimeDomainDisplayPlot.h> +#include <qtgui/spectrumUpdateEvents.h> +#include <qtgui/TimeDomainDisplayPlot.h> #include <QtGui/QtGui> #include <vector> -#include "displayform.h" +#include <qtgui/displayform.h> class TimeDisplayForm : public DisplayForm { diff --git a/gr-qtgui/lib/timerasterdisplayform.h b/gr-qtgui/include/qtgui/timerasterdisplayform.h index f5341f5ec..8c68c52bc 100644 --- a/gr-qtgui/lib/timerasterdisplayform.h +++ b/gr-qtgui/include/qtgui/timerasterdisplayform.h @@ -23,13 +23,13 @@ #ifndef TIMERASTER_DISPLAY_FORM_H #define TIMERASTER_DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> -#include <TimeRasterDisplayPlot.h> +#include <qtgui/spectrumUpdateEvents.h> +#include <qtgui/TimeRasterDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <filter/firdes.h> -#include "displayform.h" +#include <qtgui/displayform.h> class TimeRasterDisplayForm : public DisplayForm { diff --git a/gr-qtgui/lib/waterfallGlobalData.h b/gr-qtgui/include/qtgui/waterfallGlobalData.h index 8ab9590d0..8ab9590d0 100644 --- a/gr-qtgui/lib/waterfallGlobalData.h +++ b/gr-qtgui/include/qtgui/waterfallGlobalData.h diff --git a/gr-qtgui/lib/waterfalldisplayform.h b/gr-qtgui/include/qtgui/waterfalldisplayform.h index 959f2fea6..56efe4ed2 100644 --- a/gr-qtgui/lib/waterfalldisplayform.h +++ b/gr-qtgui/include/qtgui/waterfalldisplayform.h @@ -23,13 +23,13 @@ #ifndef WATERFALL_DISPLAY_FORM_H #define WATERFALL_DISPLAY_FORM_H -#include <spectrumUpdateEvents.h> -#include <WaterfallDisplayPlot.h> +#include <qtgui/spectrumUpdateEvents.h> +#include <qtgui/WaterfallDisplayPlot.h> #include <QtGui/QtGui> #include <vector> #include <filter/firdes.h> -#include "displayform.h" +#include <qtgui/displayform.h> class WaterfallDisplayForm : public DisplayForm { diff --git a/gr-qtgui/lib/CMakeLists.txt b/gr-qtgui/lib/CMakeLists.txt index ff1e64ce3..fb58c8e09 100644 --- a/gr-qtgui/lib/CMakeLists.txt +++ b/gr-qtgui/lib/CMakeLists.txt @@ -20,21 +20,22 @@ ######################################################################## # Setup the QT file generations stuff ######################################################################## +set(qtgui_mod_includedir ${CMAKE_CURRENT_SOURCE_DIR}/../include/qtgui) set(qtgui_moc_hdrs - spectrumdisplayform.h - displayform.h - timedisplayform.h - timerasterdisplayform.h - freqdisplayform.h - constellationdisplayform.h - waterfalldisplayform.h - form_menus.h - DisplayPlot.h - FrequencyDisplayPlot.h - TimeDomainDisplayPlot.h - TimeRasterDisplayPlot.h - WaterfallDisplayPlot.h - ConstellationDisplayPlot.h + ${qtgui_mod_includedir}/spectrumdisplayform.h + ${qtgui_mod_includedir}/displayform.h + ${qtgui_mod_includedir}/timedisplayform.h + ${qtgui_mod_includedir}/timerasterdisplayform.h + ${qtgui_mod_includedir}/freqdisplayform.h + ${qtgui_mod_includedir}/constellationdisplayform.h + ${qtgui_mod_includedir}/waterfalldisplayform.h + ${qtgui_mod_includedir}/form_menus.h + ${qtgui_mod_includedir}/DisplayPlot.h + ${qtgui_mod_includedir}/FrequencyDisplayPlot.h + ${qtgui_mod_includedir}/TimeDomainDisplayPlot.h + ${qtgui_mod_includedir}/TimeRasterDisplayPlot.h + ${qtgui_mod_includedir}/WaterfallDisplayPlot.h + ${qtgui_mod_includedir}/ConstellationDisplayPlot.h ) QT4_WRAP_CPP(qtgui_moc_srcs ${qtgui_moc_hdrs}) QT4_WRAP_UI(qtgui_ui_hdrs spectrumdisplayform.ui) @@ -147,31 +148,3 @@ add_definitions(-DQWT_DLL) #setup QWT library linkage add_library(gnuradio-qtgui SHARED ${qtgui_srcs}) target_link_libraries(gnuradio-qtgui ${qtgui_libs}) GR_LIBRARY_FOO(gnuradio-qtgui RUNTIME_COMPONENT "qtgui_runtime" DEVEL_COMPONENT "qtgui_devel") - -######################################################################## -# Install the header files -######################################################################## -install(FILES - DisplayPlot.h - FrequencyDisplayPlot.h - TimeDomainDisplayPlot.h - TimeRasterDisplayPlot.h - timeRasterGlobalData.h - WaterfallDisplayPlot.h - waterfallGlobalData.h - ConstellationDisplayPlot.h - plot_waterfall.h - plot_raster.h - spectrumdisplayform.h - displayform.h - timedisplayform.h - timerasterdisplayform.h - freqdisplayform.h - constellationdisplayform.h - waterfalldisplayform.h - form_menus.h - SpectrumGUIClass.h - spectrumUpdateEvents.h - DESTINATION ${GR_INCLUDE_DIR}/gnuradio - COMPONENT "qtgui_devel" -) diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc index f3951534a..7e2f11e6d 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 <ConstellationDisplayPlot.h> +#include <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 1c9de3d0a..227cf9cc9 100644 --- a/gr-qtgui/lib/DisplayPlot.cc +++ b/gr-qtgui/lib/DisplayPlot.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <DisplayPlot.h> +#include <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 e27915554..56e63100c 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 <FrequencyDisplayPlot.h> +#include <qtgui/FrequencyDisplayPlot.h> -#include "qtgui_types.h" +#include <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 40c7fb02b..328eaa9b6 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 <SpectrumGUIClass.h> +#include <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 032da2547..13e24c2a9 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 <TimeDomainDisplayPlot.h> +#include <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 48fb7f7b4..66b38c52f 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 <TimeRasterDisplayPlot.h> +#include <qtgui/TimeRasterDisplayPlot.h> -#include "qtgui_types.h" +#include <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 05c89e3ec..c1b8fd00c 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 <WaterfallDisplayPlot.h> +#include <qtgui/WaterfallDisplayPlot.h> -#include "qtgui_types.h" +#include <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.h b/gr-qtgui/lib/const_sink_c_impl.h index 81cdb9881..b5b085834 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -26,7 +26,7 @@ #include <qtgui/const_sink_c.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <constellationdisplayform.h> +#include <qtgui/constellationdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index e3c65ec41..bfd17b9c1 100644 --- a/gr-qtgui/lib/constellationdisplayform.cc +++ b/gr-qtgui/lib/constellationdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <constellationdisplayform.h> +#include <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 276539cdd..089d23804 100644 --- a/gr-qtgui/lib/displayform.cc +++ b/gr-qtgui/lib/displayform.cc @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include <displayform.h> +#include <qtgui/displayform.h> #include <iostream> #include <QPixmap> #include <QFileDialog> diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 0567b914c..e82f5c9ee 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <freqdisplayform.h> +#include <qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index b79127f3d..d3d8851c8 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <freqdisplayform.h> +#include <qtgui/freqdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index c90e8b796..adcc09dc4 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <freqdisplayform.h> +#include <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 76bff473e..6d31a2596 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 "plot_raster.h" +#include <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 84915e3f3..5a378767b 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 "plot_waterfall.h" +#include <qtgui/plot_waterfall.h> #if QWT_VERSION < 0x060000 #include "qwt_double_interval.h" diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index ddfb0865d..83f542b42 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -27,7 +27,7 @@ #include <filter/firdes.h> #include <fft/fft.h> #include <gruel/high_res_timer.h> -#include <SpectrumGUIClass.h> +#include <qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 394d5c342..33dab713f 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -27,7 +27,7 @@ #include <filter/firdes.h> #include <fft/fft.h> #include <gruel/high_res_timer.h> -#include <SpectrumGUIClass.h> +#include <qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc index bda89651b..82b195d69 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 <spectrumUpdateEvents.h> +#include <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 8d7caebda..e4ee02866 100644 --- a/gr-qtgui/lib/spectrumdisplayform.cc +++ b/gr-qtgui/lib/spectrumdisplayform.cc @@ -23,8 +23,8 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <spectrumdisplayform.h> -#include "qtgui_types.h" +#include <qtgui/spectrumdisplayform.h> +#include <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 f1e1f08f9..e1ebfa819 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">SpectrumGUIClass.h</include> - <include location="global">FrequencyDisplayPlot.h</include> - <include location="global">WaterfallDisplayPlot.h</include> - <include location="global">TimeDomainDisplayPlot.h</include> + <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">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 556196f64..6ebef5f47 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 <timeRasterGlobalData.h> +#include <qtgui/timeRasterGlobalData.h> #include <cstdio> #include <cmath> #include <iostream> diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 68dfa25aa..93d8819fd 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <timerasterdisplayform.h> +#include <qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index f3594d58a..0e9573385 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.h +++ b/gr-qtgui/lib/time_raster_sink_c_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <time_rasterdisplayform.h> +#include <qtgui/time_rasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 1d7d79120..fcaab8126 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <timerasterdisplayform.h> +#include <qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 96bdf937b..5a52a9131 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_C_IMPL_H #include <qtgui/time_sink_c.h> -#include <timedisplayform.h> +#include <qtgui/timedisplayform.h> #include <gruel/thread.h> #include <gruel/high_res_timer.h> diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 522511da0..3d4f6417a 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -24,7 +24,7 @@ #define INCLUDED_QTGUI_TIME_SINK_F_IMPL_H #include <qtgui/time_sink_f.h> -#include <timedisplayform.h> +#include <qtgui/timedisplayform.h> #include <gruel/thread.h> #include <gruel/high_res_timer.h> diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 5e1fbfb57..3ae6f93d0 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -22,7 +22,7 @@ #include <cmath> #include <QMessageBox> -#include <timedisplayform.h> +#include <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 ed17cf45c..50c63ad54 100644 --- a/gr-qtgui/lib/timerasterdisplayform.cc +++ b/gr-qtgui/lib/timerasterdisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <timerasterdisplayform.h> +#include <qtgui/timerasterdisplayform.h> #include <iostream> TimeRasterDisplayForm::TimeRasterDisplayForm(int nplots, diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc index 8eb175b2c..2085acf8f 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 <waterfallGlobalData.h> +#include <qtgui/waterfallGlobalData.h> #include <cstdio> WaterfallData::WaterfallData(const double minimumFrequency, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 1d709c6c5..d9a90875a 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -28,7 +28,7 @@ #include <fft/fft.h> #include <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <waterfalldisplayform.h> +#include <qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 6185a2539..c204ef150 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -23,13 +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 <gruel/high_res_timer.h> #include <gruel/thread.h> -#include <waterfalldisplayform.h> +#include <qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index e42e63fbc..23b2a486b 100644 --- a/gr-qtgui/lib/waterfalldisplayform.cc +++ b/gr-qtgui/lib/waterfalldisplayform.cc @@ -23,7 +23,7 @@ #include <cmath> #include <QColorDialog> #include <QMessageBox> -#include <waterfalldisplayform.h> +#include <qtgui/waterfalldisplayform.h> #include <iostream> WaterfallDisplayForm::WaterfallDisplayForm(int nplots, QWidget* parent) |