[Commit-gnuradio] [gnuradio] 01/03: qtgui: time and freq plot behavior mods.

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 28aa27f2f3768587033f680a08b88bad31ab07e2
Author: Tom Rondeau <address@hidden>
Date:   Mon Apr 6 12:11:12 2015 -0400

    qtgui: time and freq plot behavior mods.
    
    - Fixes a problem of shown min/max in legend in QWT < 6.1.
    - Initializes trigger variables.
    - If tag key is set, don't ask when setting tag trigger mode.
---
 gr-qtgui/lib/FrequencyDisplayPlot.cc | 2 ++
 gr-qtgui/lib/freqdisplayform.cc      | 7 ++++++-
 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 f5e02ac..349ce8e 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 3c74f2c..353c21e 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 cc85927..160cf14 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();