Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_round_scale_draw.cpp

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_round_scale_draw.cpp (modified) (13 diffs)

trunk/BNC/qwt/qwt_round_scale_draw.cpp

@@ -12 +12 @@
 #include "qwt_scale_div.h"
 #include "qwt_scale_map.h"
+#include "qwt_math.h"
 #include <qpen.h>
 #include <qpainter.h>
@@ -21 +22 @@
 public:
     PrivateData():
-        center( 50, 50 ),
-        radius( 50 ),
-        startAngle( -135 * 16 ),
-        endAngle( 135 * 16 )
+        center( 50.0, 50.0 ),
+        radius( 50.0 ),
+        startAngle( -135.0 ),
+        endAngle( 135.0 )
     {
     }
@@ -64 +65 @@
   \sa moveCenter()
 */
-void QwtRoundScaleDraw::setRadius( int radius )
+void QwtRoundScaleDraw::setRadius( double radius )
 {
     d_data->radius = radius;
@@ -74 +75 @@
   Radius is the radius of the backbone without ticks and labels.
 
+  \return Radius of the scale
   \sa setRadius(), extent()
 */
-int QwtRoundScaleDraw::radius() const
+double QwtRoundScaleDraw::radius() const
 {
     return d_data->radius;
@@ -110 +112 @@
   <li>The angle range is limited to [-360, 360] degrees. Angles exceeding
       this range will be clipped.
-  <li>For angles more than 359 degrees above or below min(angle1, angle2),
+  <li>For angles more or equal than 360 degrees above or below min(angle1, angle2),
       scale marks will not be drawn.
-  <li>If you need a counterclockwise scale, use QwtScaleDiv::setRange
+  <li>If you need a counterclockwise scale, use QwtScaleDiv::setInterval()
   </ul>
 */
 void QwtRoundScaleDraw::setAngleRange( double angle1, double angle2 )
 {
+#if 0
     angle1 = qBound( -360.0, angle1, 360.0 );
     angle2 = qBound( -360.0, angle2, 360.0 );
-
-    d_data->startAngle = angle1 * 16.0;
-    d_data->endAngle = angle2 * 16.0;
+#endif
+
+    d_data->startAngle = angle1;
+    d_data->endAngle = angle2;
 
     if ( d_data->startAngle == d_data->endAngle )
@@ -142 +146 @@
 void QwtRoundScaleDraw::drawLabel( QPainter *painter, double value ) const
 {
+    const double tval = scaleMap().transform( value );
+    if ( ( tval >= d_data->startAngle + 360.0 )
+        || ( tval <= d_data->startAngle - 360.0 ) )
+    {
+        return;
+    }
+
     const QwtText label = tickLabel( painter->font(), value );
     if ( label.isEmpty() )
         return;
 
-    const double tval = scaleMap().transform( value );
-    if ( ( tval > d_data->startAngle + 359 * 16 )
-        || ( tval < d_data->startAngle - 359 * 16 ) )
-    {
-        return;
-    }
-
     double radius = d_data->radius;
     if ( hasComponent( QwtAbstractScaleDraw::Ticks ) ||
@@ -164 +168 @@
 
     const QSizeF sz = label.textSize( painter->font() );
-    const double arc = tval / 16.0 / 360.0 * 2 * M_PI;
+    const double arc = qwtRadians( tval );
 
     const double x = d_data->center.x() +
         ( radius + sz.width() / 2.0 ) * qSin( arc );
     const double y = d_data->center.y() -
-        ( radius + sz.height() / 2.0 ) * cos( arc );
+        ( radius + sz.height() / 2.0 ) * qCos( arc );
 
     const QRectF r( x - sz.width() / 2, y - sz.height() / 2,
@@ -196 +200 @@
     const double radius = d_data->radius;
 
-    if ( ( tval <= d_data->startAngle + 359 * 16 )
-        || ( tval >= d_data->startAngle - 359 * 16 ) )
-    {
-        const double arc = double( tval ) / 16.0 * M_PI / 180.0;
+    if ( ( tval < d_data->startAngle + 360.0 )
+        && ( tval > d_data->startAngle - 360.0 ) )
+    {
+        const double arc = qwtRadians( tval );
 
         const double sinArc = qSin( arc );
@@ -221 +225 @@
 void QwtRoundScaleDraw::drawBackbone( QPainter *painter ) const
 {
-    const double a1 = qMin( scaleMap().p1(), scaleMap().p2() ) - 90 * 16;
-    const double a2 = qMax( scaleMap().p1(), scaleMap().p2() ) - 90 * 16;
+    const double deg1 = scaleMap().p1();
+    const double deg2 = scaleMap().p2();
+
+    const int a1 = qRound( qMin( deg1, deg2 ) - 90 );
+    const int a2 = qRound( qMax( deg1, deg2 ) - 90 );
 
     const double radius = d_data->radius;
@@ -228 +235 @@
     const double y = d_data->center.y() - radius;
 
-    painter->drawArc( x, y, 2 * radius, 2 * radius,
-        -a2, a2 - a1 + 1 );          // counterclockwise
+    painter->drawArc( QRectF( x, y, 2 * radius, 2 * radius ),
+        -a2 * 16, ( a2 - a1 + 1 ) * 16 );          // counterclockwise
 }
 
@@ -240 +247 @@
 
    \param font Font used for painting the labels
+   \return Calculated extent
 
    \sa setMinimumExtent(), minimumExtent()
-   \warning The implemented algo is not too smart and
+   \warning The implemented algorithm is not too smart and
             calculates only an upper limit, that might be a
             few pixels too large
@@ -260 +268 @@
                 continue;
 
-            const QwtText label = tickLabel( font, value );
-            if ( label.isEmpty() )
-                continue;
-
             const double tval = scaleMap().transform( value );
-            if ( ( tval < d_data->startAngle + 360 * 16 )
-                && ( tval > d_data->startAngle - 360 * 16 ) )
+            if ( ( tval < d_data->startAngle + 360 )
+                && ( tval > d_data->startAngle - 360 ) )
             {
-                const double arc = tval / 16.0 / 360.0 * 2 * M_PI;
+                const QwtText label = tickLabel( font, value );
+                if ( label.isEmpty() )
+                    continue;
+
+                const double arc = qwtRadians( tval );
 
                 const QSizeF sz = label.textSize( font );
@@ -290 +298 @@
     if ( hasComponent( QwtAbstractScaleDraw::Backbone ) )
     {
-        const double pw = qMax( 1, penWidth() );  // penwidth can be zero
+        const double pw = qMax( 1, penWidth() );  // pen width can be zero
         d += pw;
     }