diff options
Diffstat (limited to 'gr-qtgui/lib/freq_sink_f_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/freq_sink_f_impl.cc | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/gr-qtgui/lib/freq_sink_f_impl.cc b/gr-qtgui/lib/freq_sink_f_impl.cc index 2cf43e9994..c9ec1f52aa 100644 --- a/gr-qtgui/lib/freq_sink_f_impl.cc +++ b/gr-qtgui/lib/freq_sink_f_impl.cc @@ -115,9 +115,9 @@ namespace gr { } d_main_gui = new FreqDisplayForm(d_nconnections, d_parent); - d_main_gui->SetFFTSize(d_fftsize); - d_main_gui->SetFFTWindowType(d_wintype); - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFFTSize(d_fftsize); + d_main_gui->setFFTWindowType(d_wintype); + d_main_gui->setFrequencyRange(d_center_freq, d_center_freq - d_bandwidth/2.0, d_center_freq + d_bandwidth/2.0); @@ -150,7 +150,7 @@ namespace gr { freq_sink_f_impl::set_fft_size(const int fftsize) { d_fftsize = fftsize; - d_main_gui->SetFFTSize(fftsize); + d_main_gui->setFFTSize(fftsize); } int @@ -163,7 +163,7 @@ namespace gr { freq_sink_f_impl::set_fft_average(const float fftavg) { d_fftavg = fftavg; - d_main_gui->SetFFTAverage(fftavg); + d_main_gui->setFFTAverage(fftavg); } float @@ -178,15 +178,15 @@ namespace gr { { d_center_freq = centerfreq; d_bandwidth = bandwidth; - d_main_gui->SetFrequencyRange(d_center_freq, + d_main_gui->setFrequencyRange(d_center_freq, -d_bandwidth/2.0, d_bandwidth/2.0); } void - freq_sink_f_impl::set_fft_power_db(double min, double max) + freq_sink_f_impl::set_y_axis(double min, double max) { - d_main_gui->SetFrequencyAxis(min, max); + d_main_gui->setYaxis(min, max); } void @@ -199,15 +199,21 @@ namespace gr { } void - freq_sink_f_impl::set_title(int which, const std::string &title) + freq_sink_f_impl::set_title(const std::string &title) { - d_main_gui->setTitle(which, title.c_str()); + d_main_gui->setTitle(title.c_str()); } void - freq_sink_f_impl::set_color(int which, const std::string &color) + freq_sink_f_impl::set_line_label(int which, const std::string &label) { - d_main_gui->setColor(which, color.c_str()); + d_main_gui->setLineLabel(which, label.c_str()); + } + + void + freq_sink_f_impl::set_line_color(int which, const std::string &color) + { + d_main_gui->setLineColor(which, color.c_str()); } void @@ -236,6 +242,12 @@ namespace gr { } void + freq_sink_f_impl::reset() + { + d_index = 0; + } + + void freq_sink_f_impl::fft(float *data_out, const float *data_in, int size) { // float to complex conversion @@ -267,7 +279,7 @@ namespace gr { gruel::scoped_lock lock(d_mutex); filter::firdes::win_type newwintype; - newwintype = d_main_gui->GetFFTWindowType(); + newwintype = d_main_gui->getFFTWindowType(); if(d_wintype != newwintype) { d_wintype = newwintype; buildwindow(); @@ -288,8 +300,8 @@ namespace gr { { gruel::scoped_lock lock(d_mutex); - int newfftsize = d_main_gui->GetFFTSize(); - d_fftavg = d_main_gui->GetFFTAverage(); + int newfftsize = d_main_gui->getFFTSize(); + d_fftavg = d_main_gui->getFFTAverage(); if(newfftsize != d_fftsize) { // Resize residbuf and replace data |