[Commit-gnuradio] [gnuradio] 05/07: qtgui: controlpanel toggle in popup menu.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 107db61b14482315714834ffd4eacc5b23166286
Author: Tom Rondeau <address@hidden>
Date:   Mon Mar 30 13:56:19 2015 -0700

    qtgui: controlpanel toggle in popup menu.
---
 gr-qtgui/include/gnuradio/qtgui/timedisplayform.h |  4 +++-
 gr-qtgui/lib/timedisplayform.cc                   | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h 
b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
index a52e1bf..99638b6 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
@@ -80,8 +80,9 @@ public slots:
   void setTriggerTagKey(QString s);
   void setTriggerTagKey(const std::string &s);
 
-  void teardownControlPanel();
+  void setupControlPanel(bool en);
   void setupControlPanel();
+  void teardownControlPanel();
 
 private slots:
   void newData(const QEvent*);
@@ -119,6 +120,7 @@ private:
   QAction *d_stemmenu;
   QAction *d_semilogxmenu;
   QAction *d_semilogymenu;
+  QAction *d_controlpanelmenu;
   std::vector<QAction*> d_tagsmenu;
 
   QMenu *d_triggermenu;
diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc
index c9414a2..e55e145 100644
--- a/gr-qtgui/lib/timedisplayform.cc
+++ b/gr-qtgui/lib/timedisplayform.cc
@@ -99,6 +99,12 @@ TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent)
   d_triggermenu->addAction(d_tr_tag_key_act);
   d_menu->addMenu(d_triggermenu);
 
+  d_controlpanelmenu = new QAction("Control Panel", this);
+  d_controlpanelmenu->setCheckable(true);
+  d_menu->addAction(d_controlpanelmenu);
+  connect(d_controlpanelmenu, SIGNAL(triggered(bool)),
+         this, SLOT(setupControlPanel(bool)));
+
   setTriggerMode(gr::qtgui::TRIG_MODE_FREE);
   setTriggerSlope(gr::qtgui::TRIG_SLOPE_POS);
 
@@ -143,10 +149,23 @@ TimeDisplayForm::~TimeDisplayForm()
   teardownControlPanel();
 }
 
+void
+TimeDisplayForm::setupControlPanel(bool en)
+{
+  if(en) {
+    setupControlPanel();
+  }
+  else {
+    teardownControlPanel();
+  }
+}
 
 void
 TimeDisplayForm::setupControlPanel()
 {
+  if(d_controlpanel)
+    delete d_controlpanel;
+
   // Create the control panel layout
   d_controlpanel = new TimeControlPanel(this);
 
@@ -169,6 +188,8 @@ TimeDisplayForm::setupControlPanel()
   d_controlpanel->toggleGrid(d_grid_act->isChecked());
   d_controlpanel->toggleTriggerMode(getTriggerMode());
   d_controlpanel->toggleTriggerSlope(getTriggerSlope());
+
+  d_controlpanelmenu->setChecked(true);
 }
 
 void
@@ -179,6 +200,7 @@ TimeDisplayForm::teardownControlPanel()
     delete d_controlpanel;
     d_controlpanel = NULL;
   }
+  d_controlpanelmenu->setChecked(false);
 }
 
 TimeDomainDisplayPlot*