summaryrefslogtreecommitdiff
path: root/gr-qtgui/lib/plot_waterfall.cc
diff options
context:
space:
mode:
authorTom Rondeau2011-10-17 20:49:17 -0700
committerTom Rondeau2011-10-17 20:49:17 -0700
commitb9156049149863d75e77dc619ce4d96f8ec0eafc (patch)
tree66ca336a6f5b351f75286a12baeaedb1148db50a /gr-qtgui/lib/plot_waterfall.cc
parent006712e264f7659c40212e8acf1611c7a227655a (diff)
downloadgnuradio-b9156049149863d75e77dc619ce4d96f8ec0eafc.tar.gz
gnuradio-b9156049149863d75e77dc619ce4d96f8ec0eafc.tar.bz2
gnuradio-b9156049149863d75e77dc619ce4d96f8ec0eafc.zip
qtgui: a few more fixes for qwt 5.2/6.0.
Diffstat (limited to 'gr-qtgui/lib/plot_waterfall.cc')
-rw-r--r--gr-qtgui/lib/plot_waterfall.cc7
1 files changed, 6 insertions, 1 deletions
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() )
{
/*