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

Timestamp:

May 10, 2017, 3:20:54 PM (8 years ago)

Author:

stoecker

Message:

update qwt and qwtpolar, many QT5 fixes (unfinished)

File:

• trunk/BNC/qwt/qwt_null_paintdevice.cpp (modified) (23 diffs)

trunk/BNC/qwt/qwt_null_paintdevice.cpp

@@ -16 +16 @@
 public:
     PrivateData():
-        size( 0, 0 )
-    {
-    }
-
-    QSize size;
+        mode( QwtNullPaintDevice::NormalMode )
+    {
+    }
+
+    QwtNullPaintDevice::Mode mode;
 };
 
@@ -26 +26 @@
 {
 public:
-    PaintEngine( QPaintEngine::PaintEngineFeatures );
+    PaintEngine();
 
     virtual bool begin( QPaintDevice * );
@@ -55 +55 @@
 
     virtual void drawTextItem(const QPointF &, const QTextItem &);
+
     virtual void drawTiledPixmap(const QRectF &, 
         const QPixmap &, const QPointF &s);
+
     virtual void drawImage(const QRectF &, 
         const QImage &, const QRectF &, Qt::ImageConversionFlags );
 
 private:
-    QwtNullPaintDevice *d_device;
+    QwtNullPaintDevice *nullDevice();
 };
     
-QwtNullPaintDevice::PaintEngine::PaintEngine( 
-        QPaintEngine::PaintEngineFeatures features ):
-    QPaintEngine( features ),
-    d_device(NULL)
-{
-}
-
-bool QwtNullPaintDevice::PaintEngine::begin( 
-    QPaintDevice *device )
-{
-    d_device = static_cast<QwtNullPaintDevice *>( device );
+QwtNullPaintDevice::PaintEngine::PaintEngine():
+    QPaintEngine( QPaintEngine::AllFeatures )
+{
+}
+
+bool QwtNullPaintDevice::PaintEngine::begin( QPaintDevice * )
+{
+    setActive( true );
     return true;
 }
@@ -80 +79 @@
 bool QwtNullPaintDevice::PaintEngine::end()
 {
-    d_device = NULL;
+    setActive( false );
     return true;
 }
 
-QPaintEngine::Type 
-QwtNullPaintDevice::PaintEngine::type () const
+QPaintEngine::Type QwtNullPaintDevice::PaintEngine::type() const
 {
     return QPaintEngine::User;
@@ -93 +91 @@
     const QRect *rects, int rectCount)
 {
-    if ( d_device )
-        d_device->drawRects( rects, rectCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawRects( rects, rectCount );
+        return;
+    }
+
+    device->drawRects( rects, rectCount );
 }
 
@@ -100 +107 @@
     const QRectF *rects, int rectCount)
 {
-    if ( d_device )
-        d_device->drawRects( rects, rectCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawRects( rects, rectCount );
+        return;
+    }
+
+    device->drawRects( rects, rectCount );
 }
 
@@ -107 +123 @@
     const QLine *lines, int lineCount)
 {
-    if ( d_device )
-        d_device->drawLines( lines, lineCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawLines( lines, lineCount );
+        return;
+    }
+
+    device->drawLines( lines, lineCount );
 }
 
@@ -114 +139 @@
     const QLineF *lines, int lineCount)
 {
-    if ( d_device )
-        d_device->drawLines( lines, lineCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawLines( lines, lineCount );
+        return;
+    }
+
+    device->drawLines( lines, lineCount );
 }
 
@@ -121 +155 @@
     const QRectF &rect)
 {
-    if ( d_device )
-        d_device->drawEllipse( rect );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawEllipse( rect );
+        return;
+    }
+
+    device->drawEllipse( rect );
 }
 
@@ -128 +171 @@
     const QRect &rect)
 {
-    if ( d_device )
-        d_device->drawEllipse( rect );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawEllipse( rect );
+        return;
+    }
+
+    device->drawEllipse( rect );
 }
 
@@ -136 +188 @@
     const QPainterPath &path)
 {
-    if ( d_device )
-        d_device->drawPath( path );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    device->drawPath( path );
 }
 
@@ -143 +198 @@
     const QPointF *points, int pointCount)
 {
-    if ( d_device )
-        d_device->drawPoints( points, pointCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawPoints( points, pointCount );
+        return;
+    }
+
+    device->drawPoints( points, pointCount );
 }
 
@@ -150 +214 @@
     const QPoint *points, int pointCount)
 {
-    if ( d_device )
-        d_device->drawPoints( points, pointCount );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawPoints( points, pointCount );
+        return;
+    }
+
+    device->drawPoints( points, pointCount );
 }
 
@@ -157 +230 @@
     const QPointF *points, int pointCount, PolygonDrawMode mode)
 {
-    if ( d_device )
-        d_device->drawPolygon( points, pointCount, mode );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() == QwtNullPaintDevice::PathMode )
+    {
+        QPainterPath path;
+
+        if ( pointCount > 0 )
+        {
+            path.moveTo( points[0] );
+            for ( int i = 1; i < pointCount; i++ )
+                path.lineTo( points[i] );
+
+            if ( mode != PolylineMode )
+                path.closeSubpath();
+        }
+
+        device->drawPath( path );
+        return;
+    }
+
+    device->drawPolygon( points, pointCount, mode );
 }
 
@@ -164 +258 @@
     const QPoint *points, int pointCount, PolygonDrawMode mode)
 {
-    if ( d_device )
-        d_device->drawPolygon( points, pointCount, mode );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() == QwtNullPaintDevice::PathMode )
+    {
+        QPainterPath path;
+
+        if ( pointCount > 0 )
+        {
+            path.moveTo( points[0] );
+            for ( int i = 1; i < pointCount; i++ )
+                path.lineTo( points[i] );
+
+            if ( mode != PolylineMode )
+                path.closeSubpath();
+        }
+
+        device->drawPath( path );
+        return;
+    }
+
+    device->drawPolygon( points, pointCount, mode );
 }
 
@@ -171 +286 @@
     const QRectF &rect, const QPixmap &pm, const QRectF &subRect )
 {
-    if ( d_device )
-        d_device->drawPixmap( rect, pm, subRect );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    device->drawPixmap( rect, pm, subRect );
 }
 
@@ -178 +296 @@
     const QPointF &pos, const QTextItem &textItem)
 {
-    if ( d_device )
-        d_device->drawTextItem( pos, textItem );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawTextItem( pos, textItem );
+        return;
+    }
+
+    device->drawTextItem( pos, textItem );
 }
 
@@ -186 +313 @@
     const QPointF &subRect)
 {
-    if ( d_device )
-        d_device->drawTiledPixmap( rect, pixmap, subRect );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    if ( device->mode() != QwtNullPaintDevice::NormalMode )
+    {
+        QPaintEngine::drawTiledPixmap( rect, pixmap, subRect );
+        return;
+    }   
+
+    device->drawTiledPixmap( rect, pixmap, subRect );
 }
 
@@ -194 +330 @@
     const QRectF &subRect, Qt::ImageConversionFlags flags)
 {
-    if ( d_device )
-        d_device->drawImage( rect, image, subRect, flags );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    device->drawImage( rect, image, subRect, flags );
 }
 
@@ -201 +340 @@
     const QPaintEngineState &state)
 {
-    if ( d_device )
-        d_device->updateState( state );
+    QwtNullPaintDevice *device = nullDevice();
+    if ( device == NULL )
+        return;
+
+    device->updateState( state );
+}
+
+inline QwtNullPaintDevice *QwtNullPaintDevice::PaintEngine::nullDevice()
+{
+    if ( !isActive() )
+        return NULL;
+
+    return static_cast<QwtNullPaintDevice *>( paintDevice() );
 }
 
 //! Constructor
-QwtNullPaintDevice::QwtNullPaintDevice( 
-    QPaintEngine::PaintEngineFeatures features )
-{
-    init( features );
-}
-
-//! Constructor
-QwtNullPaintDevice::QwtNullPaintDevice( const QSize &size,
-    QPaintEngine::PaintEngineFeatures features )
-{
-    init( features );
-    d_data->size = size;
-}
-
-void QwtNullPaintDevice::init( 
-    QPaintEngine::PaintEngineFeatures features )
-{
-    d_engine = new PaintEngine( features );
+QwtNullPaintDevice::QwtNullPaintDevice():
+    d_engine( NULL )
+{
     d_data = new PrivateData;
 }
@@ -235 +370 @@
 
 /*!
-   Set the size of the paint device
-
-   \param size Size
-   \sa size()
+    Set the render mode
+
+    \param mode New mode
+    \sa mode()
+ */
+void QwtNullPaintDevice::setMode( Mode mode )
+{
+    d_data->mode = mode;
+}
+
+/*! 
+    \return Render mode
+    \sa setMode()
 */
-void QwtNullPaintDevice::setSize( const QSize & size )
-{
-    d_data->size = size;
-}
-
-/*! 
-    \return Size of the paint device
-    \sa setSize()
-*/
-QSize QwtNullPaintDevice::size() const
-{
-    return d_data->size;
+QwtNullPaintDevice::Mode QwtNullPaintDevice::mode() const
+{
+    return d_data->mode;
 }
 
@@ -257 +392 @@
 QPaintEngine *QwtNullPaintDevice::paintEngine() const
 {
+    if ( d_engine == NULL )
+    {
+        QwtNullPaintDevice *that = 
+            const_cast< QwtNullPaintDevice * >( this );
+
+        that->d_engine = new PaintEngine();
+    }
+
     return d_engine;
 }
@@ -262 +405 @@
 /*! 
     See QPaintDevice::metric()
-    \sa setSize()
+
+    \param deviceMetric Type of metric
+    \return Metric information for the given paint device metric.
+
+    \sa sizeMetrics()
 */
-int QwtNullPaintDevice::metric( PaintDeviceMetric metric ) const
-{
-    static QPixmap pm;
-
+int QwtNullPaintDevice::metric( PaintDeviceMetric deviceMetric ) const
+{
     int value;
 
-    switch ( metric ) 
+    switch ( deviceMetric ) 
     {
         case PdmWidth:
-            value = qMax( d_data->size.width(), 0 );
-            break;
+        {
+            value = sizeMetrics().width();
+            break;
+        }
         case PdmHeight:
-            value = qMax( d_data->size.height(), 0 );
-            break;
+        {
+            value = sizeMetrics().height();
+            break;
+        }
         case PdmNumColors:
-            value = 16777216;
-            break;
+        {
+            value = 0xffffffff;
+            break;
+        }
         case PdmDepth:
-            value = 24;
-            break;
+        {
+            value = 32;
+            break;
+        }
         case PdmPhysicalDpiX:
+        case PdmPhysicalDpiY:
         case PdmDpiY:
-        case PdmPhysicalDpiY:
+        case PdmDpiX:
+        {
+            value = 72;
+            break;
+        }
         case PdmWidthMM:
+        {
+            value = qRound( metric( PdmWidth ) * 25.4 / metric( PdmDpiX ) );
+            break;
+        }
         case PdmHeightMM:
-        case PdmDpiX:
+        {
+            value = qRound( metric( PdmHeight ) * 25.4 / metric( PdmDpiY ) );
+            break;
+        }
         default:
             value = 0;