summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2011-04-06 00:07:00 -0400
committerTom Rondeau2011-04-06 00:07:00 -0400
commitb0f876b55549db96920c2b3bfee32de6748096af (patch)
treecbf505aeb62dc8e708e1fef753feb5edb4f14b7f
parent484b6a0715f2ed6e4f460ee05887e1e5c98c1e2f (diff)
downloadgnuradio-b0f876b55549db96920c2b3bfee32de6748096af.tar.gz
gnuradio-b0f876b55549db96920c2b3bfee32de6748096af.tar.bz2
gnuradio-b0f876b55549db96920c2b3bfee32de6748096af.zip
gr-qtgui: cleaning up unnecessary plotting calls.
-rwxr-xr-xgr-qtgui/apps/pyqt_example_c.py5
-rw-r--r--gr-qtgui/lib/ConstellationDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/FrequencyDisplayPlot.cc2
-rw-r--r--gr-qtgui/lib/TimeDomainDisplayPlot.cc4
-rw-r--r--gr-qtgui/lib/spectrumdisplayform.cc8
5 files changed, 3 insertions, 20 deletions
diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/apps/pyqt_example_c.py
index 6625857a5..e1fb8a6be 100755
--- a/gr-qtgui/apps/pyqt_example_c.py
+++ b/gr-qtgui/apps/pyqt_example_c.py
@@ -5,11 +5,6 @@ from gnuradio import qtgui
from PyQt4 import QtGui, QtCore
import sys, sip
-import os
-print os.getpid()
-raw_input()
-
-
class dialog_box(QtGui.QWidget):
def __init__(self, display, control):
QtGui.QWidget.__init__(self, None)
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index 9ad5bdd3c..71933cece 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -74,8 +74,6 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(QWidget* parent)
memset(_realDataPoints, 0x0, _numPoints*sizeof(double));
memset(_imagDataPoints, 0x0, _numPoints*sizeof(double));
- replot();
-
_zoomer = new ConstellationDisplayZoomer(canvas());
#if QT_VERSION < 0x040000
_zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
@@ -178,8 +176,6 @@ void ConstellationDisplayPlot::PlotNewData(const double* realDataPoints,
memcpy(_realDataPoints, realDataPoints, numDataPoints*sizeof(double));
memcpy(_imagDataPoints, imagDataPoints, numDataPoints*sizeof(double));
- replot();
-
_lastReplot = get_highres_clock();
}
}
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc
index d150e2e4c..45e2e6c16 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
@@ -367,8 +367,6 @@ FrequencyDisplayPlot::PlotNewData(const double* dataPoints, const int64_t numDat
SetUpperIntensityLevel(_peakAmplitude);
- replot();
-
_lastReplot = get_highres_clock();
}
}
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
index 9c98cec5b..da28d0304 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
@@ -121,8 +121,6 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(QWidget* parent):QwtPlot(parent)
_sampleRate = 1;
_resetXAxisPoints();
- replot();
-
#if QT_VERSION < 0x040000
_zoomer->setMousePattern(QwtEventPattern::MouseSelect2,
Qt::RightButton, Qt::ControlModifier);
@@ -220,8 +218,6 @@ void TimeDomainDisplayPlot::PlotNewData(const double* realDataPoints,
memcpy(_realDataPoints, realDataPoints, numDataPoints*sizeof(double));
memcpy(_imagDataPoints, imagDataPoints, numDataPoints*sizeof(double));
- replot();
-
_lastReplot = get_highres_clock();
}
}
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index d85637a67..d4fc03781 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -59,6 +59,9 @@ SpectrumDisplayForm::SpectrumDisplayForm(bool useOpenGL, QWidget* parent)
ToggleTabTime(false);
ToggleTabConstellation(false);
+ _historyEntry = 0;
+ _historyEntryCount = 0;
+
// Create a timer to update plots at the specified rate
displayTimer = new QTimer(this);
connect(displayTimer, SIGNAL(timeout()), this, SLOT(UpdateGuiTimer()));
@@ -74,11 +77,6 @@ SpectrumDisplayForm::~SpectrumDisplayForm()
delete[] _realFFTDataPoints;
delete[] _averagedValues;
- //delete _frequencyDisplayPlot;
- //delete _waterfallDisplayPlot;
- //delete _timeDomainDisplayPlot;
- //delete _constellationDisplayPlot;
-
for(unsigned int count = 0; count < _historyVector->size(); count++){
delete[] _historyVector->operator[](count);
}