Advertisement
Guest User

Untitled

a guest
Oct 18th, 2011
99
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.70 KB | None | 0 0
  1. diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
  2. index 7abd9ae..94a8e62 100644
  3. --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
  4. +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
  5. @@ -318,7 +318,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent)
  6.  
  7. #else
  8. d_spectrogram = new QwtPlotSpectrogram("Spectrogram");
  9. - d_spectrogram->setData(*d_data);
  10. + d_spectrogram->setData(d_data);
  11. d_spectrogram->setDisplayMode(QwtPlotSpectrogram::ImageMode, true);
  12. d_spectrogram->setColorMap(new ColorMap_MultiColor());
  13. #endif
  14. diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc
  15. index 527eea2..dafb539 100644
  16. --- a/gr-qtgui/lib/plot_waterfall.cc
  17. +++ b/gr-qtgui/lib/plot_waterfall.cc
  18. @@ -180,12 +180,13 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap &xMap,
  19. if ( area.isEmpty() )
  20. return QImage();
  21.  
  22. - QRect rect = transform(xMap, yMap, area);
  23. + QRectF rectF = QwtScaleMap::transform(xMap, yMap, area);
  24. + QRect rect(rectF.x(), rectF.y(), rectF.width(), rectF.height());
  25.  
  26. QwtScaleMap xxMap = xMap;
  27. QwtScaleMap yyMap = yMap;
  28.  
  29. - const QSize res = d_data->data->rasterHint(area);
  30. + const QSize res;//I dont even know = d_data->data->rasterHint(area);
  31. if ( res.isValid() )
  32. {
  33. /*
  34. diff --git a/gr-qtgui/lib/plot_waterfall.h b/gr-qtgui/lib/plot_waterfall.h
  35. index d4cb8d6..dae9efb 100644
  36. --- a/gr-qtgui/lib/plot_waterfall.h
  37. +++ b/gr-qtgui/lib/plot_waterfall.h
  38. @@ -37,9 +37,9 @@ public:
  39.  
  40. #if QWT_VERSION < 0x060000
  41. virtual QwtDoubleRect boundingRect() const;
  42. -#endif
  43.  
  44. virtual QSize rasterHint(const QwtDoubleRect &) const;
  45. +#endif
  46.  
  47. virtual int rtti() const;
  48.  
  49.  
  50.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement