From 4e8fe5fab16c13967994167c5d9b4713dd82ff58 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <tom@trondeau.com>
Date: Tue, 17 Dec 2013 19:22:03 -0500
Subject: qtgui: enables use of QWT 6.1.
---
gr-qtgui/lib/TimeRasterDisplayPlot.cc | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
(limited to 'gr-qtgui/lib/TimeRasterDisplayPlot.cc')
diff --git a/gr-qtgui/lib/TimeRasterDisplayPlot.cc b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
index b26f7f071b..afe326bdbb 100644
--- a/gr-qtgui/lib/TimeRasterDisplayPlot.cc
+++ b/gr-qtgui/lib/TimeRasterDisplayPlot.cc
@@ -29,11 +29,17 @@
#include <qwt_color_map.h>
#include <qwt_scale_draw.h>
#include <qwt_legend.h>
-#include <qwt_legend_item.h>
#include <qwt_plot_layout.h>
#include <QColor>
#include <iostream>
+#if QWT_VERSION < 0x060100
+#include <qwt_legend_item.h>
+#else /* QWT_VERSION < 0x060100 */
+#include <qwt_legend_data.h>
+#include <qwt_legend_label.h>
+#endif /* QWT_VERSION < 0x060100 */
+
#include <boost/date_time/posix_time/posix_time.hpp>
namespace pt = boost::posix_time;
@@ -125,8 +131,13 @@ class TimeRasterZoomer: public QwtPlotZoomer, public TimePrecisionClass,
public TimeScaleData
{
public:
+#if QWT_VERSION < 0x060100
TimeRasterZoomer(QwtPlotCanvas* canvas, double rows, double cols,
const unsigned int timePrecision)
+#else /* QWT_VERSION < 0x060100 */
+ TimeRasterZoomer(QWidget* canvas, double rows, double cols,
+ const unsigned int timePrecision)
+#endif /* QWT_VERSION < 0x060100 */
: QwtPlotZoomer(canvas), TimePrecisionClass(timePrecision), TimeScaleData(),
d_rows(static_cast<double>(rows)), d_cols(static_cast<double>(cols))
{
--
cgit v1.2.3