Merge branch '215-change-depreacated-qwt-usages' into 'master'

Remove usage of deprecated types of Qwt

Closes #207 and #215

See merge request !228

src/analysePlot.cpp

@@ -26,12 +26,13 @@
 
 #include <QMouseEvent>
 #include <QPainter>
-#include <qwt_compat.h>
 #include <qwt_plot_grid.h>
 #include <qwt_plot_layout.h>
 #include <qwt_plot_zoomer.h>
 #include <qwt_scale_engine.h>
+#include <qwt_scale_map.h>
 #include <qwt_symbol.h>
+#include <qwt_text.h>
 
 //-----------------------------------------------------------------
 class AnalyseZoomer : public QwtPlotZoomer
@@ -455,9 +456,8 @@ void AnalysePlot::setScale()
 
         setAxisScale(QwtPlot::xBottom, mXMin, mXMax);
         setAxisScale(QwtPlot::yLeft, mYMin, mYMax);
-        replot(); // why, see:
-                  // file:///C:/Programme/qwt-5.0.2/doc/html/class_qwt_plot_zoomer.html#7a1711597f441223efdb7d9931fe19b9
-        mZoomer->setZoomBase(QwtDoubleRect(mXMin, mYMin, mXMax - mXMin, mYMax - mYMin));
+        replot();
+        mZoomer->setZoomBase(QRectF(mXMin, mYMin, mXMax - mXMin, mYMax - mYMin));
     }
 }
 

src/colorPlot.cpp

@@ -26,12 +26,12 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <iomanip>
-#include <qwt_compat.h>
 #include <qwt_plot_layout.h>
 #include <qwt_plot_zoomer.h>
 #include <qwt_scale_engine.h>
+#include <qwt_scale_map.h>
 #include <qwt_symbol.h>
-
+#include <qwt_text.h>
 
 class ImagePlotItem : public QwtPlotItem
 {
@@ -459,7 +459,7 @@ public:
     }
 
     // ueberschrieben, da so kommazahlen unterdrueckt werden, da intervall mindestens 5 umfasst
-    QSizeF minZoomSize() const override { return QwtDoubleSize(5., 5.); }
+    QSizeF minZoomSize() const override { return QSizeF(5., 5.); }
 
     /**
      * @brief Allows movement in the zoomed in color plot via dragging with a pressed down middle mouse button.
@@ -833,7 +833,7 @@ void ColorPlot::setScale()
         int x     = mControlWidget->getRecoColorX();
         int y     = mControlWidget->getRecoColorY();
 
-        QwtDoubleRect base(0., 0., 255., 255.);
+        QRectF base(0., 0., 255., 255.);
 
         mXMax = 255.;
         mYMax = 255.;