Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_interval_symbol.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_interval_symbol.cpp (modified) (4 diffs)

trunk/BNC/qwt/qwt_interval_symbol.cpp

@@ -15 +15 @@
 #if QT_VERSION < 0x040601
 #define qAtan2(y, x) ::atan2(y, x)
+#define qFastSin(x) qSin(x)
+#define qFastCos(x) qCos(x)
 #endif
 
@@ -149 +151 @@
 {
     return d_data->brush;
+}
+
+/*! 
+  Build and assign a pen
+    
+  In Qt5 the default pen width is 1.0 ( 0.0 in Qt4 ) what makes it
+  non cosmetic ( see QPen::isCosmetic() ). This method has been introduced
+  to hide this incompatibility.
+
+  \param color Pen color
+  \param width Pen width
+  \param style Pen style
+    
+  \sa pen(), brush()
+ */ 
+void QwtIntervalSymbol::setPen( const QColor &color, 
+    qreal width, Qt::PenStyle style )
+{   
+    setPen( QPen( color, width, style ) );
 }
 
@@ -232 +253 @@
                     double dw2 = sw / 2.0;
 
-                    const double cx = qCos( angle ) * dw2;
-                    const double sy = qSin( angle ) * dw2;
+                    const double cx = qFastCos( angle ) * dw2;
+                    const double sy = qFastSin( angle ) * dw2;
 
                     QwtPainter::drawLine( painter,
@@ -280 +301 @@
                     double dw2 = sw / 2.0;
 
-                    const int cx = qCos( angle ) * dw2;
-                    const int sy = qSin( angle ) * dw2;
+                    const double cx = qFastCos( angle ) * dw2;
+                    const double sy = qFastSin( angle ) * dw2;
 
                     QPolygonF polygon;