Add internal qwtpolar 1.1.1 for Qwt 6.1

(cherry picked from commit a9cb990)

src/app/CMakeLists.txt

@@ -375,11 +375,7 @@ IF (WITH_QWTPOLAR)
       )
 
       SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1)
-    ELSE(QWT_VERSION_STR VERSION_LESS "6.0.0")
-      IF(NOT QWT_VERSION_STR VERSION_LESS "6.1.0")
-        MESSAGE(FATAL_ERROR "Internal QwtPolar does not support Qwt 6.1 and above")
-      ENDIF(NOT QWT_VERSION_STR VERSION_LESS "6.1.0")
-
+    ELSEIF(QWT_VERSION_STR VERSION_LESS "6.1.0")
       SET(QGIS_APP_SRCS
         ${QGIS_APP_SRCS}
         gps/qwtpolar-1.0/qwt_polar_canvas.cpp
@@ -409,6 +405,36 @@ IF (WITH_QWTPOLAR)
       )
 
       SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.0)
+    ELSE(QWT_VERSION_STR VERSION_LESS "6.1.0")
+      SET(QGIS_APP_SRCS
+        ${QGIS_APP_SRCS}
+        gps/qwtpolar-1.1.1/qwt_polar_canvas.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_curve.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_fitter.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_grid.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_item.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_itemdict.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_layout.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_magnifier.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_marker.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_panner.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_picker.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_plot.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_renderer.cpp
+        gps/qwtpolar-1.1.1/qwt_polar_spectrogram.cpp
+      )
+
+      SET (QGIS_APP_MOC_HDRS
+        ${QGIS_APP_MOC_HDRS}
+        gps/qwtpolar-1.1.1/qwt_polar_canvas.h
+        gps/qwtpolar-1.1.1/qwt_polar_magnifier.h
+        gps/qwtpolar-1.1.1/qwt_polar_panner.h
+        gps/qwtpolar-1.1.1/qwt_polar_picker.h
+        gps/qwtpolar-1.1.1/qwt_polar_plot.h
+        gps/qwtpolar-1.1.1/qwt_polar_renderer.h
+      )
+
+      SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.1.1)
     ENDIF(QWT_VERSION_STR VERSION_LESS "6.0.0")
 
     SET(QWTPOLAR_LIBRARY "")

src/app/gps/qwtpolar-1.1.1/qwt_polar.h

@@ -0,0 +1,84 @@
+/* -*- mode: C++ ; c-file-style: "stroustrup" -*- *****************************
+ * QwtPolar Widget Library
+ * Copyright (C) 2008   Uwe Rathmann
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the Qwt License, Version 1.0
+ *****************************************************************************/
+
+#ifndef QWT_POLAR_H
+#define QWT_POLAR_H 1
+
+#include "qwt_polar_global.h"
+
+namespace QwtPolar
+{
+    //! Unit of an angle
+    enum AngleUnit
+    {
+        //! 0.0 -> 2_M_PI
+        Radians,
+
+        //! 0.0 -> 360.0
+        Degrees,
+
+        //! 0.0 - 400.0
+        Gradians,
+
+        //! 0.0 - 1.0
+        Turns
+    };
+
+    //! An enum, that identifies the type of a coordinate
+    enum Coordinate
+    {
+        //! Azimuth
+        Azimuth,
+
+        //! Radius
+        Radius
+    };
+
+    /*!
+      Indices used to identify an axis.
+      \sa Scale
+     */
+    enum Axis
+    {
+        //! Azimuth axis
+        AxisAzimuth,
+
+        //! Left axis
+        AxisLeft,
+
+        //! Right axis
+        AxisRight,
+
+        //! Top axis
+        AxisTop,
+
+        //! Bottom axis
+        AxisBottom,
+
+        //! Number of available axis
+        AxesCount
+    };
+
+    /*!
+      Indices used to identify a scale.
+      \sa Axis
+     */
+    enum Scale
+    {
+        //! Azimuth scale
+        ScaleAzimuth = Azimuth,
+
+        //! Radial scale
+        ScaleRadius = Radius,
+
+        //! Number of scales
+        ScaleCount
+    };
+}
+
+#endif