Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_color_map.h

Timestamp:

May 10, 2017, 3:20:54 PM (7 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_color_map.h (modified) (5 diffs)

trunk/BNC/qwt/qwt_color_map.h

@@ -41 +41 @@
     enum Format
     {
-        //! The map is intended to map into QRgb values.
+        //! The map is intended to map into RGB values.
         RGB,
 
@@ -57 +57 @@
 
     /*!
-       Map a value of a given interval into a rgb value.
+       Map a value of a given interval into a RGB value.
+
        \param interval Range for the values
        \param value Value
-       \return rgb value, corresponding to value
+       \return RGB value, corresponding to value
     */
     virtual QRgb rgb( const QwtInterval &interval,
@@ -67 +68 @@
     /*!
        Map a value of a given interval into a color index
+
        \param interval Range for the values
        \param value Value
@@ -136 +138 @@
 
 /*!
-  \brief QwtAlphaColorMap variies the alpha value of a color
+  \brief QwtAlphaColorMap varies the alpha value of a color
 */
 class QWT_EXPORT QwtAlphaColorMap: public QwtColorMap
@@ -178 +180 @@
     if ( d_format == RGB )
     {
-        return QColor( rgb( interval, value ) );
+        return QColor::fromRgba( rgb( interval, value ) );
     }
     else