diff options
| author | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-16 22:14:29 -0400 |
| commit | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (patch) | |
| tree | 60b19871647430da19e7303b1394af50742d48dc /gr-qtgui/lib/waterfallGlobalData.h | |
| parent | e0fdd93625a6234ba0d9cabf6e6abfc4df9a2ec6 (diff) | |
| parent | 2d5a6f86fd3047748a9f816548e2901b02838734 (diff) | |
| download | gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.gz gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.tar.bz2 gnuradio-a4dbd973fc6376bacf3c45e63aba61a471c468b3.zip | |
Merge branch 'master' into next
Conflicts:
gr-qtgui/lib/Makefile.am
Diffstat (limited to 'gr-qtgui/lib/waterfallGlobalData.h')
| -rw-r--r-- | gr-qtgui/lib/waterfallGlobalData.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gr-qtgui/lib/waterfallGlobalData.h b/gr-qtgui/lib/waterfallGlobalData.h index 51f65064c..89e48da5f 100644 --- a/gr-qtgui/lib/waterfallGlobalData.h +++ b/gr-qtgui/lib/waterfallGlobalData.h @@ -4,6 +4,10 @@ #include <qwt_raster_data.h> #include <inttypes.h> +#if QWT_VERSION >= 0x060000 +#include <qwt_point_3d.h> // doesn't seem necessary, but is... +#include <qwt_compat.h> +#endif class WaterfallData: public QwtRasterData { @@ -17,8 +21,11 @@ public: virtual void ResizeData(const double, const double, const uint64_t); virtual QwtRasterData *copy() const; + +#if QWT_VERSION < 0x060000 virtual QwtDoubleInterval range() const; virtual void setRange(const QwtDoubleInterval&); +#endif virtual double value(double x, double y) const; @@ -38,7 +45,12 @@ protected: uint64_t _fftPoints; uint64_t _historyLength; int _numLinesToUpdate; + +#if QWT_VERSION < 0x060000 QwtDoubleInterval _intensityRange; +#else + QwtInterval _intensityRange; +#endif private: |