diff options
24 files changed, 71 insertions, 26 deletions
diff --git a/gnuradio-runtime/lib/pmt/test_pmt.cc b/gnuradio-runtime/lib/pmt/test_pmt.cc index 49700b5928..403bf64cd0 100644 --- a/gnuradio-runtime/lib/pmt/test_pmt.cc +++ b/gnuradio-runtime/lib/pmt/test_pmt.cc @@ -29,6 +29,7 @@ #include <gnuradio/unittests.h> #include <qa_pmt.h> +#include <fstream> int main (int argc, char **argv) diff --git a/gnuradio-runtime/lib/test_runtime.cc b/gnuradio-runtime/lib/test_runtime.cc index 1285302eb4..6f75bcc1b1 100644 --- a/gnuradio-runtime/lib/test_runtime.cc +++ b/gnuradio-runtime/lib/test_runtime.cc @@ -29,6 +29,7 @@ #include <gnuradio/unittests.h> #include <qa_runtime.h> +#include <fstream> int main (int argc, char **argv) diff --git a/gr-analog/lib/test_gr_analog.cc b/gr-analog/lib/test_gr_analog.cc index e621f9d395..228a99e347 100644 --- a/gr-analog/lib/test_gr_analog.cc +++ b/gr-analog/lib/test_gr_analog.cc @@ -30,6 +30,7 @@ #include <gnuradio/unittests.h> #include "qa_analog.h" #include <iostream> +#include <fstream> int main (int argc, char **argv) diff --git a/gr-atsc/lib/test_atsci.cc b/gr-atsc/lib/test_atsci.cc index acea17a7ab..edbe24f0b6 100644 --- a/gr-atsc/lib/test_atsci.cc +++ b/gr-atsc/lib/test_atsci.cc @@ -28,6 +28,7 @@ #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> #include "qa_atsci.h" +#include <fstream> int main (int argc, char **argv) diff --git a/gr-blocks/lib/test_gr_blocks.cc b/gr-blocks/lib/test_gr_blocks.cc index 2d8f0d6d2a..bc3901dac3 100644 --- a/gr-blocks/lib/test_gr_blocks.cc +++ b/gr-blocks/lib/test_gr_blocks.cc @@ -30,6 +30,7 @@ #include <gnuradio/unittests.h> #include <qa_blocks.h> #include <iostream> +#include <fstream> int main(int argc, char **argv) diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.cc b/gr-digital/lib/hdlc_deframer_bp_impl.cc index 0723ad473e..976d14784d 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.cc +++ b/gr-digital/lib/hdlc_deframer_bp_impl.cc @@ -56,7 +56,6 @@ namespace gr { d_bitctr=0; d_ones=0; d_pktbuf = new unsigned char[length_max+2]; - d_in_frame=false; } /* @@ -106,28 +105,23 @@ namespace gr { } else { } - d_in_frame=false; } else { - d_in_frame=true; } d_bitctr=0; d_bytectr=0; } else { //unstuff } } else { //not 5+ continuous ones - if(d_in_frame) { - if(d_bytectr > d_length_max) { - d_bytectr=0; + if(d_bytectr > d_length_max) { + d_bytectr=0; + d_bitctr=0; + } else { + d_pktbuf[d_bytectr]>>=1; + if (bit) d_pktbuf[d_bytectr] |= 0x80; + d_bitctr++; + if (d_bitctr==8) { d_bitctr=0; - d_in_frame=false; - } else { - d_pktbuf[d_bytectr]>>=1; - if (bit) d_pktbuf[d_bytectr] |= 0x80; - d_bitctr++; - if (d_bitctr==8) { - d_bitctr=0; - d_bytectr++; - } + d_bytectr++; } } } diff --git a/gr-digital/lib/hdlc_deframer_bp_impl.h b/gr-digital/lib/hdlc_deframer_bp_impl.h index f7c4253b3d..d29d9fcc3e 100644 --- a/gr-digital/lib/hdlc_deframer_bp_impl.h +++ b/gr-digital/lib/hdlc_deframer_bp_impl.h @@ -36,7 +36,6 @@ namespace gr { size_t d_ones; size_t d_bytectr; size_t d_bitctr; - bool d_in_frame; unsigned char *d_pktbuf; unsigned int crc_ccitt(unsigned char *data, size_t len); diff --git a/gr-filter/lib/test_gr_filter.cc b/gr-filter/lib/test_gr_filter.cc index b713aafaf7..f43b781490 100644 --- a/gr-filter/lib/test_gr_filter.cc +++ b/gr-filter/lib/test_gr_filter.cc @@ -30,6 +30,7 @@ #include <gnuradio/unittests.h> #include <qa_filter.h> #include <iostream> +#include <fstream> int main (int argc, char **argv) diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 93986d84c7..8d71cbbd50 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -115,8 +115,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/freq_sink_c_impl.cc b/gr-qtgui/lib/freq_sink_c_impl.cc index 4b43967f32..9f4a86f0bd 100644 --- a/gr-qtgui/lib/freq_sink_c_impl.cc +++ b/gr-qtgui/lib/freq_sink_c_impl.cc @@ -140,8 +140,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index ab6167d10a..77eede0040 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -140,8 +140,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index bd43f8645c..923ea73cc4 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -109,8 +109,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/number_sink_impl.cc b/gr-qtgui/lib/number_sink_impl.cc index abfb8725f4..2c31b60fec 100644 --- a/gr-qtgui/lib/number_sink_impl.cc +++ b/gr-qtgui/lib/number_sink_impl.cc @@ -30,6 +30,7 @@ #include <volk/volk.h> #include <gnuradio/fft/fft.h> #include <qwt_symbol.h> +#include <cmath> namespace gr { namespace qtgui { @@ -265,6 +266,23 @@ namespace gr { { } + void + number_sink_impl::_gui_update_trigger() + { + // Only update the time if different than the current interval + // add some slop in cpu ticks for double comparison + gr::high_res_timer_type tps = gr::high_res_timer_tps(); + double t = d_main_gui->updateTime(); + if((d_update_time < (tps*t-10)) || ((tps*t+10) < d_update_time)) { + set_update_time(t); + } + + float a = d_main_gui->average(); + if(a != d_average) { + set_average(a); + } + } + int number_sink_impl::work(int noutput_items, gr_vector_const_void_star &input_items, @@ -272,23 +290,20 @@ namespace gr { { gr::thread::scoped_lock lock(d_mutex); - float new_avg = d_main_gui->average(); - set_update_time(d_main_gui->updateTime()); - if(new_avg != d_average) { - set_average(new_avg); - } + _gui_update_trigger(); if(d_average > 0) { for(int n = 0; n < d_nconnections; n++) { float *in = (float*)input_items[n]; for(int i = 0; i < noutput_items; i++) { - d_avg_value[n] = d_iir[n].filter(in[i]); + if(std::isfinite(in[i])) + d_avg_value[n] = d_iir[n].filter(in[i]); } } } // Plot if we are able to update - if(gr::high_res_timer_now() - d_last_time > d_update_time) { + if((gr::high_res_timer_now() - d_last_time) > d_update_time) { d_last_time = gr::high_res_timer_now(); std::vector<float> d(d_nconnections); if(d_average > 0) { @@ -296,8 +311,11 @@ namespace gr { d[n] = d_avg_value[n]; } else { - for(int n = 0; n < d_nconnections; n++) - d[n] = ((float*)input_items[n])[0]; + for(int n = 0; n < d_nconnections; n++) { + float x = ((float*)input_items[n])[0]; + if(std::isfinite(x)) + d[n] = x; + } } d_qApplication->postEvent(d_main_gui, new NumberUpdateEvent(d)); diff --git a/gr-qtgui/lib/sink_c_impl.cc b/gr-qtgui/lib/sink_c_impl.cc index bcd2c4468c..ed2512b00c 100644 --- a/gr-qtgui/lib/sink_c_impl.cc +++ b/gr-qtgui/lib/sink_c_impl.cc @@ -130,8 +130,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/sink_f_impl.cc b/gr-qtgui/lib/sink_f_impl.cc index 67896b71df..e2263f7150 100644 --- a/gr-qtgui/lib/sink_f_impl.cc +++ b/gr-qtgui/lib/sink_f_impl.cc @@ -130,8 +130,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/time_raster_sink_b_impl.cc b/gr-qtgui/lib/time_raster_sink_b_impl.cc index ecd8ac319a..afc5e90e2d 100644 --- a/gr-qtgui/lib/time_raster_sink_b_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_b_impl.cc @@ -124,8 +124,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 3a18985b2d..7d271abb20 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -122,8 +122,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index e053806fd2..0eb999becc 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -113,8 +113,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 8424702bc1..0a8a26fcd6 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -115,8 +115,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index 8cb3f1a7bf..6c1583b805 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -139,8 +139,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index 1c1453c1d1..22771e155f 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -138,8 +138,10 @@ namespace gr { d_qApplication = qApp; } else { +#if QT_VERSION >= 0x040500 std::string style = prefs::singleton()->get_string("qtgui", "style", "raster"); QApplication::setGraphicsSystem(QString(style.c_str())); +#endif d_qApplication = new QApplication(d_argc, &d_argv); } diff --git a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc index f01bd5a064..cc89dc90f3 100644 --- a/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc +++ b/gr-utils/python/modtool/gr-newmod/lib/test_howto.cc @@ -30,6 +30,7 @@ #include <gnuradio/unittests.h> #include "qa_howto.h" #include <iostream> +#include <fstream> int main (int argc, char **argv) diff --git a/grc/python/flow_graph.tmpl b/grc/python/flow_graph.tmpl index 52582384aa..ace217c967 100644 --- a/grc/python/flow_graph.tmpl +++ b/grc/python/flow_graph.tmpl @@ -58,6 +58,7 @@ class $(class_name)(grc_wxgui.top_block_gui): self.SetIcon(wx.Icon(_icon_path, wx.BITMAP_TYPE_ANY)) #end if #elif $generate_options == 'qt_gui' +from distutils.version import StrictVersion class $(class_name)(gr.top_block, Qt.QWidget): def __init__($param_str): @@ -316,7 +317,8 @@ if __name__ == '__main__': tb.Wait() #end if #elif $generate_options == 'qt_gui' - Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) + if(StrictVersion(Qt.qVersion()) >= StrictVersion("4.5.0")): + Qt.QApplication.setGraphicsSystem(gr.prefs().get_string('qtgui','style','raster')) qapp = Qt.QApplication(sys.argv) tb = $(class_name)($(', '.join($params_eq_list))) #if $flow_graph.get_option('run') diff --git a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h index fef9db5de8..8d31e469f2 100644 --- a/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h +++ b/volk/kernels/volk/volk_8u_conv_k7_r2puppet_8u.h @@ -3,6 +3,7 @@ #include <volk/volk.h> #include <volk/volk_8u_x4_conv_k7_r2_8u.h> +#include <string.h> typedef union { //decision_t is a BIT vector |