diff options
| author | Josh Blum | 2011-10-17 23:40:51 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-10-17 23:40:51 -0700 |
| commit | 161910c66e88c081d267f4b2b699f7431f287279 (patch) | |
| tree | 86500bb995f5afeece82042eb29eeb3716151d1d /gr-qtgui/lib | |
| parent | 41ce01bd6f602009b83422550b0b91bddd830c84 (diff) | |
| parent | f664585ddddeb040d1cd285d0b9dfb41c4979b91 (diff) | |
| download | gnuradio-161910c66e88c081d267f4b2b699f7431f287279.tar.gz gnuradio-161910c66e88c081d267f4b2b699f7431f287279.tar.bz2 gnuradio-161910c66e88c081d267f4b2b699f7431f287279.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
gr-digital/include/digital_ofdm_cyclic_prefixer.h
gr-digital/include/digital_ofdm_frame_acquisition.h
gr-digital/include/digital_ofdm_frame_sink.h
gr-digital/include/digital_ofdm_insert_preamble.h
gr-digital/include/digital_ofdm_mapper_bcv.h
gr-digital/include/digital_ofdm_sampler.h
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 | ||||
| -rw-r--r-- | gr-qtgui/lib/plot_waterfall.h | 3 |
3 files changed, 8 insertions, 4 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() ) { /* diff --git a/gr-qtgui/lib/plot_waterfall.h b/gr-qtgui/lib/plot_waterfall.h index d4cb8d6da..1613dd8de 100644 --- a/gr-qtgui/lib/plot_waterfall.h +++ b/gr-qtgui/lib/plot_waterfall.h @@ -37,9 +37,8 @@ public: #if QWT_VERSION < 0x060000 virtual QwtDoubleRect boundingRect() const; -#endif - virtual QSize rasterHint(const QwtDoubleRect &) const; +#endif virtual int rtti() const; |