diff options
22 files changed, 150 insertions, 16 deletions
diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml b/gr-qtgui/grc/qtgui_const_sink_x.xml index a6fb2af840..a7e1ba11c5 100644 --- a/gr-qtgui/grc/qtgui_const_sink_x.xml +++ b/gr-qtgui/grc/qtgui_const_sink_x.xml @@ -23,6 +23,9 @@ self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, $tr_chan, $tr_tag) self.$(id).enable_autoscale($autoscale) self.$(id).enable_grid($grid) +if not $legend: + self.$(id).disable_legend() + labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] widths = [$width1, $width2, $width3, $width4, $width5, @@ -236,6 +239,24 @@ $(gui_hint()($win))</make> + <!-- Begin Config Tab items --> + <param> + <name>Legend</name> + <key>legend</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + <tab>Config</tab> + </param> + <param> <name>Line 1 Label</name> <key>label1</key> diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml b/gr-qtgui/grc/qtgui_histogram_sink_x.xml index 7165fb8421..ba04da1db8 100644 --- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml +++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml @@ -25,6 +25,9 @@ self.$(id).enable_autoscale($autoscale) self.$(id).enable_accumulate($accum) self.$(id).enable_grid($grid) +if not $legend: + self.$(id).disable_legend() + labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] widths = [$width1, $width2, $width3, $width4, $width5, @@ -169,6 +172,24 @@ $(gui_hint()($win)) <hide>part</hide> </param> + <!-- Begin Config Tab items --> + <param> + <name>Legend</name> + <key>legend</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + <tab>Config</tab> + </param> + <param> <name>Line 1 Label</name> <key>label1</key> diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml b/gr-qtgui/grc/qtgui_time_sink_x.xml index adcad507a7..9344ef4de2 100644 --- a/gr-qtgui/grc/qtgui_time_sink_x.xml +++ b/gr-qtgui/grc/qtgui_time_sink_x.xml @@ -29,6 +29,9 @@ self.$(id).enable_autoscale($autoscale) self.$(id).enable_grid($grid) self.$(id).enable_control_panel($ctrlpanel) +if not $legend: + self.$(id).disable_legend() + labels = [$label1, $label2, $label3, $label4, $label5, $label6, $label7, $label8, $label9, $label10] widths = [$width1, $width2, $width3, $width4, $width5, @@ -194,22 +197,6 @@ $(gui_hint()($win))</make> </param> <param> - <name>Control Panel</name> - <key>ctrlpanel</key> - <value>False</value> - <type>enum</type> - <hide>part</hide> - <option> - <name>Yes</name> - <key>True</key> - </option> - <option> - <name>No</name> - <key>False</key> - </option> - </param> - - <param> <name>Disp. Tags</name> <key>entags</key> <value>True</value> @@ -314,6 +301,42 @@ $(gui_hint()($win))</make> + <!-- Begin Config Tab items --> + + <param> + <name>Control Panel</name> + <key>ctrlpanel</key> + <value>False</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + <tab>Config</tab> + </param> + + <param> + <name>Legend</name> + <key>legend</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + <tab>Config</tab> + </param> + <param> <name>Line 1 Label</name> <key>label1</key> diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml index 3b6e37e16b..3857cb52ac 100644 --- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml +++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml @@ -23,6 +23,9 @@ qtgui.$(type.fcn)( self.$(id).set_update_time($update_time) self.$(id).enable_grid($grid) +if not $legend: + self.$(id).disable_legend() + if $type == type(float()): self.$(id).set_plot_pos_half(not $freqhalf) @@ -217,6 +220,24 @@ $(gui_hint()($win))</make> </param> + <!-- Begin Config Tab items --> + <param> + <name>Legend</name> + <key>legend</key> + <value>True</value> + <type>enum</type> + <hide>part</hide> + <option> + <name>Yes</name> + <key>True</key> + </option> + <option> + <name>No</name> + <key>False</key> + </option> + <tab>Config</tab> + </param> + <param> <name>Line 1 Label</name> <key>label1</key> diff --git a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h index b942032d51..14f9319729 100644 --- a/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/const_sink_c.h @@ -133,6 +133,7 @@ namespace gr { virtual void enable_menu(bool en=true) = 0; virtual void enable_autoscale(bool en) = 0; virtual void enable_grid(bool en) = 0; + virtual void disable_legend() = 0; virtual int nsamps() const = 0; virtual void reset() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h index bedaf103ea..926b9accb4 100644 --- a/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/histogram_sink_f.h @@ -129,6 +129,7 @@ namespace gr { virtual void set_line_alpha(int which, double alpha) = 0; virtual void set_nsamps(const int newsize) = 0; virtual void set_bins(const int bins) = 0; + virtual void disable_legend() = 0; }; } /* namespace qtgui */ diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h index 907fd3f07d..53e3d2ae98 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_c.h @@ -159,6 +159,7 @@ namespace gr { virtual void enable_semilogy(bool en=true) = 0; virtual void enable_control_panel(bool en=true) = 0; virtual void enable_tags(int which, bool en) = 0; + virtual void disable_legend() = 0; virtual int nsamps() const = 0; virtual void reset() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h index f4bb4157f0..a47261bb21 100644 --- a/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/time_sink_f.h @@ -149,6 +149,7 @@ namespace gr { virtual void enable_semilogy(bool en=true) = 0; virtual void enable_control_panel(bool en=true) = 0; virtual void enable_tags(int which, bool en) = 0; + virtual void disable_legend() = 0; virtual int nsamps() const = 0; virtual void reset() = 0; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h index 9229682b28..aca4509644 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_c.h @@ -139,6 +139,7 @@ namespace gr { virtual void enable_menu(bool en=true) = 0; virtual void enable_grid(bool en=true) = 0; + virtual void disable_legend() = 0; QApplication *d_qApplication; }; diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h index 0bbd7e0231..13c7b985a7 100644 --- a/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h +++ b/gr-qtgui/include/gnuradio/qtgui/waterfall_sink_f.h @@ -145,6 +145,7 @@ namespace gr { virtual void enable_menu(bool en=true) = 0; virtual void enable_grid(bool en=true) = 0; + virtual void disable_legend() = 0; QApplication *d_qApplication; }; diff --git a/gr-qtgui/lib/const_sink_c_impl.cc b/gr-qtgui/lib/const_sink_c_impl.cc index 10b342dbf5..0711315bbb 100644 --- a/gr-qtgui/lib/const_sink_c_impl.cc +++ b/gr-qtgui/lib/const_sink_c_impl.cc @@ -360,6 +360,12 @@ namespace gr { } void + const_sink_c_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void const_sink_c_impl::reset() { gr::thread::scoped_lock lock(d_setlock); diff --git a/gr-qtgui/lib/const_sink_c_impl.h b/gr-qtgui/lib/const_sink_c_impl.h index a7f0096dfb..fc3706ea27 100644 --- a/gr-qtgui/lib/const_sink_c_impl.h +++ b/gr-qtgui/lib/const_sink_c_impl.h @@ -115,6 +115,7 @@ namespace gr { void enable_menu(bool en); void enable_autoscale(bool en); void enable_grid(bool en); + void disable_legend(); void reset(); int work(int noutput_items, diff --git a/gr-qtgui/lib/histogram_sink_f_impl.cc b/gr-qtgui/lib/histogram_sink_f_impl.cc index 56a4177a5c..cdaf5cffc7 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.cc +++ b/gr-qtgui/lib/histogram_sink_f_impl.cc @@ -363,6 +363,12 @@ namespace gr { } void + histogram_sink_f_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void histogram_sink_f_impl::autoscalex() { d_main_gui->autoScaleX(); diff --git a/gr-qtgui/lib/histogram_sink_f_impl.h b/gr-qtgui/lib/histogram_sink_f_impl.h index a5409a2ef6..e8ae1ac729 100644 --- a/gr-qtgui/lib/histogram_sink_f_impl.h +++ b/gr-qtgui/lib/histogram_sink_f_impl.h @@ -102,6 +102,7 @@ namespace gr { void enable_semilogx(bool en); void enable_semilogy(bool en); void enable_accumulate(bool en); + void disable_legend(); void autoscalex(); int nsamps() const; int bins() const; diff --git a/gr-qtgui/lib/time_sink_c_impl.cc b/gr-qtgui/lib/time_sink_c_impl.cc index 5260f7e7ce..fe33a0997e 100644 --- a/gr-qtgui/lib/time_sink_c_impl.cc +++ b/gr-qtgui/lib/time_sink_c_impl.cc @@ -434,6 +434,12 @@ namespace gr { } void + time_sink_c_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void time_sink_c_impl::reset() { gr::thread::scoped_lock lock(d_setlock); diff --git a/gr-qtgui/lib/time_sink_c_impl.h b/gr-qtgui/lib/time_sink_c_impl.h index 3a836a34bb..f29d84768d 100644 --- a/gr-qtgui/lib/time_sink_c_impl.h +++ b/gr-qtgui/lib/time_sink_c_impl.h @@ -127,6 +127,7 @@ namespace gr { void enable_semilogy(bool en); void enable_control_panel(bool en); void enable_tags(int which, bool en); + void disable_legend(); void reset(); diff --git a/gr-qtgui/lib/time_sink_f_impl.cc b/gr-qtgui/lib/time_sink_f_impl.cc index 3c83983bd8..d0cafd42a9 100644 --- a/gr-qtgui/lib/time_sink_f_impl.cc +++ b/gr-qtgui/lib/time_sink_f_impl.cc @@ -430,6 +430,12 @@ namespace gr { } void + time_sink_f_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void time_sink_f_impl::reset() { gr::thread::scoped_lock lock(d_setlock); diff --git a/gr-qtgui/lib/time_sink_f_impl.h b/gr-qtgui/lib/time_sink_f_impl.h index 4f8193e624..1d42f36994 100644 --- a/gr-qtgui/lib/time_sink_f_impl.h +++ b/gr-qtgui/lib/time_sink_f_impl.h @@ -127,6 +127,7 @@ namespace gr { void enable_semilogy(bool en); void enable_control_panel(bool en); void enable_tags(int which, bool en); + void disable_legend(); void reset(); diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.cc b/gr-qtgui/lib/waterfall_sink_c_impl.cc index e5d43f4662..1675b8001a 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_c_impl.cc @@ -346,6 +346,12 @@ namespace gr { } void + waterfall_sink_c_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void waterfall_sink_c_impl::fft(float *data_out, const gr_complex *data_in, int size) { if(d_window.size()) { diff --git a/gr-qtgui/lib/waterfall_sink_c_impl.h b/gr-qtgui/lib/waterfall_sink_c_impl.h index 6ab09bdd9b..e21de88fba 100644 --- a/gr-qtgui/lib/waterfall_sink_c_impl.h +++ b/gr-qtgui/lib/waterfall_sink_c_impl.h @@ -125,6 +125,7 @@ namespace gr { void enable_menu(bool en); void enable_grid(bool en); + void disable_legend(); int work(int noutput_items, gr_vector_const_void_star &input_items, diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.cc b/gr-qtgui/lib/waterfall_sink_f_impl.cc index adae592bff..7bb2a096ca 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.cc +++ b/gr-qtgui/lib/waterfall_sink_f_impl.cc @@ -351,6 +351,12 @@ namespace gr { } void + waterfall_sink_f_impl::disable_legend() + { + d_main_gui->disableLegend(); + } + + void waterfall_sink_f_impl::fft(float *data_out, const float *data_in, int size) { // float to complex conversion diff --git a/gr-qtgui/lib/waterfall_sink_f_impl.h b/gr-qtgui/lib/waterfall_sink_f_impl.h index 2710f304ec..8be0003340 100644 --- a/gr-qtgui/lib/waterfall_sink_f_impl.h +++ b/gr-qtgui/lib/waterfall_sink_f_impl.h @@ -126,6 +126,7 @@ namespace gr { void enable_menu(bool en); void enable_grid(bool en); + void disable_legend(); int work(int noutput_items, gr_vector_const_void_star &input_items, |