Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_knob.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_knob.cpp (modified) (26 diffs)

trunk/BNC/qwt/qwt_knob.cpp

@@ -120 +120 @@
     setValue( 0.0 );
 
-    setSizePolicy( QSizePolicy::MinimumExpanding, 
+    setSizePolicy( QSizePolicy::MinimumExpanding,
         QSizePolicy::MinimumExpanding );
 }
@@ -131 +131 @@
 
 /*!
-  \brief Set the knob type 
+  \brief Set the knob type
 
   \param knobStyle Knob type
@@ -186 +186 @@
   have to be set using setNumTurns().
 
-  The default angle is 270 degrees. 
+  The default angle is 270 degrees.
 
   \sa totalAngle(), setNumTurns()
@@ -206 +206 @@
 }
 
-/*! 
+/*!
   \return the total angle
   \sa setTotalAngle(), setNumTurns(), numTurns()
@@ -223 +223 @@
   \sa numTurns(), totalAngle(), setTotalAngle()
 */
-  
+
 void QwtKnob::setNumTurns( int numTurns )
 {
@@ -245 +245 @@
 
 /*!
-  \return Number of turns. 
+  \return Number of turns.
 
   When the total angle is below 360° numTurns() is ceiled to 1.
@@ -336 +336 @@
         r.moveBottom( cr.bottom() - d );
     }
-    else 
+    else
     {
         r.moveCenter( QPoint( r.center().x(), cr.center().y() ) );
@@ -401 +401 @@
         if ( !wrapping() )
         {
-            const double boundedAngle = 
+            const double boundedAngle =
                 qBound( scaleMap().p1(), angle, scaleMap().p2() );
 
@@ -432 +432 @@
 }
 
-/*! 
+/*!
   Handle QEvent::StyleChange and QEvent::FontChange;
   \param event Change event
@@ -479 +479 @@
     drawKnob( &painter, knobRect );
 
-    drawMarker( &painter, knobRect, 
+    drawMarker( &painter, knobRect,
         qwtNormalizeDegrees( scaleMap().transform( value() ) ) );
 
@@ -514 +514 @@
         gradient.setColorAt( 1.0, c2 );
 
-        pen = QPen( gradient, d_data->borderWidth ); 
+        pen = QPen( gradient, d_data->borderWidth );
     }
 
@@ -525 +525 @@
             QRadialGradient gradient( knobRect.center(),
                 knobRect.width(), knobRect.topLeft() + QPointF( off, off ) );
-            
+
             gradient.setColorAt( 0.0, palette().color( QPalette::Midlight ) );
             gradient.setColorAt( 1.0, palette().color( QPalette::Button ) );
@@ -553 +553 @@
         case QwtKnob::Sunken:
         {
-            QLinearGradient gradient( 
+            QLinearGradient gradient(
                 knobRect.topLeft(), knobRect.bottomRight() );
             gradient.setColorAt( 0.0, palette().color( QPalette::Mid ) );
@@ -578 +578 @@
   \param painter Painter
   \param rect Bounding rectangle of the knob without scale
-  \param angle Angle of the marker in degrees 
+  \param angle Angle of the marker in degrees
                ( clockwise, 0 at the 12 o'clock position )
 */
-void QwtKnob::drawMarker( QPainter *painter, 
+void QwtKnob::drawMarker( QPainter *painter,
     const QRectF &rect, double angle ) const
 {
@@ -608 +608 @@
         case Nub:
         {
-            const double dotWidth = 
+            const double dotWidth =
                 qMin( double( markerSize ), radius);
 
@@ -614 +614 @@
             if ( dotCenterDist > 0.0 )
             {
-                const QPointF center( xm - sinA * dotCenterDist, 
+                const QPointF center( xm - sinA * dotCenterDist,
                     ym - cosA * dotCenterDist );
 
@@ -626 +626 @@
                     qSwap( c1, c2 );
 
-                QLinearGradient gradient( 
+                QLinearGradient gradient(
                     ellipse.topLeft(), ellipse.bottomRight() );
                 gradient.setColorAt( 0.0, c1 );
@@ -640 +640 @@
         case Dot:
         {
-            const double dotWidth = 
+            const double dotWidth =
                 qMin( double( markerSize ), radius);
 
@@ -646 +646 @@
             if ( dotCenterDist > 0.0 )
             {
-                const QPointF center( xm - sinA * dotCenterDist, 
+                const QPointF center( xm - sinA * dotCenterDist,
                     ym - cosA * dotCenterDist );
 
@@ -681 +681 @@
             painter->translate( rect.center() );
             painter->rotate( angle - 90.0 );
-            
+
             QPolygonF polygon;
             polygon += QPointF( re, 0.0 );
@@ -705 +705 @@
 */
 void QwtKnob::drawFocusIndicator( QPainter *painter ) const
-{       
+{
     const QRect cr = contentsRect();
 
@@ -723 +723 @@
 
     QwtPainter::drawFocusRect( painter, this, focusRect );
-}  
+}
 
 /*!
@@ -729 +729 @@
 
   Similar to a QLabel::alignment() the flags decide how
-  to align the knob inside of contentsRect(). 
+  to align the knob inside of contentsRect().
 
   The default setting is Qt::AlignCenter
@@ -758 +758 @@
   \brief Change the knob's width.
 
-  Setting a fixed value for the diameter of the knob 
+  Setting a fixed value for the diameter of the knob
   is helpful for aligning several knobs in a row.
 
@@ -764 +764 @@
 
   \sa knobWidth(), setAlignment()
-  \note Modifies the sizePolicy() 
+  \note Modifies the sizePolicy()
 */
 void QwtKnob::setKnobWidth( int width )
@@ -828 +828 @@
 }
 
-/*! 
+/*!
   \return Marker size
   \sa setMarkerSize()