diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-06 09:12:59 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2015-04-06 09:12:59 -0700 |
| commit | 3bd074ce45397c24a561aa23c05e1f718868ff77 (patch) | |
| tree | 4ce76a072d5dfd7872622752e794762fb6c22c92 | |
| parent | 6651bc159c8971179354d9e65b42e0672a57ac8d (diff) | |
| parent | 28aa27f2f3768587033f680a08b88bad31ab07e2 (diff) | |
Merge remote-tracking branch 'tom/qtgui/time_freq_behavior'
| -rw-r--r-- | gr-qtgui/lib/FrequencyDisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/freqdisplayform.cc | 7 | ||||
| -rw-r--r-- | gr-qtgui/lib/timedisplayform.cc | 9 |
3 files changed, 16 insertions, 2 deletions
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc index f5e02aca83..349ce8e1a0 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.cc +++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc @@ -218,8 +218,10 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(int nplots, QWidget* parent) QWidget *w; w = legend()->find(d_min_fft_plot_curve); ((QwtLegendItem*)w)->setChecked(true); + ((QwtLegendItem*)w)->setVisible(false); w = legend()->find(d_max_fft_plot_curve); ((QwtLegendItem*)w)->setChecked(true); + ((QwtLegendItem*)w)->setVisible(false); legend()->setVisible(false); #else /* QWT_VERSION < 0x060100 */ QWidget *w; diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc index 3c74f2cabd..353c21e4f6 100644 --- a/gr-qtgui/lib/freqdisplayform.cc +++ b/gr-qtgui/lib/freqdisplayform.cc @@ -48,6 +48,11 @@ FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent) d_clicked = false; d_clicked_freq = 0; + d_trig_mode = gr::qtgui::TRIG_MODE_FREE; + d_trig_level = 0; + d_trig_channel = 0; + d_trig_tag_key = ""; + d_sizemenu = new FFTSizeMenu(this); d_avgmenu = new FFTAverageMenu(this); d_winmenu = new FFTWindowMenu(this); @@ -435,7 +440,7 @@ FreqDisplayForm::updateTrigger(gr::qtgui::trigger_mode mode) } // if tag mode, popup tag key box to set - if(d_trig_mode == gr::qtgui::TRIG_MODE_TAG) + if((d_trig_tag_key == "") && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) d_tr_tag_key_act->activate(QAction::Trigger); emit signalReplot(); diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc index cc8592715e..160cf14d89 100644 --- a/gr-qtgui/lib/timedisplayform.cc +++ b/gr-qtgui/lib/timedisplayform.cc @@ -37,6 +37,13 @@ TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent) d_semilogy = false; d_current_units = 1; + d_trig_mode = gr::qtgui::TRIG_MODE_FREE; + d_trig_slope = gr::qtgui::TRIG_SLOPE_POS; + d_trig_level = 0; + d_trig_delay = 0; + d_trig_channel = 0; + d_trig_tag_key = ""; + d_int_validator = new QIntValidator(this); d_int_validator->setBottom(0); @@ -382,7 +389,7 @@ TimeDisplayForm::updateTrigger(gr::qtgui::trigger_mode mode) } // if tag mode, popup tag key box to set - if(d_trig_mode == gr::qtgui::TRIG_MODE_TAG) + if((d_trig_tag_key == "") && (d_trig_mode == gr::qtgui::TRIG_MODE_TAG)) d_tr_tag_key_act->activate(QAction::Trigger); emit signalReplot(); |