From 25fd6e0324dc8296b66a3c9b8e628d6738f15fe7 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sat, 15 Oct 2011 18:23:04 -0400
Subject: qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain
 backwards compatability to 5.2). This wip works for just the fft plots.

---
 gr-qtgui/lib/FrequencyDisplayPlot.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'gr-qtgui/lib/FrequencyDisplayPlot.h')

diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h
index a263fec2f..cd9393de8 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
 
@@ -75,8 +79,7 @@ public slots:
   void resizeSlot( QSize *e );
   void SetLowerIntensityLevel(const double);
   void SetUpperIntensityLevel(const double);
-
-  void OnPickerPointSelected(const QwtDoublePoint & p);
+  void OnPickerPointSelected(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
@@ -107,6 +110,7 @@ private:
   QwtPlotMarker *_markerCF;
 
   QwtDblClickPlotPicker *_picker;
+  
   QwtPlotMagnifier *_magnifier;
   
   double* _dataPoints;
-- 
cgit 


From 45c2212608ca66b5fadbc860771e042198e1ebcd Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 16 Oct 2011 19:45:29 -0400
Subject: qtgui: more compatability issues.

---
 gr-qtgui/lib/FrequencyDisplayPlot.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'gr-qtgui/lib/FrequencyDisplayPlot.h')

diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h
index cd9393de8..961f30168 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.h
@@ -79,7 +79,12 @@ public slots:
   void resizeSlot( QSize *e );
   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);
-- 
cgit