diff options
Diffstat (limited to 'gr-qtgui')
92 files changed, 361 insertions, 345 deletions
diff --git a/gr-qtgui/CMakeLists.txt b/gr-qtgui/CMakeLists.txt index 22cc2d7bf3..372f8a42bc 100644 --- a/gr-qtgui/CMakeLists.txt +++ b/gr-qtgui/CMakeLists.txt @@ -46,9 +46,8 @@ GR_REGISTER_COMPONENT("gr-qtgui" ENABLE_GR_QTGUI Boost_FOUND QT4_FOUND QWT_FOUND - ENABLE_GRUEL ENABLE_VOLK - ENABLE_GR_CORE + ENABLE_GNURADIO_RUNTIME ENABLE_GR_FFT ENABLE_GR_FILTER PYTHONLIBS_FOUND diff --git a/gr-qtgui/apps/gr_constellation_plot b/gr-qtgui/apps/gr_constellation_plot index 0687443218..559b643c53 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 f2789ef34b..6ade908bd4 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 c6b70baf27..792b04290b 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 059f65cd99..bb4fad1b7a 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 be9c981532..dcb0305bf5 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 a7c39a24b9..174b3ee1ed 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 9b29709b10..9140b61220 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 a326a126c4..3e81c317d6 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 a6cb897c0b..6b5e5c20e9 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 52c888cff3..eaab7599c7 100644 --- a/gr-qtgui/apps/plot_base.py +++ b/gr-qtgui/apps/plot_base.py @@ -25,6 +25,8 @@ from gnuradio.eng_option import eng_option from optparse import OptionParser import os, sys +os.environ['GR_CONF_CONTROLPORT_ON'] = 'False' + try: from gnuradio import qtgui from PyQt4 import QtGui, QtCore @@ -91,7 +93,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 +124,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 +136,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 +148,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 a4a6cb871a..bb1567e014 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 adfbfd032f..a3fdf65117 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 c80bace1b6..942500c627 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 ff3cc2869d..2fc498ba28 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 445d6d4fc1..fef4f448b4 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/apps/uhd_display.py b/gr-qtgui/apps/uhd_display.py index 81950b99aa..0e0c8a177d 100755 --- a/gr-qtgui/apps/uhd_display.py +++ b/gr-qtgui/apps/uhd_display.py @@ -235,7 +235,7 @@ class my_top_block(gr.top_block): self.lock() # Add file sink to save data - self.file_sink = gr.file_sink(gr.sizeof_gr_complex, name) + self.file_sink = blocks.file_sink(gr.sizeof_gr_complex, name) self.connect(self.amp, self.file_sink) self.unlock() diff --git a/gr-qtgui/examples/pyqt_time_raster_b.py b/gr-qtgui/examples/pyqt_time_raster_b.py index b29403819d..4cad9de601 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 957e694b38..c5261520db 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/gnuradio-qtgui.pc.in b/gr-qtgui/gnuradio-qtgui.pc.in index 27b6a21bff..8f0dcd53f7 100644 --- a/gr-qtgui/gnuradio-qtgui.pc.in +++ b/gr-qtgui/gnuradio-qtgui.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-qtgui Description: GNU Radio blocks for QT GUI -Requires: gnuradio-core +Requires: gnuradio-runtime Version: @LIBVER@ Libs: -L${libdir} -lgnuradio-qtgui Cflags: -I${includedir} diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml index 5a17f7d511..176a907e9e 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -18,6 +18,7 @@ qtgui.$(type.fcn)( $fc, \#fc $bw, \#bw $name, \#name + $nconnections \#number of inputs ) self.$(id).set_update_time($update_time) self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget) @@ -90,6 +91,13 @@ $(gui_hint()($win))</make> <type>real</type> </param> <param> + <name>Number of Inputs</name> + <key>nconnections</key> + <value>1</value> + <type>int</type> + <hide>part</hide> + </param> + <param> <name>Update Period</name> <key>update_time</key> <value>0.10</value> @@ -106,7 +114,7 @@ $(gui_hint()($win))</make> <sink> <name>in</name> <type>$type</type> - <nports>1</nports> + <nports>$nconnections</nports> </sink> <doc> The GUI hint can be used to position the widget within the application. \ diff --git a/gr-qtgui/include/qtgui/CMakeLists.txt b/gr-qtgui/include/qtgui/CMakeLists.txt index f3ef6808e8..8f95837fec 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 b68b01f6d8..2c33a74301 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 d9ee16e087..d9ee16e087 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 22d2be0055..ae438f143f 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 9a2233d168..48b6a37501 100644 --- a/gr-qtgui/lib/SpectrumGUIClass.h +++ b/gr-qtgui/include/qtgui/SpectrumGUIClass.h @@ -23,15 +23,15 @@ #ifndef SPECTRUM_GUI_CLASS_HPP #define SPECTRUM_GUI_CLASS_HPP -#include <gruel/thread.h> +#include <thread/thread.h> #include <qwidget.h> #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> @@ -66,7 +66,7 @@ public: const uint64_t, const float*, const uint64_t, const float*, const uint64_t, - const gruel::high_res_timer_type, const bool); + const gr::high_res_timer_type, const bool); float getPowerValue(); void setPowerValue(const float); @@ -78,8 +78,8 @@ public: int getFFTSizeIndex(); void setFFTSize(const int); - gruel::high_res_timer_type getLastGUIUpdateTime(); - void setLastGUIUpdateTime(const gruel::high_res_timer_type); + gr::high_res_timer_type getLastGUIUpdateTime(); + void setLastGUIUpdateTime(const gr::high_res_timer_type); unsigned int getPendingGUIUpdateEvents(); void incrementPendingGUIUpdateEvents(); @@ -103,7 +103,7 @@ protected: private: - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int64_t _dataPoints; std::string _title; double _centerFrequency; @@ -114,7 +114,7 @@ private: int _windowType; int64_t _lastDataPointCount; int _fftSize; - gruel::high_res_timer_type _lastGUIUpdateTime; + gr::high_res_timer_type _lastGUIUpdateTime; unsigned int _pendingGUIUpdateEventsCount; int _droppedEntriesCount; bool _fftBuffersCreatedFlag; diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/include/qtgui/TimeDomainDisplayPlot.h index 9996f84fc3..f7e695d51b 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 e4e292a54d..fce22e9df1 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 <gruel/high_res_timer.h> +#include <qtgui/DisplayPlot.h> +#include <qtgui/timeRasterGlobalData.h> +#include <qtgui/plot_raster.h> +#include <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 6637adc594..6659f4f2d6 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 <gruel/high_res_timer.h> +#include <qtgui/DisplayPlot.h> +#include <qtgui/waterfallGlobalData.h> +#include <high_res_timer.h> #if QWT_VERSION < 0x060000 -#include <plot_waterfall.h> +#include <qtgui/plot_waterfall.h> #else #include <qwt_compat.h> #endif @@ -61,14 +61,14 @@ public: void plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames); // to be removed void plotNewData(const double* dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames); void setIntensityRange(const double minIntensity, const double maxIntensity); @@ -111,7 +111,7 @@ private: std::vector<QwtPlotSpectrogram*> d_spectrogram; #endif - gruel::high_res_timer_type _lastReplot; + gr::high_res_timer_type _lastReplot; std::vector<int> _intensityColorMapType; QColor _userDefinedLowIntensityColor; diff --git a/gr-qtgui/include/qtgui/api.h b/gr-qtgui/include/qtgui/api.h index e88948e07b..888dd656c8 100644 --- a/gr-qtgui/include/qtgui/api.h +++ b/gr-qtgui/include/qtgui/api.h @@ -22,7 +22,7 @@ #ifndef INCLUDED_QTGUI_API_H #define INCLUDED_QTGUI_API_H -#include <gruel/attributes.h> +#include <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/qtgui/const_sink_c.h index e0c358bcad..b81c53295f 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 06a8e7ed5f..40cfe8999f 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 31dc757bb6..47f17ad41d 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 63ab35ed95..7f5b8ae6e7 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 b22cd93c51..2daba90919 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 7bea0a4d57..5692cc4ba8 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 40ee4eccb3..4c764fd764 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 f4b16dfef2..135350dbb8 100644 --- a/gr-qtgui/lib/qtgui_types.h +++ b/gr-qtgui/include/qtgui/qtgui_types.h @@ -25,7 +25,7 @@ #include <qwt_color_map.h> #include <qwt_scale_draw.h> -#include <gruel/high_res_timer.h> +#include <high_res_timer.h> class FreqOffsetAndPrecisionClass { @@ -80,14 +80,14 @@ public: { } - virtual gruel::high_res_timer_type getZeroTime() const + virtual gr::high_res_timer_type getZeroTime() const { return _zeroTime; } - virtual void setZeroTime(const gruel::high_res_timer_type newTime) + virtual void setZeroTime(const gr::high_res_timer_type newTime) { - _zeroTime = newTime - gruel::high_res_timer_epoch(); + _zeroTime = newTime - gr::high_res_timer_epoch(); } virtual void setSecondsPerLine(const double newTime) @@ -104,7 +104,7 @@ public: protected: private: - gruel::high_res_timer_type _zeroTime; + gr::high_res_timer_type _zeroTime; double _secondsPerLine; }; diff --git a/gr-qtgui/lib/spectrumUpdateEvents.h b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h index 97d9c90146..df61f7fdb2 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.h +++ b/gr-qtgui/include/qtgui/spectrumUpdateEvents.h @@ -28,7 +28,7 @@ #include <QString> #include <complex> #include <vector> -#include <gruel/high_res_timer.h> +#include <high_res_timer.h> static const int SpectrumUpdateEventType = 10005; static const int SpectrumWindowCaptionEventType = 10008; @@ -43,10 +43,10 @@ public: const double* realTimeDomainPoints, const double* imagTimeDomainPoints, const uint64_t numTimeDomainDataPoints, - const gruel::high_res_timer_type dataTimestamp, + const gr::high_res_timer_type dataTimestamp, const bool repeatDataFlag, const bool lastOfMultipleUpdateFlag, - const gruel::high_res_timer_type generatedTimestamp, + const gr::high_res_timer_type generatedTimestamp, const int droppedFFTFrames); ~SpectrumUpdateEvent(); @@ -56,10 +56,10 @@ public: const double* getImagTimeDomainPoints() const; uint64_t getNumFFTDataPoints() const; uint64_t getNumTimeDomainDataPoints() const; - gruel::high_res_timer_type getDataTimestamp() const; + gr::high_res_timer_type getDataTimestamp() const; bool getRepeatDataFlag() const; bool getLastOfMultipleUpdateFlag() const; - gruel::high_res_timer_type getEventGeneratedTimestamp() const; + gr::high_res_timer_type getEventGeneratedTimestamp() const; int getDroppedFFTFrames() const; protected: @@ -70,10 +70,10 @@ private: double* _imagDataTimeDomainPoints; uint64_t _numFFTDataPoints; uint64_t _numTimeDomainDataPoints; - gruel::high_res_timer_type _dataTimestamp; + gr::high_res_timer_type _dataTimestamp; bool _repeatDataFlag; bool _lastOfMultipleUpdateFlag; - gruel::high_res_timer_type _eventGeneratedTimestamp; + gr::high_res_timer_type _eventGeneratedTimestamp; int _droppedFFTFrames; }; @@ -209,7 +209,7 @@ class WaterfallUpdateEvent: public QEvent public: WaterfallUpdateEvent(const std::vector<double*> dataPoints, const uint64_t numDataPoints, - const gruel::high_res_timer_type dataTimestamp); + const gr::high_res_timer_type dataTimestamp); ~WaterfallUpdateEvent(); @@ -218,7 +218,7 @@ public: uint64_t getNumDataPoints() const; bool getRepeatDataFlag() const; - gruel::high_res_timer_type getDataTimestamp() const; + gr::high_res_timer_type getDataTimestamp() const; static QEvent::Type Type() { return QEvent::Type(SpectrumUpdateEventType); } @@ -230,7 +230,7 @@ private: std::vector<double*> _dataPoints; uint64_t _numDataPoints; - gruel::high_res_timer_type _dataTimestamp; + gr::high_res_timer_type _dataTimestamp; }; diff --git a/gr-qtgui/lib/spectrumdisplayform.h b/gr-qtgui/include/qtgui/spectrumdisplayform.h index c5b714e73f..37a481245c 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 0a414432d1..0a414432d1 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 4bc99f622d..4df4698e3f 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 f5341f5ecf..8c68c52bca 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 8ab9590d0b..8ab9590d0b 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 959f2fea68..56efe4ed27 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 2395136e08..7114c6c390 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) @@ -103,13 +104,12 @@ include_directories( ${GR_QTGUI_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} ${VOLK_INCLUDE_DIRS} ${QWT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${FFTW3F_INCLUDE_DIRS} - ${LOG4CXX_INCLUDE_DIRS} + ${LOG4CPP_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ) @@ -117,7 +117,7 @@ include_directories( link_directories( ${QWT_LIBRARY_DIRS} ${FFTW3F_LIBRARY_DIRS} - ${LOG4CXX_LIBRARY_DIRS} + ${LOG4CPP_LIBRARY_DIRS} ${Boost_LIBRARY_DIRS} ) @@ -132,7 +132,7 @@ endif(ENABLE_GR_CTRLPORT) # Setup library ######################################################################## list(APPEND qtgui_libs - gnuradio-core + gnuradio-runtime gnuradio-fft gnuradio-filter volk @@ -140,38 +140,10 @@ list(APPEND qtgui_libs ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${FFTW3F_LIBRARIES} - ${LOG4CXX_LIBRARIES} + ${LOG4CPP_LIBRARIES} ) 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 f3951534a9..7e2f11e6d6 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 1c9de3d0ae..227cf9cc9e 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 e279155544..56e63100c7 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 40c7fb02b6..020cd8218a 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> @@ -126,7 +126,7 @@ SpectrumGUIClass::openSpectrumWindow(QWidget* parent, _lastGUIUpdateTime = 0; // Draw Blank Display - updateWindow(false, NULL, 0, NULL, 0, NULL, 0, gruel::high_res_timer_now(), true); + updateWindow(false, NULL, 0, NULL, 0, NULL, 0, gr::high_res_timer_now(), true); // Set up the initial frequency axis settings setFrequencyRange(_centerFrequency, _startFrequency, _stopFrequency); @@ -164,7 +164,7 @@ SpectrumGUIClass::setDisplayTitle(const std::string newString) bool SpectrumGUIClass::getWindowOpenFlag() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); bool returnFlag = false; returnFlag = _windowOpennedFlag; return returnFlag; @@ -174,7 +174,7 @@ SpectrumGUIClass::getWindowOpenFlag() void SpectrumGUIClass::setWindowOpenFlag(const bool newFlag) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _windowOpennedFlag = newFlag; } @@ -183,7 +183,7 @@ SpectrumGUIClass::setFrequencyRange(const double centerFreq, const double startFreq, const double stopFreq) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _centerFrequency = centerFreq; _startFrequency = startFreq; _stopFrequency = stopFreq; @@ -196,7 +196,7 @@ SpectrumGUIClass::setFrequencyRange(const double centerFreq, double SpectrumGUIClass::getStartFrequency() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); double returnValue = 0.0; returnValue = _startFrequency; return returnValue; @@ -205,7 +205,7 @@ SpectrumGUIClass::getStartFrequency() double SpectrumGUIClass::getStopFrequency() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); double returnValue = 0.0; returnValue = _stopFrequency; return returnValue; @@ -214,7 +214,7 @@ SpectrumGUIClass::getStopFrequency() double SpectrumGUIClass::getCenterFrequency() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); double returnValue = 0.0; returnValue = _centerFrequency; return returnValue; @@ -229,10 +229,10 @@ SpectrumGUIClass::updateWindow(const bool updateDisplayFlag, const uint64_t realTimeDomainDataSize, const float* complexTimeDomainData, const uint64_t complexTimeDomainDataSize, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const bool lastOfMultipleFFTUpdateFlag) { - //gruel::scoped_lock lock(d_mutex); + //gr::thread::scoped_lock lock(d_mutex); int64_t bufferSize = inputBufferSize; bool repeatDataFlag = false; if(bufferSize > _dataPoints){ @@ -279,10 +279,10 @@ SpectrumGUIClass::updateWindow(const bool updateDisplayFlag, _lastDataPointCount = bufferSize; } - const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now(); - const gruel::high_res_timer_type lastUpdateGUITime = getLastGUIUpdateTime(); + const gr::high_res_timer_type currentTime = gr::high_res_timer_now(); + const gr::high_res_timer_type lastUpdateGUITime = getLastGUIUpdateTime(); - if((currentTime - lastUpdateGUITime > (4*_updateTime)*gruel::high_res_timer_tps()) && + if((currentTime - lastUpdateGUITime > (4*_updateTime)*gr::high_res_timer_tps()) && (getPendingGUIUpdateEvents() > 0) && lastUpdateGUITime != 0) { // Do not update the display if too much data is pending to be displayed _droppedEntriesCount++; @@ -312,7 +312,7 @@ SpectrumGUIClass::updateWindow(const bool updateDisplayFlag, float SpectrumGUIClass::getPowerValue() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); float returnValue = 0; returnValue = _powerValue; return returnValue; @@ -321,14 +321,14 @@ SpectrumGUIClass::getPowerValue() void SpectrumGUIClass::setPowerValue(const float value) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _powerValue = value; } int SpectrumGUIClass::getWindowType() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); int returnValue = 0; returnValue = _windowType; return returnValue; @@ -337,7 +337,7 @@ SpectrumGUIClass::getWindowType() void SpectrumGUIClass::setWindowType(const int newType) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _windowType = newType; } @@ -352,7 +352,7 @@ SpectrumGUIClass::getFFTSize() int SpectrumGUIClass::getFFTSizeIndex() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); int fftsize = getFFTSize(); switch(fftsize) { case(1024): return 0; break; @@ -368,30 +368,30 @@ SpectrumGUIClass::getFFTSizeIndex() void SpectrumGUIClass::setFFTSize(const int newSize) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _fftSize = newSize; } -gruel::high_res_timer_type +gr::high_res_timer_type SpectrumGUIClass::getLastGUIUpdateTime() { - gruel::scoped_lock lock(d_mutex); - gruel::high_res_timer_type returnValue; + gr::thread::scoped_lock lock(d_mutex); + gr::high_res_timer_type returnValue; returnValue = _lastGUIUpdateTime; return returnValue; } void -SpectrumGUIClass::setLastGUIUpdateTime(const gruel::high_res_timer_type newTime) +SpectrumGUIClass::setLastGUIUpdateTime(const gr::high_res_timer_type newTime) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _lastGUIUpdateTime = newTime; } unsigned int SpectrumGUIClass::getPendingGUIUpdateEvents() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); unsigned int returnValue = 0; returnValue = _pendingGUIUpdateEventsCount; return returnValue; @@ -400,14 +400,14 @@ SpectrumGUIClass::getPendingGUIUpdateEvents() void SpectrumGUIClass::incrementPendingGUIUpdateEvents() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _pendingGUIUpdateEventsCount++; } void SpectrumGUIClass::decrementPendingGUIUpdateEvents() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); if(_pendingGUIUpdateEventsCount > 0){ _pendingGUIUpdateEventsCount--; } @@ -416,7 +416,7 @@ SpectrumGUIClass::decrementPendingGUIUpdateEvents() void SpectrumGUIClass::resetPendingGUIUpdateEvents() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _pendingGUIUpdateEventsCount = 0; } @@ -424,14 +424,14 @@ SpectrumGUIClass::resetPendingGUIUpdateEvents() QWidget* SpectrumGUIClass::qwidget() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); return (QWidget*)_spectrumDisplayForm; } void SpectrumGUIClass::setTimeDomainAxis(double min, double max) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _spectrumDisplayForm->setTimeDomainAxis(min, max); } @@ -439,14 +439,14 @@ void SpectrumGUIClass::setConstellationAxis(double xmin, double xmax, double ymin, double ymax) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _spectrumDisplayForm->setConstellationAxis(xmin, xmax, ymin, ymax); } void SpectrumGUIClass::setConstellationPenSize(int size) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _spectrumDisplayForm->setConstellationPenSize(size); } @@ -454,14 +454,14 @@ SpectrumGUIClass::setConstellationPenSize(int size) void SpectrumGUIClass::setFrequencyAxis(double min, double max) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _spectrumDisplayForm->setFrequencyAxis(min, max); } void SpectrumGUIClass::setUpdateTime(double t) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); _updateTime = t; _spectrumDisplayForm->setUpdateTime(_updateTime); } diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index 032da2547d..13e24c2a97 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 48fb7f7b4a..66b38c52f2 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 05c89e3ecb..aa78000741 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> @@ -264,7 +264,7 @@ void WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames) { if(!_stop) { @@ -283,7 +283,7 @@ WaterfallDisplayPlot::plotNewData(const std::vector<double*> dataPoints, replot(); } - _lastReplot = gruel::high_res_timer_now(); + _lastReplot = gr::high_res_timer_now(); } for(int i = 0; i < _nplots; i++) { @@ -312,7 +312,7 @@ void WaterfallDisplayPlot::plotNewData(const double* dataPoints, const int64_t numDataPoints, const double timePerFFT, - const gruel::high_res_timer_type timestamp, + const gr::high_res_timer_type timestamp, const int droppedFrames) { std::vector<double*> vecDataPoints; @@ -569,7 +569,7 @@ WaterfallDisplayPlot::_updateIntensityRangeDisplay() replot(); // Update the last replot timer - _lastReplot = gruel::high_res_timer_now(); + _lastReplot = gr::high_res_timer_now(); } #endif /* WATERFALL_DISPLAY_PLOT_C */ diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index b623dc2175..9064be4ebe 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -145,7 +145,7 @@ namespace gr { const_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -244,7 +244,7 @@ namespace gr { void const_sink_c_impl::set_nsamps(const int newsize) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); if(newsize != d_size) { // Resize residbuf and replace data @@ -325,8 +325,8 @@ namespace gr { } // Update the plot if its time - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new ConstUpdateEvent(d_residbufs_real, d_residbufs_imag, diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index 81cdb9881f..02b25409e6 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_QTGUI_CONST_SINK_C_IMPL_H #include <qtgui/const_sink_c.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <constellationdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/constellationdisplayform.h> namespace gr { namespace qtgui { @@ -36,7 +36,7 @@ namespace gr { private: void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_size; std::string d_name; @@ -49,8 +49,8 @@ namespace gr { QWidget *d_parent; ConstellationDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void npoints_resize(); diff --git a/gr-qtgui/lib/constellationdisplayform.cc b/gr-qtgui/lib/constellationdisplayform.cc index e3c65ec41d..bfd17b9c11 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 276539cdde..3439db31ee 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> @@ -151,7 +151,7 @@ void DisplayForm::mousePressEvent( QMouseEvent * e) { bool ctrloff = Qt::ControlModifier != QApplication::keyboardModifiers(); - if((e->button() == Qt::MiddleButton) && ctrloff && (_menu_on)) { + if((e->button() == Qt::MidButton) && ctrloff && (_menu_on)) { if(_stop_state == false) _stop_act->setText(tr("Stop")); else diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index b1f9a2b1a1..4508750457 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -208,7 +208,7 @@ namespace gr { freq_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -376,7 +376,7 @@ namespace gr { void freq_sink_c_impl::fftresize() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); int newfftsize = d_main_gui->getFFTSize(); d_fftavg = d_main_gui->getFFTAverage(); @@ -443,8 +443,8 @@ namespace gr { //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new FreqUpdateEvent(d_magbufs, d_fftsize)); } diff --git a/gr-qtgui/lib/freq_sink_c_impl.h b/gr-qtgui/lib/freq_sink_c_impl.h index 0567b914c8..ef17079567 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.h +++ b/gr-qtgui/lib/freq_sink_c_impl.h @@ -26,9 +26,9 @@ #include <qtgui/freq_sink_c.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <freqdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/freqdisplayform.h> namespace gr { namespace qtgui { @@ -40,7 +40,7 @@ namespace gr { void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_fftsize; float d_fftavg; @@ -62,8 +62,8 @@ namespace gr { QWidget *d_parent; FreqDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void windowreset(); void buildwindow(); diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index f357ae10be..6028c8ec4e 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -208,7 +208,7 @@ namespace gr { freq_sink_f_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -357,7 +357,7 @@ namespace gr { void freq_sink_f_impl::windowreset() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); filter::firdes::win_type newwintype; newwintype = d_main_gui->getFFTWindowType(); @@ -379,7 +379,7 @@ namespace gr { void freq_sink_f_impl::fftresize() { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); int newfftsize = d_main_gui->getFFTSize(); d_fftavg = d_main_gui->getFFTAverage(); @@ -446,8 +446,8 @@ namespace gr { //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new FreqUpdateEvent(d_magbufs, d_fftsize)); } diff --git a/gr-qtgui/lib/freq_sink_f_impl.h b/gr-qtgui/lib/freq_sink_f_impl.h index b79127f3dd..6f4d9d2062 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.h +++ b/gr-qtgui/lib/freq_sink_f_impl.h @@ -26,9 +26,9 @@ #include <qtgui/freq_sink_f.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <freqdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/freqdisplayform.h> namespace gr { namespace qtgui { @@ -40,7 +40,7 @@ namespace gr { void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_fftsize; float d_fftavg; @@ -62,8 +62,8 @@ namespace gr { QWidget *d_parent; FreqDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void windowreset(); void buildwindow(); diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index c90e8b7961..adcc09dc4b 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 76bff473e9..6d31a2596c 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 84915e3f31..5a378767be 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.cc b/gr-qtgui/lib/sink_c_impl.cc index a8a0526e77..aab5be54bf 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -137,7 +137,7 @@ namespace gr { // initialize update time to 10 times a second set_update_time(0.5); - d_last_update = gruel::high_res_timer_now(); + d_last_update = gr::high_res_timer_now(); d_update_active = false; } @@ -215,7 +215,7 @@ namespace gr { void sink_c_impl::set_update_time(double t) { - d_update_time = t * gruel::high_res_timer_tps(); + d_update_time = t * gr::high_res_timer_tps(); d_main_gui->setUpdateTime(t); } @@ -300,18 +300,18 @@ namespace gr { unsigned int datasize = noutput_items - i; unsigned int resid = d_fftsize-d_index; - if (!d_update_active && (gruel::high_res_timer_now() - d_last_update) < d_update_time) { + if (!d_update_active && (gr::high_res_timer_now() - d_last_update) < d_update_time) { consume_each(noutput_items); return noutput_items; } else { - d_last_update = gruel::high_res_timer_now(); + d_last_update = gr::high_res_timer_now(); d_update_active = true; } // If we have enough input for one full FFT, do it if(datasize >= resid) { - const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now(); + const gr::high_res_timer_type currentTime = gr::high_res_timer_now(); // Fill up residbuf with d_fftsize number of items memcpy(d_residbuf+d_index, &in[j], sizeof(gr_complex)*resid); diff --git a/gr-qtgui/lib/sink_c_impl.h b/gr-qtgui/lib/sink_c_impl.h index ddfb0865d5..77ddf79a0e 100644 --- a/gr-qtgui/lib/sink_c_impl.h +++ b/gr-qtgui/lib/sink_c_impl.h @@ -26,8 +26,8 @@ #include <qtgui/sink_c.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <SpectrumGUIClass.h> +#include <high_res_timer.h> +#include <qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { @@ -45,7 +45,7 @@ namespace gr { double d_center_freq; double d_bandwidth; std::string d_name; - gruel::high_res_timer_type d_last_update; + gr::high_res_timer_type d_last_update; bool d_update_active; bool d_shift; @@ -57,7 +57,7 @@ namespace gr { bool d_plotfreq, d_plotwaterfall, d_plottime, d_plotconst; - gruel::high_res_timer_type d_update_time; + gr::high_res_timer_type d_update_time; QWidget *d_parent; SpectrumGUIClass *d_main_gui; diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 5cb14db672..1fb2bbdbb7 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -297,7 +297,7 @@ namespace gr { // If we have enough input for one full FFT, do it if(datasize >= resid) { - const gruel::high_res_timer_type currentTime = gruel::high_res_timer_now(); + const gr::high_res_timer_type currentTime = gr::high_res_timer_now(); // Fill up residbuf with d_fftsize number of items memcpy(d_residbuf+d_index, &in[j], sizeof(float)*resid); diff --git a/gr-qtgui/lib/sink_f_impl.h b/gr-qtgui/lib/sink_f_impl.h index 394d5c3428..24dff8d6b3 100644 --- a/gr-qtgui/lib/sink_f_impl.h +++ b/gr-qtgui/lib/sink_f_impl.h @@ -26,8 +26,8 @@ #include <qtgui/sink_f.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <SpectrumGUIClass.h> +#include <high_res_timer.h> +#include <qtgui/SpectrumGUIClass.h> namespace gr { namespace qtgui { diff --git a/gr-qtgui/lib/spectrumUpdateEvents.cc b/gr-qtgui/lib/spectrumUpdateEvents.cc index bda89651b6..21b1f4d6d9 100644 --- a/gr-qtgui/lib/spectrumUpdateEvents.cc +++ b/gr-qtgui/lib/spectrumUpdateEvents.cc @@ -23,17 +23,17 @@ #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, const double* realTimeDomainPoints, const double* imagTimeDomainPoints, const uint64_t numTimeDomainDataPoints, - const gruel::high_res_timer_type dataTimestamp, + const gr::high_res_timer_type dataTimestamp, const bool repeatDataFlag, const bool lastOfMultipleUpdateFlag, - const gruel::high_res_timer_type generatedTimestamp, + const gr::high_res_timer_type generatedTimestamp, const int droppedFFTFrames) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { @@ -112,7 +112,7 @@ SpectrumUpdateEvent::getNumTimeDomainDataPoints() const return _numTimeDomainDataPoints; } -gruel::high_res_timer_type +gr::high_res_timer_type SpectrumUpdateEvent::getDataTimestamp() const { return _dataTimestamp; @@ -130,7 +130,7 @@ SpectrumUpdateEvent::getLastOfMultipleUpdateFlag() const return _lastOfMultipleUpdateFlag; } -gruel::high_res_timer_type +gr::high_res_timer_type SpectrumUpdateEvent::getEventGeneratedTimestamp() const { return _eventGeneratedTimestamp; @@ -348,7 +348,7 @@ ConstUpdateEvent::getNumDataPoints() const WaterfallUpdateEvent::WaterfallUpdateEvent(const std::vector<double*> dataPoints, const uint64_t numDataPoints, - const gruel::high_res_timer_type dataTimestamp) + const gr::high_res_timer_type dataTimestamp) : QEvent(QEvent::Type(SpectrumUpdateEventType)) { if(numDataPoints < 1) { @@ -389,7 +389,7 @@ WaterfallUpdateEvent::getNumDataPoints() const return _numDataPoints; } -gruel::high_res_timer_type +gr::high_res_timer_type WaterfallUpdateEvent::getDataTimestamp() const { return _dataTimestamp; diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc index 8d7caebda8..24f15886ba 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) @@ -192,10 +192,10 @@ SpectrumDisplayForm::newFrequencyData( const SpectrumUpdateEvent* spectrumUpdate const float* fftMagDataPoints = spectrumUpdateEvent->getFFTPoints(); const uint64_t numFFTDataPoints = spectrumUpdateEvent->getNumFFTDataPoints(); const uint64_t numTimeDomainDataPoints = spectrumUpdateEvent->getNumTimeDomainDataPoints(); - const gruel::high_res_timer_type dataTimestamp = spectrumUpdateEvent->getDataTimestamp(); + const gr::high_res_timer_type dataTimestamp = spectrumUpdateEvent->getDataTimestamp(); const bool repeatDataFlag = spectrumUpdateEvent->getRepeatDataFlag(); const bool lastOfMultipleUpdatesFlag = spectrumUpdateEvent->getLastOfMultipleUpdateFlag(); - const gruel::high_res_timer_type generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp(); + const gr::high_res_timer_type generatedTimestamp = spectrumUpdateEvent->getEventGeneratedTimestamp(); double* realTimeDomainDataPoints = (double*)spectrumUpdateEvent->getRealTimeDomainPoints(); double* imagTimeDomainDataPoints = (double*)spectrumUpdateEvent->getImagTimeDomainPoints(); diff --git a/gr-qtgui/lib/spectrumdisplayform.ui b/gr-qtgui/lib/spectrumdisplayform.ui index f1e1f08f98..e1ebfa8197 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 556196f644..6ebef5f47e 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.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index d90661b968..6ec6c6075b 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -153,7 +153,7 @@ namespace gr { time_raster_sink_b_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -404,8 +404,8 @@ namespace gr { d_tmpflt, resid); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new TimeRasterUpdateEvent(d_residbufs, d_icols)); } diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.h b/gr-qtgui/lib/time_raster_sink_b_impl.h index 68dfa25aac..09c471fcfc 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.h +++ b/gr-qtgui/lib/time_raster_sink_b_impl.h @@ -26,9 +26,9 @@ #include <qtgui/time_raster_sink_b.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <timerasterdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { @@ -56,8 +56,8 @@ namespace gr { std::vector<float> d_offset; double d_samp_rate; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; public: time_raster_sink_b_impl(double samp_rate, diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.cc b/gr-qtgui/lib/time_raster_sink_c_impl.cc index 17098f0d93..1c71258030 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_c_impl.cc @@ -126,7 +126,7 @@ namespace gr { time_raster_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); } @@ -193,8 +193,8 @@ namespace gr { memcpy(d_residbufs[n]+d_index, &in[j], sizeof(gr_complex)*resid); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new TimeRasterUpdateEvent(d_residbufs, d_fftsize, diff --git a/gr-qtgui/lib/time_raster_sink_c_impl.h b/gr-qtgui/lib/time_raster_sink_c_impl.h index f3594d58a5..9f8a463bf8 100644 --- a/gr-qtgui/lib/time_raster_sink_c_impl.h +++ b/gr-qtgui/lib/time_raster_sink_c_impl.h @@ -26,9 +26,9 @@ #include <qtgui/time_raster_sink_c.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <time_rasterdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/time_rasterdisplayform.h> namespace gr { namespace qtgui { @@ -52,8 +52,8 @@ namespace gr { unsigned int d_rows, d_cols; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; public: time_raster_sink_c_impl(unsignedint rows, diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 39237e2912..b6b0a1fc7d 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -151,7 +151,7 @@ namespace gr { time_raster_sink_f_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -401,8 +401,8 @@ namespace gr { } // Update the plot if its time - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new TimeRasterUpdateEvent(d_residbufs, d_cols)); } diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.h b/gr-qtgui/lib/time_raster_sink_f_impl.h index 1d7d791202..fad731570c 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.h +++ b/gr-qtgui/lib/time_raster_sink_f_impl.h @@ -26,9 +26,9 @@ #include <qtgui/time_raster_sink_f.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <timerasterdisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/timerasterdisplayform.h> namespace gr { namespace qtgui { @@ -55,8 +55,8 @@ namespace gr { std::vector<float> d_offset; double d_samp_rate; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; public: time_raster_sink_f_impl(double samp_rate, diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 2edb83fa12..f8ff758218 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -138,7 +138,7 @@ namespace gr { time_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -237,7 +237,7 @@ namespace gr { void time_sink_c_impl::set_nsamps(const int newsize) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); if(newsize != d_size) { // Resize residbuf and replace data @@ -260,7 +260,7 @@ namespace gr { void time_sink_c_impl::set_samp_rate(const double samp_rate) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); d_samp_rate = samp_rate; d_main_gui->setSampleRate(d_samp_rate); } @@ -347,8 +347,8 @@ namespace gr { } // Update the plot if its time - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new TimeUpdateEvent(d_residbufs, d_size)); } diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 96bdf937b1..2f9765c2c5 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_QTGUI_TIME_SINK_C_IMPL_H #include <qtgui/time_sink_c.h> -#include <timedisplayform.h> -#include <gruel/thread.h> -#include <gruel/high_res_timer.h> +#include <qtgui/timedisplayform.h> +#include <thread/thread.h> +#include <high_res_timer.h> namespace gr { namespace qtgui { @@ -36,7 +36,7 @@ namespace gr { private: void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_size; double d_samp_rate; @@ -49,8 +49,8 @@ namespace gr { QWidget *d_parent; TimeDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void npoints_resize(); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 39a62d3d6b..6011751b2b 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -138,7 +138,7 @@ namespace gr { time_sink_f_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -237,7 +237,7 @@ namespace gr { void time_sink_f_impl::set_nsamps(const int newsize) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); if(newsize != d_size) { // Resize residbuf and replace data @@ -260,7 +260,7 @@ namespace gr { void time_sink_f_impl::set_samp_rate(const double samp_rate) { - gruel::scoped_lock lock(d_mutex); + gr::thread::scoped_lock lock(d_mutex); d_samp_rate = samp_rate; d_main_gui->setSampleRate(d_samp_rate); } @@ -346,8 +346,8 @@ namespace gr { } // Update the plot if its time - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new TimeUpdateEvent(d_residbufs, d_size)); } diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 522511da01..1012ffbd77 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -24,9 +24,9 @@ #define INCLUDED_QTGUI_TIME_SINK_F_IMPL_H #include <qtgui/time_sink_f.h> -#include <timedisplayform.h> -#include <gruel/thread.h> -#include <gruel/high_res_timer.h> +#include <qtgui/timedisplayform.h> +#include <thread/thread.h> +#include <high_res_timer.h> namespace gr { namespace qtgui { @@ -36,7 +36,7 @@ namespace gr { private: void initialize(); - gruel::mutex d_mutex; + gr::thread::mutex d_mutex; int d_size; double d_samp_rate; @@ -49,8 +49,8 @@ namespace gr { QWidget *d_parent; TimeDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void npoints_resize(); diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index 5e1fbfb570..3ae6f93d0c 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 ed17cf45ce..50c63ad545 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 8eb175b2c9..2085acf8fc 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.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 72908b51b9..817a5a126e 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -214,7 +214,7 @@ namespace gr { waterfall_sink_c_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -417,8 +417,8 @@ namespace gr { //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new WaterfallUpdateEvent(d_magbufs, d_fftsize, diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 1d709c6c5f..7483989c00 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -26,9 +26,9 @@ #include <qtgui/waterfall_sink_c.h> #include <filter/firdes.h> #include <fft/fft.h> -#include <gruel/high_res_timer.h> -#include <gruel/thread.h> -#include <waterfalldisplayform.h> +#include <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { @@ -60,8 +60,8 @@ namespace gr { QWidget *d_parent; WaterfallDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void windowreset(); void buildwindow(); diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index bdf1159e5a..aad2ffe5c7 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -213,7 +213,7 @@ namespace gr { waterfall_sink_f_impl::set_update_time(double t) { //convert update time to ticks - gruel::high_res_timer_type tps = gruel::high_res_timer_tps(); + gr::high_res_timer_type tps = gr::high_res_timer_tps(); d_update_time = t * tps; d_main_gui->setUpdateTime(t); d_last_time = 0; @@ -418,8 +418,8 @@ namespace gr { //volk_32f_convert_64f_a(d_magbufs[n], d_fbuf, d_fftsize); } - if(gruel::high_res_timer_now() - d_last_time > d_update_time) { - d_last_time = gruel::high_res_timer_now(); + if(gr::high_res_timer_now() - d_last_time > d_update_time) { + d_last_time = gr::high_res_timer_now(); d_qApplication->postEvent(d_main_gui, new WaterfallUpdateEvent(d_magbufs, d_fftsize, diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 6185a25397..02556fd9d6 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 <high_res_timer.h> +#include <thread/thread.h> +#include <qtgui/waterfalldisplayform.h> namespace gr { namespace qtgui { @@ -61,8 +60,8 @@ namespace gr { QWidget *d_parent; WaterfallDisplayForm *d_main_gui; - gruel::high_res_timer_type d_update_time; - gruel::high_res_timer_type d_last_time; + gr::high_res_timer_type d_update_time; + gr::high_res_timer_type d_last_time; void windowreset(); void buildwindow(); diff --git a/gr-qtgui/lib/waterfalldisplayform.cc b/gr-qtgui/lib/waterfalldisplayform.cc index e42e63fbc4..fb5df230c2 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) @@ -115,7 +115,7 @@ WaterfallDisplayForm::newData(const QEvent *updateEvent) WaterfallUpdateEvent *event = (WaterfallUpdateEvent*)updateEvent; const std::vector<double*> dataPoints = event->getPoints(); const uint64_t numDataPoints = event->getNumDataPoints(); - const gruel::high_res_timer_type dataTimestamp = event->getDataTimestamp(); + const gr::high_res_timer_type dataTimestamp = event->getDataTimestamp(); _min_val = 1000; _max_val = -1000; diff --git a/gr-qtgui/swig/CMakeLists.txt b/gr-qtgui/swig/CMakeLists.txt index d17130597e..fe2bf5dee4 100644 --- a/gr-qtgui/swig/CMakeLists.txt +++ b/gr-qtgui/swig/CMakeLists.txt @@ -27,15 +27,15 @@ set(GR_SWIG_INCLUDE_DIRS ${GR_QTGUI_INCLUDE_DIRS} ${GR_FFT_INCLUDE_DIRS} ${GR_FILTER_INCLUDE_DIRS} - ${GNURADIO_CORE_SWIG_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS} ${QWT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/qtgui_swig_doc.i) -set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include) +set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/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 4e1d1969e2..27f34fc3cd 100644 --- a/gr-qtgui/swig/qtgui_swig.i +++ b/gr-qtgui/swig/qtgui_swig.i @@ -23,15 +23,18 @@ #define QTGUI_API #define FILTER_API -%include "gnuradio.i" +%include "runtime_swig.i" //load generated python docstrings %include "qtgui_swig_doc.i" // So we understand the firdes window types -%include "filter/firdes.h" +%import "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" |