[Commit-gnuradio] [gnuradio] 01/02: qtgui: timing is handled in the blocks; removing the qt timer.

[git]

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

trondeau pushed a commit to branch maint
in repository gnuradio.

commit 4bbd9a89a0e5e77adb601fc08a6d17484401f1c9
Author: Tom Rondeau <address@hidden>
Date:   Sun Feb 23 22:13:21 2014 -0500

    qtgui: timing is handled in the blocks; removing the qt timer.
    
    This update dramatically reduces the X server overhead of the QT sinks.
---
 gr-qtgui/include/gnuradio/qtgui/displayform.h |  1 -
 gr-qtgui/lib/displayform.cc                   | 11 +----------
 gr-qtgui/lib/freqdisplayform.cc               |  2 +-
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/gr-qtgui/include/gnuradio/qtgui/displayform.h 
b/gr-qtgui/include/gnuradio/qtgui/displayform.h
index d8d7e74..c4a9cf7 100644
--- a/gr-qtgui/include/gnuradio/qtgui/displayform.h
+++ b/gr-qtgui/include/gnuradio/qtgui/displayform.h
@@ -129,7 +129,6 @@ protected:
   PopupMenu *d_samp_rate_act;
   QAction *d_save_act;
 
-  QTimer *d_display_timer;
   double d_update_time;
 };
 
diff --git a/gr-qtgui/lib/displayform.cc b/gr-qtgui/lib/displayform.cc
index 036370f..b811801 100644
--- a/gr-qtgui/lib/displayform.cc
+++ b/gr-qtgui/lib/displayform.cc
@@ -91,7 +91,7 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent)
       connect(d_marker_alpha_menu[i], SIGNAL(whichTrigger(int, int)),
              this, SLOT(setMarkerAlpha(int, int)));
     }
-    
+
     d_lines_menu.push_back(new QMenu(tr(""), this));
     d_lines_menu[i]->addAction(d_line_title_act[i]);
     d_lines_menu[i]->addMenu(d_line_color_menu[i]);
@@ -122,10 +122,6 @@ DisplayForm::DisplayForm(int nplots, QWidget* parent)
   d_menu->addAction(d_save_act);
 
   Reset();
-
-  // Create a timer to update plots at the specified rate
-  d_display_timer = new QTimer(this);
-  connect(d_display_timer, SIGNAL(timeout()), this, SLOT(updateGuiTimer()));
 }
 
 DisplayForm::~DisplayForm()
@@ -133,11 +129,7 @@ DisplayForm::~DisplayForm()
   d_isclosed = true;
 
   // Qt deletes children when parent is deleted
-
   // Don't worry about deleting Display Plots - they are deleted when parents 
are deleted
-
-  d_display_timer->stop();
-  delete d_display_timer;
 }
 
 void
@@ -206,7 +198,6 @@ void
 DisplayForm::setUpdateTime(double t)
 {
   d_update_time = t;
-  d_display_timer->start(d_update_time);
 }
 
 void
diff --git a/gr-qtgui/lib/freqdisplayform.cc b/gr-qtgui/lib/freqdisplayform.cc
index 32d82b9..2ea01f3 100644
--- a/gr-qtgui/lib/freqdisplayform.cc
+++ b/gr-qtgui/lib/freqdisplayform.cc
@@ -39,7 +39,7 @@ FreqDisplayForm::FreqDisplayForm(int nplots, QWidget* parent)
   d_num_real_data_points = 1024;
   d_fftsize = 1024;
   d_fftavg = 1.0;
-  
+
   d_sizemenu = new FFTSizeMenu(this);
   d_avgmenu = new FFTAverageMenu(this);
   d_winmenu = new FFTWindowMenu(this);