diff options
| author | Josh Blum | 2011-10-17 07:35:56 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-17 07:35:56 -0700 |
| commit | 41ce01bd6f602009b83422550b0b91bddd830c84 (patch) | |
| tree | 133899a93985441c97f8ed2f566e71ada32a0681 /gr-qtgui/lib/FrequencyDisplayPlot.h | |
| parent | 5179a1ead31e678d575890fb2e413c62bf00c255 (diff) | |
| parent | a4dbd973fc6376bacf3c45e63aba61a471c468b3 (diff) | |
| download | gnuradio-41ce01bd6f602009b83422550b0b91bddd830c84.tar.gz gnuradio-41ce01bd6f602009b83422550b0b91bddd830c84.tar.bz2 gnuradio-41ce01bd6f602009b83422550b0b91bddd830c84.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
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; |