diff options
| author | Johnathan Corgan | 2010-10-06 12:20:08 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-10-06 12:20:08 -0700 |
| commit | 2723c3fb2a22872bba1c72bab1d0c4e74ffda86f (patch) | |
| tree | c1a6c2564c15464b8c1275620c520482f9b5ac9c /gr-qtgui/src/lib/qtgui_sink_f.cc | |
| parent | 916b205660aa676e1587411b48f24b6d5d3c0de2 (diff) | |
| parent | f18025c099e4f69829dc4fc1732a4a9e83b3eb1d (diff) | |
| download | gnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.tar.gz gnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.tar.bz2 gnuradio-2723c3fb2a22872bba1c72bab1d0c4e74ffda86f.zip | |
Merge remote branch 'tom/qtfix' into maint
* tom/qtfix:
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Fixed gitignore to reflect changes in moc/ui file naming.
Fixes a lot of warnings by cleaning up namespace issues.
Finally, the simple fix for the qtgui issues; also, changed the naming scheme output from _moc to .moc files because I think this looks cleaner.
Removing qwtplot3d dependency and fixing a missed include in waterfallGlobalData.h.
Removing Waterfall3DPlot. The qwt_plot3d is too much of a hassle to deal with and the plotting is not that stable even when it does work. This does not change the API.
Diffstat (limited to 'gr-qtgui/src/lib/qtgui_sink_f.cc')
| -rw-r--r-- | gr-qtgui/src/lib/qtgui_sink_f.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gr-qtgui/src/lib/qtgui_sink_f.cc b/gr-qtgui/src/lib/qtgui_sink_f.cc index 976b1761b..ab4fd082d 100644 --- a/gr-qtgui/src/lib/qtgui_sink_f.cc +++ b/gr-qtgui/src/lib/qtgui_sink_f.cc @@ -64,10 +64,13 @@ qtgui_sink_f::qtgui_sink_f (int fftsize, int wintype, d_wintype((gr_firdes::win_type)(wintype)), d_center_freq(fc), d_bandwidth(bw), d_name(name), d_plotfreq(plotfreq), d_plotwaterfall(plotwaterfall), - d_plotwaterfall3d(plotwaterfall3d), d_plottime(plottime), - d_plotconst(plotconst), + 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; pthread_mutex_init(&d_pmutex, NULL); lock(); @@ -136,8 +139,7 @@ qtgui_sink_f::initialize(const bool opengl) d_main_gui->OpenSpectrumWindow(d_parent, d_plotfreq, d_plotwaterfall, - d_plotwaterfall3d, d_plottime, - d_plotconst, + d_plottime, d_plotconst, opengl); // initialize update time to 10 times a second |