srsgui/trunk/srsgui-qwt-6.2.patch

   1 diff --git a/include/srsgui/common/WaterfallData.h b/include/srsgui/common/WaterfallData.h
   2 index a289c6d..5cde564 100755
   3 --- a/include/srsgui/common/WaterfallData.h
   4 +++ b/include/srsgui/common/WaterfallData.h
   5 @@ -2,6 +2,7 @@
   6  #define WATERFALLDATA_H
   7
   8  #include <qwt_raster_data.h>
   9 +#include <qwt_interval.h>
  10  #ifndef Q_MOC_RUN
  11  #include <boost/circular_buffer.hpp>
  12  #include <boost/shared_ptr.hpp>
  13 @@ -65,6 +66,16 @@ public:
  14      return *(std::min_element(minVec.begin(),minVec.end()));
  15    }
  16
  17 +  QwtInterval interval( Qt::Axis axis) const
  18 +  {
  19 +    return d_intervals[axis];
  20 +  }
  21 +
  22 +  void setInterval( Qt::Axis axis, const QwtInterval &interval )
  23 +  {
  24 +    d_intervals[axis] = interval;
  25 +  }
  26 +
  27    double value(double x, double y) const
  28    {
  29      double bottom = interval(Qt::YAxis).minValue();
  30 @@ -88,6 +99,7 @@ private:
  31    VecPtrBuf data_;
  32    int nData_;
  33    int nRows_;
  34 +  QwtInterval d_intervals[3];
  35  };
  36
  37  #endif // WATERFALLDATA_H
  38 diff --git a/src/common/Spectrogramplot.cpp b/src/common/Spectrogramplot.cpp
  39 index ca9fad9..92a25d5 100755
  40 --- a/src/common/Spectrogramplot.cpp
  41 +++ b/src/common/Spectrogramplot.cpp
  42 @@ -8,6 +8,8 @@
  43  #include <qwt_plot_canvas.h>
  44  #include "srsgui/common/Spectrogramplot.h"
  45
  46 +#include <QPen>
  47 +
  48  class MyZoomer: public QwtPlotZoomer
  49  {
  50  public:
  51 @@ -101,8 +103,8 @@ Spectrogramplot::Spectrogramplot(int numDataPoints, int numRows, QWidget *parent
  52    sd->setMinimumExtent( fm.width("100.00") );
  53
  54    const QColor c(Qt::darkBlue);
  55 -  zoomer_->setRubberBandPen(c);
  56 -  zoomer_->setTrackerPen(c);
  57 +  zoomer_->setRubberBandPen(QPen(c));
  58 +  zoomer_->setTrackerPen(QPen(c));
  59  }
  60
  61  void Spectrogramplot::appendData(double* data, int n)