qt-gui: enables use of Qwt 6.2

bmuzika · mormj · commit 14d30f134cd4 · 2021-11-11T14:04:27.000-05:00
Adds the typedefs and includes needed to build with Qwt 6.2.

Signed-off-by: Bill Muzika &lt;bill.muzika@outlook.com&gt;
diff --git a/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/DisplayPlot.h
@@ -29,7 +29,10 @@
 #include <vector>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
+typedef QPointF QwtDoublePoint;
+typedef QRectF QwtDoubleRect;
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 typedef QList<QColor> QColorList;
diff --git a/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/TimeRasterDisplayPlot.h
@@ -23,7 +23,9 @@
 #if QWT_VERSION < 0x060000
 #include <gnuradio/qtgui/plot_waterfall.h>
 #else
-#include <qwt_compat.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 /*!
diff --git a/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h b/gr-qtgui/include/gnuradio/qtgui/WaterfallDisplayPlot.h
@@ -22,7 +22,9 @@
 #if QWT_VERSION < 0x060000
 #include <gnuradio/qtgui/plot_waterfall.h>
 #else
-#include <qwt_compat.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 /*!
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_raster.h b/gr-qtgui/include/gnuradio/qtgui/plot_raster.h
@@ -16,8 +16,10 @@
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qsize.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h b/gr-qtgui/include/gnuradio/qtgui/plot_waterfall.h
@@ -16,8 +16,10 @@
 #include <qwt_plot_rasteritem.h>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qsize.h>
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 class QwtColorMap;
diff --git a/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h b/gr-qtgui/include/gnuradio/qtgui/qtgui_types.h
@@ -14,6 +14,7 @@
 #include <gnuradio/high_res_timer.h>
 #include <qwt_color_map.h>
 #include <qwt_scale_draw.h>
+#include <qwt_text.h>
 
 namespace gr {
 namespace qtgui {
diff --git a/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/timeRasterGlobalData.h
@@ -15,8 +15,9 @@
 #include <cinttypes>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 class TimeRasterData : public QwtRasterData
@@ -35,6 +36,9 @@ class TimeRasterData : public QwtRasterData
 #if QWT_VERSION < 0x060000
     virtual QwtDoubleInterval range() const;
     virtual void setRange(const QwtDoubleInterval&);
+#elif QWT_VERSION >= 0x060200
+    virtual QwtInterval interval(Qt::Axis) const;
+    void setInterval(Qt::Axis, const QwtInterval&);
 #endif
 
     double value(double x, double y) const override;
@@ -58,6 +62,10 @@ class TimeRasterData : public QwtRasterData
     QwtInterval d_intensityRange;
 #endif
 
+#if QWT_VERSION >= 0x060200
+    QwtInterval d_intervals[3];
+#endif
+
 private:
 };
 
diff --git a/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h b/gr-qtgui/include/gnuradio/qtgui/waterfallGlobalData.h
@@ -15,8 +15,9 @@
 #include <cinttypes>
 
 #if QWT_VERSION >= 0x060000
-#include <qwt_compat.h>
-#include <qwt_point_3d.h> // doesn't seem necessary, but is...
+#include <qwt_interval.h>
+
+typedef QwtInterval QwtDoubleInterval;
 #endif
 
 class WaterfallData : public QwtRasterData
@@ -36,6 +37,9 @@ class WaterfallData : public QwtRasterData
 #if QWT_VERSION < 0x060000
     virtual QwtDoubleInterval range() const;
     virtual void setRange(const QwtDoubleInterval&);
+#elif QWT_VERSION >= 0x060200
+    virtual QwtInterval interval(Qt::Axis) const;
+    void setInterval(Qt::Axis, const QwtInterval&);
 #endif
 
     double value(double x, double y) const override;
@@ -62,6 +66,10 @@ class WaterfallData : public QwtRasterData
     QwtInterval _intensityRange;
 #endif
 
+#if QWT_VERSION >= 0x060200
+    QwtInterval d_intervals[3];
+#endif
+
 private:
 };
 
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -16,6 +16,7 @@
 #include <qwt_legend.h>
 #include <qwt_scale_draw.h>
 #include <QColor>
+#include <cmath>
 
 class ConstellationDisplayZoomer : public QwtPlotZoomer
 {
diff --git a/gr-qtgui/lib/plot_raster.cc b/gr-qtgui/lib/plot_raster.cc
@@ -244,7 +244,11 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,
         }
         d_data->data->incrementResidual();
     } else if (d_data->colorMap->format() == QwtColorMap::Indexed) {
+#if QWT_VERSION >= 0x060200
+        image.setColorTable(d_data->colorMap->colorTable(256));
+#else
         image.setColorTable(d_data->colorMap->colorTable(intensityRange));
+#endif
 
         for (int y = rect.top(); y <= rect.bottom(); y++) {
             const double ty = yyMap.invTransform(y);
@@ -253,8 +257,13 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,
             for (int x = rect.left(); x <= rect.right(); x++) {
                 const double tx = xxMap.invTransform(x);
 
+#if QWT_VERSION >= 0x060200
+                *line++ = d_data->colorMap->colorIndex(
+                    256, intensityRange, d_data->data->value(tx, ty));
+#else
                 *line++ = d_data->colorMap->colorIndex(intensityRange,
                                                        d_data->data->value(tx, ty));
+#endif
             }
         }
     }
diff --git a/gr-qtgui/lib/plot_waterfall.cc b/gr-qtgui/lib/plot_waterfall.cc
@@ -240,7 +240,11 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,
             }
         }
     } else if (d_data->colorMap->format() == QwtColorMap::Indexed) {
+#if QWT_VERSION >= 0x060200
+        image.setColorTable(d_data->colorMap->colorTable(256));
+#else
         image.setColorTable(d_data->colorMap->colorTable(intensityRange));
+#endif
 
         for (int y = rect.top(); y <= rect.bottom(); y++) {
             const double ty = yyMap.invTransform(y);
@@ -249,8 +253,13 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,
             for (int x = rect.left(); x <= rect.right(); x++) {
                 const double tx = xxMap.invTransform(x);
 
+#if QWT_VERSION >= 0x060200
+                *line++ = d_data->colorMap->colorIndex(
+                    256, intensityRange, d_data->data->value(tx, ty));
+#else
                 *line++ = d_data->colorMap->colorIndex(intensityRange,
                                                        d_data->data->value(tx, ty));
+#endif
             }
         }
     }
diff --git a/gr-qtgui/lib/timeRasterGlobalData.cc b/gr-qtgui/lib/timeRasterGlobalData.cc
@@ -132,6 +132,13 @@ void TimeRasterData::setRange(const QwtDoubleInterval& newRange)
 {
     d_intensityRange = newRange;
 }
+#elif QWT_VERSION >= 0x060200
+void TimeRasterData::setInterval(Qt::Axis axis, const QwtInterval& interval)
+{
+    d_intervals[axis] = interval;
+}
+
+QwtInterval TimeRasterData::interval(Qt::Axis a) const { return d_intervals[a]; }
 
 #endif
 
diff --git a/gr-qtgui/lib/waterfallGlobalData.cc b/gr-qtgui/lib/waterfallGlobalData.cc
@@ -139,7 +139,13 @@ void WaterfallData::setRange(const QwtDoubleInterval& newRange)
 {
     _intensityRange = newRange;
 }
+#elif QWT_VERSION >= 0x060200
+void WaterfallData::setInterval(Qt::Axis axis, const QwtInterval& interval)
+{
+    d_intervals[axis] = interval;
+}
 
+QwtInterval WaterfallData::interval(Qt::Axis a) const { return d_intervals[a]; }
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#include <qwt_legend.h>`
`17`	`17`	`#include <qwt_scale_draw.h>`
`18`	`18`	`#include <QColor>`
	`19`	`+#include <cmath>`
`19`	`20`
`20`	`21`	`class ConstellationDisplayZoomer : public QwtPlotZoomer`
`21`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,11 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,`
`244`	`244`	`}`
`245`	`245`	`d_data->data->incrementResidual();`
`246`	`246`	`} else if (d_data->colorMap->format() == QwtColorMap::Indexed) {`
	`247`	`+#if QWT_VERSION >= 0x060200`
	`248`	`+ image.setColorTable(d_data->colorMap->colorTable(256));`
	`249`	`+#else`
`247`	`250`	`image.setColorTable(d_data->colorMap->colorTable(intensityRange));`
	`251`	`+#endif`
`248`	`252`
`249`	`253`	`for (int y = rect.top(); y <= rect.bottom(); y++) {`
`250`	`254`	`const double ty = yyMap.invTransform(y);`
`@@ -253,8 +257,13 @@ QImage PlotTimeRaster::renderImage(const QwtScaleMap& xMap,`
`253`	`257`	`for (int x = rect.left(); x <= rect.right(); x++) {`
`254`	`258`	`const double tx = xxMap.invTransform(x);`
`255`	`259`
	`260`	`+#if QWT_VERSION >= 0x060200`
	`261`	`+ *line++ = d_data->colorMap->colorIndex(`
	`262`	`+ 256, intensityRange, d_data->data->value(tx, ty));`
	`263`	`+#else`
`256`	`264`	`*line++ = d_data->colorMap->colorIndex(intensityRange,`
`257`	`265`	`d_data->data->value(tx, ty));`
	`266`	`+#endif`
`258`	`267`	`}`
`259`	`268`	`}`
`260`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,11 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`} else if (d_data->colorMap->format() == QwtColorMap::Indexed) {`
	`243`	`+#if QWT_VERSION >= 0x060200`
	`244`	`+ image.setColorTable(d_data->colorMap->colorTable(256));`
	`245`	`+#else`
`243`	`246`	`image.setColorTable(d_data->colorMap->colorTable(intensityRange));`
	`247`	`+#endif`
`244`	`248`
`245`	`249`	`for (int y = rect.top(); y <= rect.bottom(); y++) {`
`246`	`250`	`const double ty = yyMap.invTransform(y);`
`@@ -249,8 +253,13 @@ QImage PlotWaterfall::renderImage(const QwtScaleMap& xMap,`
`249`	`253`	`for (int x = rect.left(); x <= rect.right(); x++) {`
`250`	`254`	`const double tx = xxMap.invTransform(x);`
`251`	`255`
	`256`	`+#if QWT_VERSION >= 0x060200`
	`257`	`+ *line++ = d_data->colorMap->colorIndex(`
	`258`	`+ 256, intensityRange, d_data->data->value(tx, ty));`
	`259`	`+#else`
`252`	`260`	`*line++ = d_data->colorMap->colorIndex(intensityRange,`
`253`	`261`	`d_data->data->value(tx, ty));`
	`262`	`+#endif`
`254`	`263`	`}`
`255`	`264`	`}`
`256`	`265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,13 @@ void TimeRasterData::setRange(const QwtDoubleInterval& newRange)`
`132`	`132`	`{`
`133`	`133`	`d_intensityRange = newRange;`
`134`	`134`	`}`
	`135`	`+#elif QWT_VERSION >= 0x060200`
	`136`	`+void TimeRasterData::setInterval(Qt::Axis axis, const QwtInterval& interval)`
	`137`	`+{`
	`138`	`+ d_intervals[axis] = interval;`
	`139`	`+}`
	`140`	`+`
	`141`	`+QwtInterval TimeRasterData::interval(Qt::Axis a) const { return d_intervals[a]; }`
`135`	`142`
`136`	`143`	`#endif`
`137`	`144`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,13 @@ void WaterfallData::setRange(const QwtDoubleInterval& newRange)`
`139`	`139`	`{`
`140`	`140`	`_intensityRange = newRange;`
`141`	`141`	`}`
	`142`	`+#elif QWT_VERSION >= 0x060200`
	`143`	`+void WaterfallData::setInterval(Qt::Axis axis, const QwtInterval& interval)`
	`144`	`+{`
	`145`	`+ d_intervals[axis] = interval;`
	`146`	`+}`
`142`	`147`
	`148`	`+QwtInterval WaterfallData::interval(Qt::Axis a) const { return d_intervals[a]; }`
`143`	`149`	`#endif`
`144`	`150`
`145`	`151`