Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_thermo.cpp

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/qwt_thermo.cpp (modified) (17 diffs)

trunk/BNC/qwt/qwt_thermo.cpp

@@ -20 +20 @@
 #include <qmath.h>
 
-static inline void qwtDrawLine( QPainter *painter, int pos, 
+static inline void qwtDrawLine( QPainter *painter, int pos,
     const QColor &color, const QRect &pipeRect, const QRect &liquidRect,
     Qt::Orientation orientation )
@@ -59 +59 @@
             if ( v > lowerLimit && v < upperLimit )
                 values += v;
-        }       
-    }   
+        }
+    }
 
     values += upperLimit;
-    
+
     return values;
 }
@@ -249 +249 @@
 
     const QBrush brush = palette().brush( QPalette::Base );
-    qDrawShadePanel( &painter, 
+    qDrawShadePanel( &painter,
         tRect.adjusted( -bw, -bw, bw, bw ),
-        palette(), true, bw, 
+        palette(), true, bw,
         d_data->autoFillPipe ? &brush : NULL );
 
@@ -257 +257 @@
 }
 
-/*! 
+/*!
   Resize event handler
   \param event Resize event
@@ -267 +267 @@
 }
 
-/*! 
+/*!
   Qt change event handler
   \param event Event
@@ -411 +411 @@
         if ( d_data->scalePosition == QwtThermo::LeadingScale )
             pipeRect.setLeft( bw );
-        else 
+        else
             pipeRect.setLeft( cr.left() + cr.width() - bw - d_data->pipeWidth );
 
@@ -540 +540 @@
    \param pipeRect Bounding rectangle of the pipe without borders
 */
-void QwtThermo::drawLiquid( 
+void QwtThermo::drawLiquid(
     QPainter *painter, const QRect &pipeRect ) const
 {
@@ -582 +582 @@
                 const double v = scaleMap.invTransform( pos );
 
-                qwtDrawLine( painter, pos, 
+                qwtDrawLine( painter, pos,
                     d_data->colorMap->color( interval, v ),
                     pipeRect, liquidRect, d_data->orientation );
@@ -708 +708 @@
 /*!
   \brief Change the brush of the liquid.
- 
+
   Changes the QPalette::ButtonText brush of the palette.
 
-  \param brush New brush. 
+  \param brush New brush.
   \sa fillBrush(), QWidget::setPalette()
 */
@@ -722 +722 @@
 
 /*!
-  \return Liquid ( QPalette::ButtonText ) brush. 
+  \return Liquid ( QPalette::ButtonText ) brush.
   \sa setFillBrush(), QWidget::palette()
 */
@@ -735 +735 @@
   Changes the QPalette::Highlight brush of the palette.
 
-  \param brush New brush. 
+  \param brush New brush.
   \sa alarmBrush(), QWidget::setPalette()
 
@@ -825 +825 @@
 }
 
-/*! 
+/*!
   \return True, when the alarm threshold is enabled.
 
@@ -894 +894 @@
 QRect QwtThermo::fillRect( const QRect &pipeRect ) const
 {
-    double origin;        
+    double origin;
     if ( d_data->originMode == OriginMinimum )
     {
@@ -915 +915 @@
     if ( to < from )
         qSwap( from, to );
-    
+
     QRect fillRect = pipeRect;
     if ( d_data->orientation == Qt::Horizontal )
@@ -947 +947 @@
 
     const bool inverted = ( upperBound() < lowerBound() );
-    
+
     bool increasing;
     if ( d_data->originMode == OriginCustom )
@@ -961 +961 @@
     const int alarmPos = qRound( map.transform( d_data->alarmLevel ) );
     const int valuePos = qRound( map.transform( d_data->value ) );
-    
+
     if ( d_data->orientation == Qt::Horizontal )
     {
@@ -1003 +1003 @@
 
     return alarmRect;
-} 
+}