summaryrefslogtreecommitdiff
path: root/gr-qtgui
diff options
context:
space:
mode:
Diffstat (limited to 'gr-qtgui')
-rwxr-xr-xgr-qtgui/apps/pyqt_example_c.py2
-rwxr-xr-xgr-qtgui/apps/pyqt_example_f.py2
-rwxr-xr-xgr-qtgui/apps/qt_digital.py4
-rwxr-xr-xgr-qtgui/apps/usrp2_display.py2
-rwxr-xr-xgr-qtgui/apps/usrp_display.py2
-rw-r--r--gr-qtgui/grc/qtgui_sink_x.xml10
-rw-r--r--gr-qtgui/lib/.gitignore1
-rw-r--r--gr-qtgui/lib/qtgui_sink_c.cc13
-rw-r--r--gr-qtgui/lib/qtgui_sink_c.h10
-rw-r--r--gr-qtgui/lib/qtgui_sink_f.cc13
-rw-r--r--gr-qtgui/lib/qtgui_sink_f.h9
-rw-r--r--gr-qtgui/lib/spectrumdisplayform.cc2
-rw-r--r--gr-qtgui/lib/spectrumdisplayform.h2
-rwxr-xr-xgr-qtgui/python/qa_qtgui.py10
-rw-r--r--gr-qtgui/swig/qtgui_swig.i18
15 files changed, 29 insertions, 71 deletions
diff --git a/gr-qtgui/apps/pyqt_example_c.py b/gr-qtgui/apps/pyqt_example_c.py
index e1fb8a6be..90eec3694 100755
--- a/gr-qtgui/apps/pyqt_example_c.py
+++ b/gr-qtgui/apps/pyqt_example_c.py
@@ -121,7 +121,7 @@ class my_top_block(gr.top_block):
self.snk1 = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
"Complex Signal Example",
- True, True, False, True, False)
+ True, True, True, False)
self.connect(src1, (src,0))
self.connect(src2, (src,1))
diff --git a/gr-qtgui/apps/pyqt_example_f.py b/gr-qtgui/apps/pyqt_example_f.py
index 55d987329..29905b8d9 100755
--- a/gr-qtgui/apps/pyqt_example_f.py
+++ b/gr-qtgui/apps/pyqt_example_f.py
@@ -120,7 +120,7 @@ class my_top_block(gr.top_block):
self.snk1 = qtgui.sink_f(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
0, Rs,
"Float Signal Example",
- True, True, False, True, False)
+ True, True, True, False)
self.connect(src1, (src,0))
self.connect(src2, (src,1))
diff --git a/gr-qtgui/apps/qt_digital.py b/gr-qtgui/apps/qt_digital.py
index 7b9e9b773..c6920a05d 100755
--- a/gr-qtgui/apps/qt_digital.py
+++ b/gr-qtgui/apps/qt_digital.py
@@ -185,11 +185,11 @@ class my_top_block(gr.top_block):
self.thr = gr.throttle(gr.sizeof_char, self._sample_rate)
self.snk_tx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
0, self._sample_rate*self.sps,
- "Tx", True, True, False, True, True)
+ "Tx", True, True, True, True)
self.snk_rx = qtgui.sink_c(fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
0, self._sample_rate,
- "Rx", True, True, False, True, True)
+ "Rx", True, True, True, True)
self.connect(self.src, self.thr, self.mod, self.channel, self.snk_tx)
self.connect(self.channel, self.rx_rrc, self.receiver, self.snk_rx)
diff --git a/gr-qtgui/apps/usrp2_display.py b/gr-qtgui/apps/usrp2_display.py
index 75d374c2b..ab1a6f742 100755
--- a/gr-qtgui/apps/usrp2_display.py
+++ b/gr-qtgui/apps/usrp2_display.py
@@ -210,7 +210,7 @@ class my_top_block(gr.top_block):
self.snk = qtgui.sink_c(options.fft_size, gr.firdes.WIN_BLACKMAN_hARRIS,
self._freq, self._bandwidth,
"USRP2 Display",
- True, True, False, True, False)
+ True, True, True, False)
# Set up internal amplifier
self.amp = gr.multiply_const_cc(0.0)
diff --git a/gr-qtgui/apps/usrp_display.py b/gr-qtgui/apps/usrp_display.py
index 432e74d9a..131bc4a7e 100755
--- a/gr-qtgui/apps/usrp_display.py
+++ b/gr-qtgui/apps/usrp_display.py
@@ -229,7 +229,7 @@ class my_top_block(gr.top_block):
self.snk = qtgui.sink_c(self._fftsize, gr.firdes.WIN_BLACKMAN_hARRIS,
self._freq, self._bandwidth,
"USRP Display",
- True, True, False, True, False)
+ True, True, True, False)
# Set up internal amplifier
self.amp = gr.multiply_const_cc(0.0)
diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml
index 7a5f5ec13..8c470a1a5 100644
--- a/gr-qtgui/grc/qtgui_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_sink_x.xml
@@ -21,7 +21,6 @@ qtgui.$(type.fcn)(
$name, \#name
$plotfreq, \#plotfreq
$plotwaterfall, \#plotwaterfall
- $plotwaterfall3d, \#plotwaterfall3d
$plottime, \#plottime
$plotconst, \#plotconst
)
@@ -90,15 +89,6 @@ $(gui_hint()($win))</make>
<option><name>Off</name><key>False</key></option>
</param>
<param>
- <name>Plot Waterfall 3D</name>
- <key>plotwaterfall3d</key>
- <value>True</value>
- <type>bool</type>
- <hide>part</hide>
- <option><name>On</name><key>True</key></option>
- <option><name>Off</name><key>False</key></option>
- </param>
- <param>
<name>Plot Time</name>
<key>plottime</key>
<value>True</value>
diff --git a/gr-qtgui/lib/.gitignore b/gr-qtgui/lib/.gitignore
index 61b9ca8c1..fc4f8cdfe 100644
--- a/gr-qtgui/lib/.gitignore
+++ b/gr-qtgui/lib/.gitignore
@@ -5,7 +5,6 @@
/qtgui.cc
/qtgui.py
/WaterfallDisplayPlot.moc.cc
-/Waterfall3DDisplayPlot.moc.cc
/TimeDomainDisplayPlot.moc.cc
/spectrumdisplayform.moc.cc
/spectrumdisplayform.ui.h
diff --git a/gr-qtgui/lib/qtgui_sink_c.cc b/gr-qtgui/lib/qtgui_sink_c.cc
index bdd941fe1..4cbd47c55 100644
--- a/gr-qtgui/lib/qtgui_sink_c.cc
+++ b/gr-qtgui/lib/qtgui_sink_c.cc
@@ -35,16 +35,14 @@ qtgui_make_sink_c (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent)
{
return gnuradio::get_initial_sptr(new qtgui_sink_c (fftsize, wintype,
fc, bw, name,
plotfreq, plotwaterfall,
- plotwaterfall3d, plottime,
- plotconst,
+ plottime, plotconst,
use_openGL,
parent));
}
@@ -53,8 +51,7 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent)
: gr_block ("sink_c",
@@ -67,10 +64,6 @@ qtgui_sink_c::qtgui_sink_c (int fftsize, int wintype,
d_plottime(plottime), d_plotconst(plotconst),
d_parent(parent)
{
- if(plotwaterfall3d == true) {
- fprintf(stderr, "Warning: plotting Waterfall3D has been removed; enabling plotwaterfall3d has no effect.\n");
- }
-
d_main_gui = NULL;
// Perform fftshift operation;
diff --git a/gr-qtgui/lib/qtgui_sink_c.h b/gr-qtgui/lib/qtgui_sink_c.h
index 59b5acfe5..22ca07f77 100644
--- a/gr-qtgui/lib/qtgui_sink_c.h
+++ b/gr-qtgui/lib/qtgui_sink_c.h
@@ -28,7 +28,6 @@
#include <gr_firdes.h>
#include <gri_fft.h>
#include <qapplication.h>
-//#include <qtgui.h>
#include "SpectrumGUIClass.h"
class qtgui_sink_c;
@@ -38,8 +37,7 @@ qtgui_sink_c_sptr qtgui_make_sink_c (int fftsize, int wintype,
double fc=0, double bandwidth=1.0,
const std::string &name="Spectrum Display",
bool plotfreq=true, bool plotwaterfall=true,
- bool plotwaterfall3d=true, bool plottime=true,
- bool plotconst=true,
+ bool plottime=true, bool plotconst=true,
bool use_openGL=true,
QWidget *parent=NULL);
@@ -50,16 +48,14 @@ private:
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
qtgui_sink_c (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
diff --git a/gr-qtgui/lib/qtgui_sink_f.cc b/gr-qtgui/lib/qtgui_sink_f.cc
index e27ff3ac1..90d4d7a70 100644
--- a/gr-qtgui/lib/qtgui_sink_f.cc
+++ b/gr-qtgui/lib/qtgui_sink_f.cc
@@ -35,16 +35,14 @@ qtgui_make_sink_f (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent)
{
return gnuradio::get_initial_sptr(new qtgui_sink_f (fftsize, wintype,
fc, bw, name,
plotfreq, plotwaterfall,
- plotwaterfall3d, plottime,
- plotconst,
+ plottime, plotconst,
use_openGL,
parent));
}
@@ -53,8 +51,7 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent)
: gr_block ("sink_f",
@@ -67,10 +64,6 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype,
d_plottime(plottime), d_plotconst(plotconst),
d_parent(parent)
{
- if(plotwaterfall3d == true) {
- fprintf(stderr, "Warning: plotting Waterfall3D has been removed; enabling plotwaterfall3d has no effect.\n");
- }
-
d_main_gui = NULL;
// Perform fftshift operation;
diff --git a/gr-qtgui/lib/qtgui_sink_f.h b/gr-qtgui/lib/qtgui_sink_f.h
index a798a41bb..8f27d120a 100644
--- a/gr-qtgui/lib/qtgui_sink_f.h
+++ b/gr-qtgui/lib/qtgui_sink_f.h
@@ -38,8 +38,7 @@ qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
double fc=0, double bw=1.0,
const std::string &name="Spectrum Display",
bool plotfreq=true, bool plotwaterfall=true,
- bool plotwaterfall3d=true, bool plottime=true,
- bool plotconst=true,
+ bool plottime=true, bool plotconst=true,
bool use_openGL=true,
QWidget *parent=NULL);
@@ -50,16 +49,14 @@ private:
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
qtgui_sink_f (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
diff --git a/gr-qtgui/lib/spectrumdisplayform.cc b/gr-qtgui/lib/spectrumdisplayform.cc
index d4fc03781..101bbc52b 100644
--- a/gr-qtgui/lib/spectrumdisplayform.cc
+++ b/gr-qtgui/lib/spectrumdisplayform.cc
@@ -3,8 +3,6 @@
#include <QMessageBox>
#include <spectrumdisplayform.h>
-int SpectrumDisplayForm::_openGLWaterfall3DFlag = -1;
-
SpectrumDisplayForm::SpectrumDisplayForm(bool useOpenGL, QWidget* parent)
: QWidget(parent)
{
diff --git a/gr-qtgui/lib/spectrumdisplayform.h b/gr-qtgui/lib/spectrumdisplayform.h
index fbd08349b..e760ccc13 100644
--- a/gr-qtgui/lib/spectrumdisplayform.h
+++ b/gr-qtgui/lib/spectrumdisplayform.h
@@ -95,7 +95,6 @@ private:
double _noiseFloorAmplitude;
double _peakFrequency;
double _peakAmplitude;
- static int _openGLWaterfall3DFlag;
double _stopFrequency;
//SpectrumUpdateEvent _lastSpectrumEvent;
@@ -103,7 +102,6 @@ private:
// whether or not to use a particular display
int d_plot_fft;
int d_plot_waterfall;
- int d_plot_waterfall3d;
int d_plot_time;
int d_plot_constellation;
diff --git a/gr-qtgui/python/qa_qtgui.py b/gr-qtgui/python/qa_qtgui.py
index 7d3cf8098..dd6529ce0 100755
--- a/gr-qtgui/python/qa_qtgui.py
+++ b/gr-qtgui/python/qa_qtgui.py
@@ -34,12 +34,12 @@ class test_qtgui(gr_unittest.TestCase):
self.tb = None
def test01 (self):
- pass
+ #pass
# Test to make sure we can instantiate these
- #self.qapp = QtGui.QApplication(sys.argv)
- #self.qtsnk = qtgui_swig.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
- # 0, 1, "Test",
- # True, True, False, True, True)
+ self.qapp = QtGui.QApplication(sys.argv)
+ self.qtsnk = qtgui_swig.sink_c(1024, gr.firdes.WIN_BLACKMAN_hARRIS,
+ 0, 1, "Test",
+ True, True, True, True)
if __name__ == '__main__':
diff --git a/gr-qtgui/swig/qtgui_swig.i b/gr-qtgui/swig/qtgui_swig.i
index ba97b4e9a..8069ed6c2 100644
--- a/gr-qtgui/swig/qtgui_swig.i
+++ b/gr-qtgui/swig/qtgui_swig.i
@@ -33,8 +33,7 @@ GR_SWIG_BLOCK_MAGIC(qtgui,sink_c)
double fc=0, double bw=1.0,
const std::string &name="Display",
bool plotfreq=true, bool plotwaterfall=true,
- bool plotwaterfall3d=true, bool plottime=true,
- bool plotconst=true,
+ bool plottime=true, bool plotconst=true,
bool use_openGL=true,
QWidget *parent=NULL);
@@ -45,16 +44,14 @@ private:
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
qtgui_sink_c (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
@@ -82,8 +79,7 @@ qtgui_sink_f_sptr qtgui_make_sink_f (int fftsize, int wintype,
double fc=0, double bw=0.0,
const std::string &name="Display",
bool plotfreq=true, bool plotwaterfall=true,
- bool plotwaterfall3d=true, bool plottime=true,
- bool plotconst=true,
+ bool plottime=true, bool plotconst=true,
bool use_openGL=true,
QWidget *parent=NULL);
@@ -94,16 +90,14 @@ private:
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
qtgui_sink_f (int fftsize, int wintype,
double fc, double bw,
const std::string &name,
bool plotfreq, bool plotwaterfall,
- bool plotwaterfall3d, bool plottime,
- bool plotconst,
+ bool plottime, bool plotconst,
bool use_openGL,
QWidget *parent);
generated by cgit (git 2.34.1) at 2024-12-20 06:47:30 +0000