diff options
-rw-r--r-- | gr-qtgui/grc/qtgui_eye_sink_x.block.yml | 6 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h | 7 | ||||
-rw-r--r-- | gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h | 7 | ||||
-rw-r--r-- | gr-qtgui/lib/eye_sink_c_impl.cc | 17 | ||||
-rw-r--r-- | gr-qtgui/lib/eye_sink_c_impl.h | 3 | ||||
-rw-r--r-- | gr-qtgui/lib/eye_sink_f_impl.cc | 16 | ||||
-rw-r--r-- | gr-qtgui/lib/eye_sink_f_impl.h | 3 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h | 3 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h | 3 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc | 7 | ||||
-rw-r--r-- | gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc | 7 |
11 files changed, 8 insertions, 71 deletions
diff --git a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml index 7af8843ac5..b804340659 100644 --- a/gr-qtgui/grc/qtgui_eye_sink_x.block.yml +++ b/gr-qtgui/grc/qtgui_eye_sink_x.block.yml @@ -12,11 +12,6 @@ parameters: fcn: [eye_sink_c, eye_sink_f, eye_sink_c, eye_sink_f] t: [complex, float, message, message] hide: part -- id: name - label: Name - dtype: string - default: '""' - hide: ${ ('none' if len(name) > 0 else 'part') } - id: ylabel label: Y Axis Label dtype: string @@ -952,7 +947,6 @@ templates: qtgui.${type.fcn}( ${size}, #size ${srate}, #samp_rate - ${name}, #name ${0 if type.startswith('msg') else nconnections}, #number of inputs None ) diff --git a/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h index e8cd22f67b..f551bdcc1f 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/eye_sink_c.h @@ -31,9 +31,7 @@ namespace qtgui { * streams and plots them as an eye pattern. For each signal, both * the signal's I and Q eye patterns are plotted. Eye patterns are * 2 symbol's time long. Symbol rate must be an integer multiple of - * the sample rate to obtain the eye pattern. The \a set_title and - * \a set_color functions can be used to change the label and color - * for a given input number. + * the sample rate to obtain the eye pattern. * * Trigger occurs at the beginning of each stream used to plot the * eye pattern; whilst a real eye diagram would be triggered with @@ -63,13 +61,11 @@ public: * * \param size number of points to plot at once * \param samp_rate sample rate (used to set x-axis labels) - * \param name title for the plot * \param nconnections number of signals connected to sink * \param parent a QWidget parent object, if any */ static sptr make(int size, double samp_rate, - const std::string& name, unsigned int nconnections = 1, QWidget* parent = NULL); @@ -86,7 +82,6 @@ public: virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; virtual void set_samp_per_symbol(unsigned int sps) = 0; - virtual void set_title(const std::string& title) = 0; virtual void set_line_label(unsigned int which, const std::string& label) = 0; virtual void set_line_color(unsigned int which, const std::string& color) = 0; virtual void set_line_width(unsigned int which, int width) = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h index a1082ca87a..8794ed92bf 100644 --- a/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/eye_sink_f.h @@ -30,9 +30,7 @@ namespace qtgui { * and plots them as eye patterns. For each signal, both * the signal's I and Q eye patterns are plotted. Eye patterns are * 2 symbol's time long. Symbol rate must be an integer multiple of - * the sample rate to obtain the eye pattern. The \a set_title and - * \a set_color functions can be used to change the label and color - * for a given input number. + * the sample rate to obtain the eye pattern. * * Trigger occurs at the beginning of each stream used to plot the * eye pattern; whilst a real eye diagram would be triggered with @@ -63,13 +61,11 @@ public: * * \param size number of points to plot at once * \param samp_rate sample rate (used to set x-axis labels) - * \param name title for the plot * \param nconnections number of signals connected to sink * \param parent a QWidget parent object, if any */ static sptr make(int size, double samp_rate, - const std::string& name, unsigned int nconnections = 1, QWidget* parent = NULL); @@ -86,7 +82,6 @@ public: virtual void set_y_label(const std::string& label, const std::string& unit = "") = 0; virtual void set_update_time(double t) = 0; virtual void set_samp_per_symbol(unsigned int sps) = 0; - virtual void set_title(const std::string& title) = 0; virtual void set_line_label(unsigned int which, const std::string& line) = 0; virtual void set_line_color(unsigned int which, const std::string& color) = 0; virtual void set_line_width(unsigned int which, int width) = 0; diff --git a/gr-qtgui/lib/eye_sink_c_impl.cc b/gr-qtgui/lib/eye_sink_c_impl.cc index 2ee67de035..4becfd89c7 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.cc +++ b/gr-qtgui/lib/eye_sink_c_impl.cc @@ -27,19 +27,15 @@ namespace gr { namespace qtgui { -eye_sink_c::sptr eye_sink_c::make(int size, - double samp_rate, - const std::string& name, - unsigned int nconnections, - QWidget* parent) +eye_sink_c::sptr +eye_sink_c::make(int size, double samp_rate, unsigned int nconnections, QWidget* parent) { return gnuradio::make_block_sptr<eye_sink_c_impl>( - size, samp_rate, name, nconnections, parent); + size, samp_rate, nconnections, parent); } eye_sink_c_impl::eye_sink_c_impl(int size, double samp_rate, - const std::string& name, unsigned int nconnections, QWidget* parent) : sync_block("eye_sink_c", @@ -48,7 +44,6 @@ eye_sink_c_impl::eye_sink_c_impl(int size, d_size(size), d_buffer_size(2 * size), d_samp_rate(samp_rate), - d_name(name), d_nconnections(2 * nconnections), d_tag_key(pmt::mp("tags")), d_parent(parent) @@ -186,12 +181,6 @@ void eye_sink_c_impl::set_samp_per_symbol(unsigned int sps) d_main_gui->setSamplesPerSymbol(sps); } -void eye_sink_c_impl::set_title(const std::string& title) -{ - // set_title no longer used. -} - - void eye_sink_c_impl::set_line_label(unsigned int which, const std::string& label) { d_main_gui->setLineLabel(which, label.c_str()); diff --git a/gr-qtgui/lib/eye_sink_c_impl.h b/gr-qtgui/lib/eye_sink_c_impl.h index 1e62587355..0b41feaf37 100644 --- a/gr-qtgui/lib/eye_sink_c_impl.h +++ b/gr-qtgui/lib/eye_sink_c_impl.h @@ -25,7 +25,6 @@ private: int d_size, d_buffer_size; double d_samp_rate; - std::string d_name; unsigned int d_nconnections; const pmt::pmt_t d_tag_key; @@ -67,7 +66,6 @@ private: public: eye_sink_c_impl(int size, double samp_rate, - const std::string& name, unsigned int nconnections, QWidget* parent = NULL); ~eye_sink_c_impl(); @@ -87,7 +85,6 @@ public: void set_y_label(const std::string& label, const std::string& unit = ""); void set_update_time(double t); void set_samp_per_symbol(unsigned int sps); - void set_title(const std::string& title); void set_line_label(unsigned int which, const std::string& label); void set_line_color(unsigned int which, const std::string& color); void set_line_width(unsigned int which, int width); diff --git a/gr-qtgui/lib/eye_sink_f_impl.cc b/gr-qtgui/lib/eye_sink_f_impl.cc index 7f485f9ee4..8fb8220e1f 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.cc +++ b/gr-qtgui/lib/eye_sink_f_impl.cc @@ -27,19 +27,15 @@ namespace gr { namespace qtgui { -eye_sink_f::sptr eye_sink_f::make(int size, - double samp_rate, - const std::string& name, - unsigned int nconnections, - QWidget* parent) +eye_sink_f::sptr +eye_sink_f::make(int size, double samp_rate, unsigned int nconnections, QWidget* parent) { return gnuradio::make_block_sptr<eye_sink_f_impl>( - size, samp_rate, name, nconnections, parent); + size, samp_rate, nconnections, parent); } eye_sink_f_impl::eye_sink_f_impl(int size, double samp_rate, - const std::string& name, unsigned int nconnections, QWidget* parent) : sync_block("eye_sink_f", @@ -48,7 +44,6 @@ eye_sink_f_impl::eye_sink_f_impl(int size, d_size(size), d_buffer_size(2 * size), d_samp_rate(samp_rate), - d_name(name), d_nconnections(nconnections), d_parent(parent) { @@ -180,11 +175,6 @@ void eye_sink_f_impl::set_samp_per_symbol(unsigned int sps) d_main_gui->setSamplesPerSymbol(sps); } -void eye_sink_f_impl::set_title(const std::string& title) -{ - // set_title no longer used. -} - void eye_sink_f_impl::set_line_label(unsigned int which, const std::string& label) { d_main_gui->setLineLabel(which, label.c_str()); diff --git a/gr-qtgui/lib/eye_sink_f_impl.h b/gr-qtgui/lib/eye_sink_f_impl.h index f28e569d1f..a98b832901 100644 --- a/gr-qtgui/lib/eye_sink_f_impl.h +++ b/gr-qtgui/lib/eye_sink_f_impl.h @@ -25,7 +25,6 @@ private: int d_size, d_buffer_size; double d_samp_rate; - std::string d_name; unsigned int d_nconnections; int d_index, d_start, d_end; @@ -64,7 +63,6 @@ private: public: eye_sink_f_impl(int size, double samp_rate, - const std::string& name, unsigned int nconnections, QWidget* parent = NULL); ~eye_sink_f_impl(); @@ -84,7 +82,6 @@ public: void set_y_label(const std::string& label, const std::string& unit = ""); void set_update_time(double t); void set_samp_per_symbol(unsigned int sps); - void set_title(const std::string& title); void set_line_label(unsigned int which, const std::string& label); void set_line_color(unsigned int which, const std::string& color); void set_line_width(unsigned int which, int width); diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h index fa316e63e7..53bb9f47a9 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_c_pydoc_template.h @@ -45,9 +45,6 @@ static const char* __doc_gr_qtgui_eye_sink_c_set_y_label = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_c_set_update_time = R"doc()doc"; -static const char* __doc_gr_qtgui_eye_sink_c_set_title = R"doc()doc"; - - static const char* __doc_gr_qtgui_eye_sink_c_set_line_label = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h index d90195d9f7..e9dc5fd9b8 100644 --- a/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h +++ b/gr-qtgui/python/qtgui/bindings/docstrings/eye_sink_f_pydoc_template.h @@ -45,9 +45,6 @@ static const char* __doc_gr_qtgui_eye_sink_f_set_y_label = R"doc()doc"; static const char* __doc_gr_qtgui_eye_sink_f_set_update_time = R"doc()doc"; -static const char* __doc_gr_qtgui_eye_sink_f_set_title = R"doc()doc"; - - static const char* __doc_gr_qtgui_eye_sink_f_set_line_label = R"doc()doc"; diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc index 0b03f6a6cd..b37f303baf 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_c_python.cc @@ -51,7 +51,6 @@ void bind_eye_sink_c(py::module& m) .def(py::init(&eye_sink_c::make), py::arg("size"), py::arg("samp_rate"), - py::arg("name"), py::arg("nconnections") = 1, py::arg("parent") = nullptr, D(eye_sink_c, make)) @@ -95,12 +94,6 @@ void bind_eye_sink_c(py::module& m) D(eye_sink_c, set_update_time)) - .def("set_title", - &eye_sink_c::set_title, - py::arg("title"), - D(eye_sink_c, set_title)) - - .def("set_line_label", &eye_sink_c::set_line_label, py::arg("which"), diff --git a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc index 2f77edb564..61a902b962 100644 --- a/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc +++ b/gr-qtgui/python/qtgui/bindings/eye_sink_f_python.cc @@ -48,7 +48,6 @@ void bind_eye_sink_f(py::module& m) .def(py::init(&eye_sink_f::make), py::arg("size"), py::arg("samp_rate"), - py::arg("name"), py::arg("nconnections") = 1, py::arg("parent") = nullptr, D(eye_sink_f, make)) @@ -92,12 +91,6 @@ void bind_eye_sink_f(py::module& m) D(eye_sink_f, set_update_time)) - .def("set_title", - &eye_sink_f::set_title, - py::arg("title"), - D(eye_sink_f, set_title)) - - .def("set_line_label", &eye_sink_f::set_line_label, py::arg("which"), |