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/FrequencyDisplayPlot.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/FrequencyDisplayPlot.h')
| -rw-r--r-- | gr-qtgui/lib/FrequencyDisplayPlot.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h index a263fec2f..961f30168 100644 --- a/gr-qtgui/lib/FrequencyDisplayPlot.h +++ b/gr-qtgui/lib/FrequencyDisplayPlot.h @@ -39,6 +39,10 @@ #include <qwt_symbol.h> #include <qtgui_util.h> +#if QWT_VERSION >= 0x060000 +#include <qwt_compat.h> +#endif + class FrequencyDisplayPlot:public QwtPlot{ Q_OBJECT @@ -76,7 +80,11 @@ public slots: void SetLowerIntensityLevel(const double); void SetUpperIntensityLevel(const double); +#if QWT_VERSION < 0x060000 void OnPickerPointSelected(const QwtDoublePoint & p); +#else + void OnPickerPointSelected(const QPointF & p); +#endif signals: void plotPointSelected(const QPointF p); @@ -107,6 +115,7 @@ private: QwtPlotMarker *_markerCF; QwtDblClickPlotPicker *_picker; + QwtPlotMagnifier *_magnifier; double* _dataPoints; |