diff options
| author | Tom Rondeau <tom@trondeau.com> | 2013-12-17 19:22:03 -0500 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2013-12-17 19:22:03 -0500 |
| commit | 4e8fe5fab16c13967994167c5d9b4713dd82ff58 (patch) | |
| tree | 88d6f56cd2bb6e18614cc278ee7480bc44e277ae /gr-qtgui/lib/TimeRasterDisplayPlot.cc | |
| parent | d183361a4bff5d9dfe232a5df9b23811d2774b94 (diff) | |
qtgui: enables use of QWT 6.1.
Diffstat (limited to 'gr-qtgui/lib/TimeRasterDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/lib/TimeRasterDisplayPlot.cc | 13 |
1 files changed, 12 insertions, 1 deletions
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)) { |