[Commit-gnuradio] [gnuradio] 13/21: qtgui: time display: fixes a threading issue.

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit e3e79e2762468c5c5e679544eae59c68271492dd
Author: Tom Rondeau <address@hidden>
Date:   Tue Oct 27 17:18:47 2015 -0400

    qtgui: time display: fixes a threading issue.
    
    Properly emit a signal instead of calling the function directly.
---
 gr-qtgui/include/gnuradio/qtgui/form_menus.h      | 8 ++++----
 gr-qtgui/include/gnuradio/qtgui/timedisplayform.h | 1 +
 gr-qtgui/lib/timedisplayform.cc                   | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gr-qtgui/include/gnuradio/qtgui/form_menus.h 
b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
index f60c50e..cb9b775 100644
--- a/gr-qtgui/include/gnuradio/qtgui/form_menus.h
+++ b/gr-qtgui/include/gnuradio/qtgui/form_menus.h
@@ -1000,15 +1000,15 @@ public:
   ~NPointsMenu()
   {}
 
+signals:
+  void whichTrigger(const int npts);
+
+public slots:
   void setDiagText(const int npts)
   {
     d_text->setText(QString().setNum(npts));
   }
 
-signals:
-  void whichTrigger(const int npts);
-
-public slots:
   void getTextDiag()
   {
     d_diag->show();
diff --git a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h 
b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
index 0dfab2a..258cc5d 100644
--- a/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/timedisplayform.h
@@ -106,6 +106,7 @@ signals:
   void signalTriggerLevel(float level);
   void signalTriggerDelay(float delay);
   void signalReplot();
+  void signalNPoints(const int npts);
 
 private:
   QIntValidator* d_int_validator;
diff --git a/gr-qtgui/lib/timedisplayform.cc b/gr-qtgui/lib/timedisplayform.cc
index b8718c5..2e03e67 100644
--- a/gr-qtgui/lib/timedisplayform.cc
+++ b/gr-qtgui/lib/timedisplayform.cc
@@ -62,6 +62,8 @@ TimeDisplayForm::TimeDisplayForm(int nplots, QWidget* parent)
   d_menu->addAction(d_nptsmenu);
   connect(d_nptsmenu, SIGNAL(whichTrigger(int)),
          this, SLOT(setNPoints(const int)));
+  connect(this, SIGNAL(signalNPoints(const int)),
+         d_nptsmenu, SLOT(setDiagText(const int)));
 
   d_stemmenu = new QAction("Stem Plot", this);
   d_stemmenu->setCheckable(true);
@@ -295,7 +297,7 @@ void
 TimeDisplayForm::setNPoints(const int npoints)
 {
   d_npoints = npoints;
-  d_nptsmenu->setDiagText(d_npoints);
+  emit signalNPoints(npoints);
 }
 
 void