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/waterfallGlobalData.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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

diff --git a/gr-qtgui/lib/waterfallGlobalData.h b/gr-qtgui/lib/waterfallGlobalData.h
index 51f65064c..f274daa2d 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,14 @@ 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&);
+#else
+  virtual QwtInterval interval() const;
+  virtual void setInterval(Qt::Axis axis, const QwtInterval&);
+#endif
 
   virtual double value(double x, double y) const;
   
@@ -38,7 +48,14 @@ protected:
   uint64_t _fftPoints;
   uint64_t _historyLength;
   int _numLinesToUpdate;
+
+  QRectF _bounding_rect;
+
+#if QWT_VERSION < 0x060000
   QwtDoubleInterval _intensityRange;
+#else
+  QwtInterval _intensityRange;
+#endif
 
 private:
 
-- 
cgit 


From 4496fae2deea200755225c007a26f4c7be0470e9 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Sun, 16 Oct 2011 16:32:41 -0400
Subject: qtgui: waterfall plot mostly working under qwt6 (plots, but updates
 to scale and color not working yet).

---
 gr-qtgui/lib/waterfallGlobalData.h | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/gr-qtgui/lib/waterfallGlobalData.h b/gr-qtgui/lib/waterfallGlobalData.h
index f274daa2d..89e48da5f 100644
--- a/gr-qtgui/lib/waterfallGlobalData.h
+++ b/gr-qtgui/lib/waterfallGlobalData.h
@@ -25,9 +25,6 @@ public:
 #if QWT_VERSION < 0x060000
   virtual QwtDoubleInterval range() const;
   virtual void setRange(const QwtDoubleInterval&);
-#else
-  virtual QwtInterval interval() const;
-  virtual void setInterval(Qt::Axis axis, const QwtInterval&);
 #endif
 
   virtual double value(double x, double y) const;
@@ -49,8 +46,6 @@ protected:
   uint64_t _historyLength;
   int _numLinesToUpdate;
 
-  QRectF _bounding_rect;
-
 #if QWT_VERSION < 0x060000
   QwtDoubleInterval _intensityRange;
 #else
-- 
cgit