1 files changed, 71 insertions, 5 deletions

diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc
index 1ba153f0d..04366a297 100644
--- a/gr-qtgui/lib/waterfallGlobalData.cc
+++ b/gr-qtgui/lib/waterfallGlobalData.cc
@@ -2,14 +2,19 @@
 #define WATERFALL_GLOBAL_DATA_CPP
 
 #include <waterfallGlobalData.h>
+#include <cstdio>
 
 WaterfallData::WaterfallData(const double minimumFrequency,
 			     const double maximumFrequency,
 			     const uint64_t fftPoints,
 			     const unsigned int historyExtent)
+#if QWT_VERSION < 0x060000
   : QwtRasterData(QwtDoubleRect(minimumFrequency /* X START */,  0 /* Y START */, 
 				maximumFrequency - minimumFrequency /* WIDTH */,  
 				static_cast<double>(historyExtent)/* HEIGHT */))
+#else
+    : QwtRasterData()
+#endif
 {
   _intensityRange = QwtDoubleInterval(-200.0, 0.0);
   
@@ -18,6 +23,12 @@ WaterfallData::WaterfallData(const double minimumFrequency,
 
   _spectrumData = new double[_fftPoints * _historyLength];
 
+#if QWT_VERSION >= 0x060000
+  setInterval(Qt::XAxis, QwtInterval(minimumFrequency, maximumFrequency));
+  setInterval(Qt::YAxis, QwtInterval(0, historyExtent));
+  setInterval(Qt::ZAxis, QwtInterval(-200, 0.0));
+#endif
+
   Reset();
 }
 
@@ -35,6 +46,7 @@ void WaterfallData::Reset()
 
 void WaterfallData::Copy(const WaterfallData* rhs)
 {
+#if QWT_VERSION < 0x060000  
   if((_fftPoints != rhs->GetNumFFTPoints()) ||
      (boundingRect() != rhs->boundingRect()) ){
     _fftPoints = rhs->GetNumFFTPoints();
@@ -42,38 +54,78 @@ void WaterfallData::Copy(const WaterfallData* rhs)
     delete[] _spectrumData;
     _spectrumData = new double[_fftPoints * _historyLength];
   }
+#else
+  if(_fftPoints != rhs->GetNumFFTPoints()) {
+    _fftPoints = rhs->GetNumFFTPoints();
+    delete[] _spectrumData;
+    _spectrumData = new double[_fftPoints * _historyLength];
+  }
+#endif
+
   Reset();
   SetSpectrumDataBuffer(rhs->GetSpectrumDataBuffer());
   SetNumLinesToUpdate(rhs->GetNumLinesToUpdate());
+
+#if QWT_VERSION < 0x060000  
   setRange(rhs->range());
+#else
+  setInterval(Qt::XAxis, rhs->interval(Qt::XAxis));
+  setInterval(Qt::YAxis, rhs->interval(Qt::YAxis));
+  setInterval(Qt::ZAxis, rhs->interval(Qt::ZAxis));
+#endif  
 }
 
 void WaterfallData::ResizeData(const double startFreq,
 			       const double stopFreq,
 			       const uint64_t fftPoints)
 {
+#if QWT_VERSION < 0x060000  
   if((fftPoints != GetNumFFTPoints()) ||
      (boundingRect().width() != (stopFreq - startFreq)) ||
      (boundingRect().left() != startFreq)){
+    
+    setBoundingRect(QwtDoubleRect(startFreq, 0,
+				  stopFreq-startFreq,
+				  boundingRect().height()));
+    _fftPoints = fftPoints;
+    delete[] _spectrumData;
+    _spectrumData = new double[_fftPoints * _historyLength];
+  }
+
+#else
+  if((fftPoints != GetNumFFTPoints()) ||
+     (interval(Qt::XAxis).width() != (stopFreq - startFreq)) ||
+     (interval(Qt::XAxis).minValue() != startFreq)){
+    
+    setInterval(Qt::XAxis, QwtInterval(startFreq, stopFreq));
 
-    setBoundingRect(QwtDoubleRect(startFreq, 0, stopFreq-startFreq, boundingRect().height()));
     _fftPoints = fftPoints;
     delete[] _spectrumData;
     _spectrumData = new double[_fftPoints * _historyLength];
   }
-   
+#endif
+  
   Reset();
 }
 
 QwtRasterData *WaterfallData::copy() const
 {
+#if QWT_VERSION < 0x060000  
   WaterfallData* returnData =  new WaterfallData(boundingRect().left(),
 						 boundingRect().right(),
 						 _fftPoints, _historyLength);
+#else
+  WaterfallData* returnData =  new WaterfallData(interval(Qt::XAxis).minValue(),
+						 interval(Qt::XAxis).maxValue(),
+						 _fftPoints, _historyLength);
+#endif
+
   returnData->Copy(this);
   return returnData;
 }
 
+
+#if QWT_VERSION < 0x060000
 QwtDoubleInterval WaterfallData::range() const
 {
   return _intensityRange;
@@ -84,14 +136,27 @@ void WaterfallData::setRange(const QwtDoubleInterval& newRange)
   _intensityRange = newRange;
 }
 
+#endif
+
+
 double WaterfallData::value(double x, double y) const
 {
   double returnValue = 0.0;
-
+  
+#if QWT_VERSION < 0x060000
   const unsigned int intY = static_cast<unsigned int>((1.0 - (y/boundingRect().height())) * 
-						      static_cast<double>(_historyLength - 1));
+						      static_cast<double>(_historyLength-1));
   const unsigned int intX = static_cast<unsigned int>((((x - boundingRect().left()) / boundingRect().width()) * 
 						       static_cast<double>(_fftPoints-1)) + 0.5);
+#else
+  double height = interval(Qt::YAxis).maxValue();
+  double left = interval(Qt::XAxis).minValue();
+  double right = interval(Qt::XAxis).maxValue();
+  double ylen = static_cast<double>(_historyLength-1);
+  double xlen = static_cast<double>(_fftPoints-1);
+  const unsigned int intY = static_cast<unsigned int>((1.0 - y/height) * ylen);
+  const unsigned int intX = static_cast<unsigned int>((((x - left) / (right-left)) * xlen) + 0.5);
+#endif
 
   const int location = (intY * _fftPoints) + intX;
   if((location > -1) && (location < static_cast<int64_t>(_fftPoints * _historyLength))){
@@ -132,7 +197,8 @@ void WaterfallData::addFFTData(const double* fftData,
     }
 
     // add the new buffer
-    memcpy(&_spectrumData[(_historyLength - 1) * _fftPoints], fftData, _fftPoints*sizeof(double));
+    memcpy(&_spectrumData[(_historyLength - 1) * _fftPoints], fftData,
+	   _fftPoints*sizeof(double));
   }
 }