diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-02-28 14:38:40 -0500 |
| commit | 9f29e51f2945f355b43f3012da43e37dcd95f6b4 (patch) | |
| tree | bcc71c8975379c107bb6e94da944292a5ee9a03a /gr-qtgui/lib/time_raster_sink_f_impl.cc | |
| parent | 7afefc484137bf0bed7ab9a7ed86017c117d6a35 (diff) | |
| parent | 2f55d7dfc33e8d990e44c5bbb7c6d2fbdaddd563 (diff) | |
Merge branch 'next' into perf_monitor
Diffstat (limited to 'gr-qtgui/lib/time_raster_sink_f_impl.cc')
| -rw-r--r-- | gr-qtgui/lib/time_raster_sink_f_impl.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gr-qtgui/lib/time_raster_sink_f_impl.cc b/gr-qtgui/lib/time_raster_sink_f_impl.cc index 5def19f406..39237e2912 100644 --- a/gr-qtgui/lib/time_raster_sink_f_impl.cc +++ b/gr-qtgui/lib/time_raster_sink_f_impl.cc @@ -87,6 +87,9 @@ namespace gr { time_raster_sink_f_impl::~time_raster_sink_f_impl() { + if(!d_main_gui->isClosed()) + d_main_gui->close(); + fft::free(d_tmpflt); for(int i = 0; i < d_nconnections; i++) { fft::free(d_residbufs[i]); @@ -161,33 +164,33 @@ namespace gr { } void - time_raster_sink_f_impl::set_line_label(const std::string &label) + time_raster_sink_f_impl::set_line_label(int which, const std::string &label) { - d_main_gui->setLineLabel(0, label.c_str()); + d_main_gui->setLineLabel(which, label.c_str()); } void - time_raster_sink_f_impl::set_line_color(const std::string &color) + time_raster_sink_f_impl::set_line_color(int which, const std::string &color) { - d_main_gui->setLineColor(0, color.c_str()); + d_main_gui->setLineColor(which, color.c_str()); } void - time_raster_sink_f_impl::set_line_width(int width) + time_raster_sink_f_impl::set_line_width(int which, int width) { - d_main_gui->setLineWidth(0, width); + d_main_gui->setLineWidth(which, width); } void - time_raster_sink_f_impl::set_line_style(Qt::PenStyle style) + time_raster_sink_f_impl::set_line_style(int which, Qt::PenStyle style) { - d_main_gui->setLineStyle(0, style); + d_main_gui->setLineStyle(which, style); } void - time_raster_sink_f_impl::set_line_marker(QwtSymbol::Style marker) + time_raster_sink_f_impl::set_line_marker(int which, QwtSymbol::Style marker) { - d_main_gui->setLineMarker(0, marker); + d_main_gui->setLineMarker(which, marker); } void |