diff options
| author | Tom Rondeau | 2011-10-17 21:04:33 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-17 21:04:33 -0700 |
| commit | 1c7bd647877ca835a410df903c478c99ead92b27 (patch) | |
| tree | d8d39715b64965d81372b78079113357851958ae /gr-qtgui/lib | |
| parent | 6fcf521394ed256f4e75d52e986e63e38f2ec56b (diff) | |
| parent | a69e35b2d9b5a07c86603a39b16111565258b41a (diff) | |
| download | gnuradio-1c7bd647877ca835a410df903c478c99ead92b27.tar.gz gnuradio-1c7bd647877ca835a410df903c478c99ead92b27.tar.bz2 gnuradio-1c7bd647877ca835a410df903c478c99ead92b27.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gr-qtgui/lib')
| -rw-r--r-- | gr-qtgui/lib/WaterfallDisplayPlot.cc | 2 | ||||
| -rw-r--r-- | gr-qtgui/lib/plot_waterfall.cc | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc index 7abd9aeef..94a8e6210 100644 --- a/gr-qtgui/lib/WaterfallDisplayPlot.cc +++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc @@ -318,7 +318,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(QWidget* parent) #else d_spectrogram = new QwtPlotSpectrogram("Spectrogram"); - d_spectrogram->setData(*d_data); + d_spectrogram->setData(d_data); d_spectrogram->setDisplayMode(QwtPlotSpectrogram::ImageMode, true); d_spectrogram->setColorMap(new ColorMap_MultiColor()); #endif diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc index 527eea22e..dbba657b8 100644 --- a/gr-qtgui/lib/plot_waterfall.cc +++ b/gr-qtgui/lib/plot_waterfall.cc @@ -180,12 +180,17 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap &xMap, if ( area.isEmpty() ) return QImage(); +#if QWT_VERSION < 0x060000 QRect rect = transform(xMap, yMap, area); + const QSize res = d_data->data->rasterHint(area); +#else + QRect rect(0,0,0,0); + const QSize res(0,0); +#endif QwtScaleMap xxMap = xMap; QwtScaleMap yyMap = yMap; - const QSize res = d_data->data->rasterHint(area); if ( res.isValid() ) { /* |