summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/time_sink_c_impl.cc
diff options
context:
space:
mode:
Diffstat (limited to 'gr-qtgui/lib/time_sink_c_impl.cc')
-rw-r--r--gr-qtgui/lib/time_sink_c_impl.cc53
1 files changed, 40 insertions, 13 deletions
diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc
index 83ab76eb6e..c8efb63721 100644
--- a/gr-qtgui/lib/time_sink_c_impl.cc
+++ b/gr-qtgui/lib/time_sink_c_impl.cc
@@ -34,23 +34,23 @@ namespace gr {
namespace qtgui {
time_sink_c::sptr
- time_sink_c::make(int size, double bw,
+ time_sink_c::make(int size, double samp_rate,
const std::string &name,
int nconnections,
QWidget *parent)
{
return gnuradio::get_initial_sptr
- (new time_sink_c_impl(size, bw, name, nconnections, parent));
+ (new time_sink_c_impl(size, samp_rate, name, nconnections, parent));
}
- time_sink_c_impl::time_sink_c_impl(int size, double bw,
+ time_sink_c_impl::time_sink_c_impl(int size, double samp_rate,
const std::string &name,
int nconnections,
QWidget *parent)
: gr_sync_block("time_sink_c",
gr_make_io_signature(nconnections, nconnections, sizeof(gr_complex)),
gr_make_io_signature(0, 0, 0)),
- d_size(size), d_bandwidth(bw), d_name(name),
+ d_size(size), d_samp_rate(samp_rate), d_name(name),
d_nconnections(2*nconnections), d_parent(parent)
{
d_main_gui = NULL;
@@ -91,7 +91,8 @@ namespace gr {
}
d_main_gui = new TimeDisplayForm(d_nconnections, d_parent);
- d_main_gui->SetNPoints(d_size);
+ d_main_gui->setNPoints(d_size);
+ d_main_gui->setSampleRate(d_samp_rate);
// initialize update time to 10 times a second
set_update_time(0.1);
@@ -119,9 +120,9 @@ namespace gr {
}
void
- time_sink_c_impl::set_time_domain_axis(double min, double max)
+ time_sink_c_impl::set_y_axis(double min, double max)
{
- d_main_gui->setTimeDomainAxis(min, max);
+ d_main_gui->setYaxis(min, max);
}
void
@@ -134,15 +135,21 @@ namespace gr {
}
void
- time_sink_c_impl::set_title(int which, const std::string &title)
+ time_sink_c_impl::set_title(const std::string &title)
{
- d_main_gui->setTitle(which, title.c_str());
+ d_main_gui->setTitle(title.c_str());
}
void
- time_sink_c_impl::set_color(int which, const std::string &color)
+ time_sink_c_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
+ time_sink_c_impl::set_line_color(int which, const std::string &color)
+ {
+ d_main_gui->setLineColor(which, color.c_str());
}
void
@@ -188,18 +195,38 @@ namespace gr {
d_size = newsize;
d_index = 0;
- d_main_gui->SetNPoints(d_size);
+ d_main_gui->setNPoints(d_size);
}
}
void
+ time_sink_c_impl::set_samp_rate(const double samp_rate)
+ {
+ gruel::scoped_lock lock(d_mutex);
+ d_samp_rate = samp_rate;
+ d_main_gui->setSampleRate(d_samp_rate);
+ }
+
+ void
time_sink_c_impl::npoints_resize()
{
- int newsize = d_main_gui->GetNPoints();
+ int newsize = d_main_gui->getNPoints();
set_nsamps(newsize);
}
int
+ time_sink_c_impl::nsamps() const
+ {
+ return d_size;
+ }
+
+ void
+ time_sink_c_impl::reset()
+ {
+ d_index = 0;
+ }
+
+ int
time_sink_c_impl::work(int noutput_items,
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)