Merge pull request #732 from Susurrus/master

Fixes to botched Qwt 6.1 update

src/ui/designer/QGCXYPlot.cc

@@ -110,10 +110,10 @@ public:
     double yMin() const { return ymin; }
     double yMax() const { return ymax; }
 
-    virtual QwtDoubleRect boundingRect() const {
+    virtual QRectF boundingRect() const {
         if(!minMaxSet)
-            return QwtDoubleRect(1,1,-2,-2);
-        return QwtDoubleRect(xmin,ymin,xmax-xmin,ymax-ymin);
+            return QRectF(1,1,-2,-2);
+        return QRectF(xmin,ymin,xmax-xmin,ymax-ymin);
     }
 
     /* From QwtPlotItem.  Draw the complete series */

src/ui/linechart/LinechartPlot.h

@@ -45,7 +45,6 @@ This file is part of the PIXHAWK project
 #include <qwt_scale_draw.h>
 #include <qwt_scale_widget.h>
 #include <qwt_scale_engine.h>
-#include <qwt_compat.h>
 #include <qwt_plot.h>
 #include "ChartPlot.h"
 #include "MG.h"
@@ -134,14 +133,14 @@ protected:
 
 private:
     quint64 count;
-    QwtArray<double> ms;
-    QwtArray<double> value;
+    QVector<double> ms;
+    QVector<double> value;
     double mean;
     double median;
     double variance;
     unsigned int averageWindow;
-    QwtArray<double> outputMs;
-    QwtArray<double> outputValue;
+    QVector<double> outputMs;
+    QVector<double> outputValue;
 };
 
 

src/ui/linechart/ScrollZoomer.cc

@@ -439,9 +439,9 @@ void ScrollZoomer::layoutScrollBars(const QRect &rect)
 void ScrollZoomer::scrollBarMoved(Qt::Orientation o, double min, double)
 {
     if ( o == Qt::Horizontal )
-        move(min, zoomRect().top());
+        move(QPoint(min, zoomRect().top()));
     else
-        move(zoomRect().left(), min);
+        move(QPoint(zoomRect().left(), min));
 
     emit zoomed(zoomRect());
 }