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/ConstellationDisplayPlot.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/ConstellationDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/src/lib/ConstellationDisplayPlot.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc index e8e6288f5..9ad5bdd3c 100644 --- a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc +++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc @@ -24,6 +24,7 @@ public: } protected: + using QwtPlotZoomer::trackerText; virtual QwtText trackerText( const QwtDoublePoint& p ) const { QwtText t(QString("(%1, %2)").arg(p.x(), 0, 'f', 4). |