Changeset 7991 in ntrip

Timestamp:

Jul 28, 2016, 10:32:40 AM (8 years ago)

Author:

stuerze

Message:

minor adaptations to allow the successful comilation of BNC on a Rasperry Pi

Location:

branches/BNC_2.12/qwtpolar

Files:

• qwt_polar_curve.cpp (modified) (1 diff)
• qwt_polar_layout.cpp (modified) (2 diffs)

branches/BNC_2.12/qwtpolar/qwt_polar_curve.cpp

@@ -434 +434 @@
     if ( !clipRect.isEmpty() )
     {
-        double off = qCeil( qMax( 1.0, painter->pen().widthF() ) );
+        double off = qCeil( qMax(qreal(1.0), painter->pen().widthF() ) );
         clipRect = clipRect.toRect().adjusted( -off, -off, off, off );
         polyline = QwtClipper::clipPolygonF( clipRect, polyline );

branches/BNC_2.12/qwtpolar/qwt_polar_layout.cpp

@@ -279 +279 @@
         // half of the available space.
 
-        dim = qMin( hint.width(), rect.width() * d_data->legendRatio );
+        dim = qMin( hint.width(), qreal(rect.width() * d_data->legendRatio) );
 
         if ( !( options & IgnoreScrollbars ) )
@@ -294 +294 @@
     else
     {
-        dim = qMin( hint.height(), rect.height() * d_data->legendRatio );
+        dim = qMin( hint.width(), qreal(rect.width() * d_data->legendRatio) );
         dim = qMax( dim, d_data->layoutData.legend.hScrollBarHeight );
     }