Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_marker.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_plot_marker.cpp (modified) (13 diffs)

trunk/BNC/qwt/qwt_plot_marker.cpp

@@ -14 +14 @@
 #include "qwt_text.h"
 #include "qwt_math.h"
-#include "qwt_legend.h"
-#include "qwt_legend_item.h"
 #include <qpainter.h>
 
@@ -51 +49 @@
 
 //! Sets alignment to Qt::AlignCenter, and style to QwtPlotMarker::NoLine
-QwtPlotMarker::QwtPlotMarker():
-    QwtPlotItem( QwtText( "Marker" ) )
+QwtPlotMarker::QwtPlotMarker( const QString &title ):
+    QwtPlotItem( QwtText( title ) )
+{
+    d_data = new PrivateData;
+    setZ( 30.0 );
+}
+
+//! Sets alignment to Qt::AlignCenter, and style to QwtPlotMarker::NoLine
+QwtPlotMarker::QwtPlotMarker( const QwtText &title ):
+    QwtPlotItem( title )
 {
     d_data = new PrivateData;
@@ -123 +129 @@
   \param xMap x Scale Map
   \param yMap y Scale Map
-  \param canvasRect Contents rect of the canvas in painter coordinates
+  \param canvasRect Contents rectangle of the canvas in painter coordinates
 */
 void QwtPlotMarker::draw( QPainter *painter,
@@ -140 +146 @@
         ( d_data->symbol->style() != QwtSymbol::NoSymbol ) )
     {
-        d_data->symbol->drawSymbol( painter, pos );
+        const QSizeF sz = d_data->symbol->size();
+
+        const QRectF clipRect = canvasRect.adjusted( 
+            -sz.width(), -sz.height(), sz.width(), sz.height() );
+
+        if ( clipRect.contains( pos ) )
+            d_data->symbol->drawSymbol( painter, pos );
     }
 
@@ -150 +162 @@
 
   \param painter Painter
-  \param canvasRect Contents rect of the canvas in painter coordinates
+  \param canvasRect Contents rectangle of the canvas in painter coordinates
   \param pos Position of the marker, translated into widget coordinates
 
@@ -190 +202 @@
 
   \param painter Painter
-  \param canvasRect Contents rect of the canvas in painter coordinates
+  \param canvasRect Contents rectangle of the canvas in painter coordinates
   \param pos Position of the marker, translated into widget coordinates
 
@@ -334 +346 @@
     {
         d_data->style = style;
+
+        legendChanged();
         itemChanged();
     }
@@ -358 +372 @@
         delete d_data->symbol;
         d_data->symbol = symbol;
+
+        if ( symbol )
+            setLegendIconSize( symbol->boundingRect().size() );
+
+        legendChanged();
         itemChanged();
     }
@@ -373 +392 @@
 /*!
   \brief Set the label
-  \param label label text
+  \param label Label text
   \sa label()
 */
@@ -484 +503 @@
 }
 
+/*! 
+  Build and assign a line 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 QwtPlotMarker::setLinePen( const QColor &color, qreal width, Qt::PenStyle style )
+{   
+    setLinePen( QPen( color, width, style ) );
+}
+
 /*!
   Specify a pen for the line.
@@ -495 +532 @@
     {
         d_data->pen = pen;
+
+        legendChanged();
         itemChanged();
     }
@@ -514 +553 @@
 
 /*!
-   \brief Update the widget that represents the item on the legend
-
-   \param legend Legend
-   \sa drawLegendIdentifier(), legendItem(), itemChanged(), QwtLegend()
-
-   \note In the default setting QwtPlotItem::Legend is disabled 
-*/
-void QwtPlotMarker::updateLegend( QwtLegend *legend ) const
-{
-    if ( legend && testItemAttribute( QwtPlotItem::Legend )
-        && d_data->symbol && d_data->symbol->style() != QwtSymbol::NoSymbol )
-    {
-        QWidget *lgdItem = legend->find( this );
-        if ( lgdItem == NULL )
-        {
-            lgdItem = legendItem();
-            if ( lgdItem )
-                legend->insert( this, lgdItem );
-        }
-
-        QwtLegendItem *l = qobject_cast<QwtLegendItem *>( lgdItem );
-        if ( l )
-            l->setIdentifierSize( d_data->symbol->boundingSize() );
-    }
-
-    QwtPlotItem::updateLegend( legend );
-}
-
-/*!
-  \brief Draw the identifier representing the marker on the legend
-
-  \param painter Painter
-  \param rect Bounding rectangle for the identifier
-
-  \sa updateLegend(), QwtPlotItem::Legend
-*/
-void QwtPlotMarker::drawLegendIdentifier(
-    QPainter *painter, const QRectF &rect ) const
-{
-    if ( rect.isEmpty() )
-        return;
-
-    painter->save();
-    painter->setClipRect( rect, Qt::IntersectClip );
+   \return Icon representing the marker on the legend
+
+   \param index Index of the legend entry 
+                ( usually there is only one )
+   \param size Icon size
+
+   \sa setLegendIconSize(), legendData()
+*/
+QwtGraphic QwtPlotMarker::legendIcon( int index,
+    const QSizeF &size ) const
+{
+    Q_UNUSED( index );
+
+    if ( size.isEmpty() )
+        return QwtGraphic();
+
+    QwtGraphic icon;
+    icon.setDefaultSize( size );
+    icon.setRenderHint( QwtGraphic::RenderPensUnscaled, true );
+
+    QPainter painter( &icon );
+    painter.setRenderHint( QPainter::Antialiasing,
+        testRenderHint( QwtPlotItem::RenderAntialiased ) );
 
     if ( d_data->style != QwtPlotMarker::NoLine )
     {
-        painter->setPen( d_data->pen );
+        painter.setPen( d_data->pen );
 
         if ( d_data->style == QwtPlotMarker::HLine ||
             d_data->style == QwtPlotMarker::Cross )
         {
-            QwtPainter::drawLine( painter, rect.left(), rect.center().y(),
-                rect.right(), rect.center().y() );
+            const double y = 0.5 * size.height();
+
+            QwtPainter::drawLine( &painter, 
+                0.0, y, size.width(), y );
         }
 
@@ -573 +593 @@
             d_data->style == QwtPlotMarker::Cross )
         {
-            QwtPainter::drawLine( painter, rect.center().x(), rect.top(),
-                rect.center().x(), rect.bottom() );
+            const double x = 0.5 * size.width();
+
+            QwtPainter::drawLine( &painter, 
+                x, 0.0, x, size.height() );
         }
     }
 
-    if ( d_data->symbol && d_data->symbol->style() != QwtSymbol::NoSymbol )
-    {
-        QSize symbolSize = d_data->symbol->boundingSize();
-        symbolSize -= QSize( 2, 2 );
-
-        // scale the symbol size down if it doesn't fit into rect.
-
-        double xRatio = 1.0;
-        if ( rect.width() < symbolSize.width() )
-            xRatio = rect.width() / symbolSize.width();
-        double yRatio = 1.0;
-        if ( rect.height() < symbolSize.height() )
-            yRatio = rect.height() / symbolSize.height();
-
-        const double ratio = qMin( xRatio, yRatio );
-
-        painter->scale( ratio, ratio );
-        d_data->symbol->drawSymbol( painter, rect.center() / ratio );
-    }
-
-    painter->restore();
-}
-
+    if ( d_data->symbol )
+    {
+        const QRect r( 0.0, 0.0, size.width(), size.height() );
+        d_data->symbol->drawSymbol( &painter, r );
+    }
+
+    return icon;
+}
+