Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_legend.cpp

Timestamp:

Mar 19, 2021, 9:15:03 AM (3 years ago)

Author:

stoecker

Message:

update to qwt verion 6.1.1 to fix build with newer Qt5

File:

• trunk/BNC/qwt/qwt_legend.cpp (modified) (21 diffs)

trunk/BNC/qwt/qwt_legend.cpp

@@ -50 +50 @@
 };
 
-void QwtLegendMap::insert( const QVariant &itemInfo, 
+void QwtLegendMap::insert( const QVariant &itemInfo,
     const QList<QWidget *> &widgets )
 {
@@ -142 +142 @@
 {
 public:
-    LegendView( QWidget *parent ):
+    explicit LegendView( QWidget *parent ):
         QScrollArea( parent )
     {
@@ -296 +296 @@
     if ( tl )
         tl->setMaxColumns( numColums );
+
+    updateGeometry();
 }
 
@@ -342 +344 @@
 
 /*!
-  The contents widget is the only child of the viewport of 
+  The contents widget is the only child of the viewport of
   the internal QScrollArea and the parent widget of all legend items.
 
@@ -371 +373 @@
 
 /*!
-  The contents widget is the only child of the viewport of 
+  The contents widget is the only child of the viewport of
   the internal QScrollArea and the parent widget of all legend items.
 
@@ -386 +388 @@
 
   \param itemInfo Info for an item
-  \param data List of legend entry attributes for the item
+  \param legendData List of legend entry attributes for the item
  */
-void QwtLegend::updateLegend( const QVariant &itemInfo, 
-    const QList<QwtLegendData> &data )
+void QwtLegend::updateLegend( const QVariant &itemInfo,
+    const QList<QwtLegendData> &legendData )
 {
     QList<QWidget *> widgetList = legendWidgets( itemInfo );
 
-    if ( widgetList.size() != data.size() )
+    if ( widgetList.size() != legendData.size() )
     {
         QLayout *contentsLayout = d_data->view->contentsWidget->layout();
 
-        while ( widgetList.size() > data.size() )
+        while ( widgetList.size() > legendData.size() )
         {
             QWidget *w = widgetList.takeLast();
@@ -410 +412 @@
         }
 
-        for ( int i = widgetList.size(); i < data.size(); i++ )
-        {
-            QWidget *widget = createWidget( data[i] );
+#if QT_VERSION >= 0x040700
+        widgetList.reserve( legendData.size() );
+#endif
+
+        for ( int i = widgetList.size(); i < legendData.size(); i++ )
+        {
+            QWidget *widget = createWidget( legendData[i] );
 
             if ( contentsLayout )
@@ -441 +447 @@
         updateTabOrder();
     }
-    
-    for ( int i = 0; i < data.size(); i++ )
-        updateWidget( widgetList[i], data[i] );
+
+    for ( int i = 0; i < legendData.size(); i++ )
+        updateWidget( widgetList[i], legendData[i] );
 }
 
@@ -451 +457 @@
   The default implementation returns a QwtLegendLabel.
 
-  \param data Attributes of the legend entry
+  \param legendData Attributes of the legend entry
   \return Widget representing data on the legend
-  
+
   \note updateWidget() will called soon after createWidget()
         with the same attributes.
  */
-QWidget *QwtLegend::createWidget( const QwtLegendData &data ) const
-{
-    Q_UNUSED( data );
+QWidget *QwtLegend::createWidget( const QwtLegendData &legendData ) const
+{
+    Q_UNUSED( legendData );
 
     QwtLegendLabel *label = new QwtLegendLabel();
     label->setItemMode( defaultItemMode() );
 
-    connect( label, SIGNAL( clicked() ), SLOT( itemClicked() ) );
-    connect( label, SIGNAL( checked( bool ) ), SLOT( itemChecked( bool ) ) );
+    connect( label, SIGNAL(clicked()), SLOT(itemClicked()) );
+    connect( label, SIGNAL(checked(bool)), SLOT(itemChecked(bool)) );
 
     return label;
@@ -471 +477 @@
 
 /*!
-  \brief Update the widget 
+  \brief Update the widget
 
   \param widget Usually a QwtLegendLabel
-  \param data Attributes to be displayed
+  \param legendData Attributes to be displayed
 
   \sa createWidget()
   \note When widget is no QwtLegendLabel updateWidget() does nothing.
  */
-void QwtLegend::updateWidget( QWidget *widget, const QwtLegendData &data )
+void QwtLegend::updateWidget( QWidget *widget, const QwtLegendData &legendData )
 {
     QwtLegendLabel *label = qobject_cast<QwtLegendLabel *>( widget );
     if ( label )
     {
-        label->setData( data );
-        if ( !data.value( QwtLegendData::ModeRole ).isValid() )
+        label->setData( legendData );
+        if ( !legendData.value( QwtLegendData::ModeRole ).isValid() )
         {
             // use the default mode, when there is no specific
@@ -541 +547 @@
 
 /*!
-  Handle QEvent::ChildRemoved andQEvent::LayoutRequest events 
+  Handle QEvent::ChildRemoved andQEvent::LayoutRequest events
   for the contentsWidget().
 
@@ -557 +563 @@
             case QEvent::ChildRemoved:
             {
-                const QChildEvent *ce = 
+                const QChildEvent *ce =
                     static_cast<const QChildEvent *>(event);
+
                 if ( ce->child()->isWidgetType() )
                 {
-                    QWidget *w = static_cast< QWidget * >( ce->child() );
+                    /*
+                        We are called from the ~QObject and ce->child() is
+                        no widget anymore. But all we need is the address
+                        to remove it from the map.
+                     */
+                    QWidget *w = reinterpret_cast< QWidget * >( ce->child() );
                     d_data->itemMap.removeWidget( w );
                 }
@@ -585 +597 @@
                     QApplication::postEvent( parentWidget(),
                         new QEvent( QEvent::LayoutRequest ) );
-                }                
+                }
                 break;
             }
@@ -645 +657 @@
   \param painter Painter
   \param rect Bounding rectangle
-  \param fillBackground When true, fill rect with the widget background 
+  \param fillBackground When true, fill rect with the widget background
 
   \sa renderLegend() is used by QwtPlotRenderer - not by QwtLegend itself
 */
-void QwtLegend::renderLegend( QPainter *painter, 
+void QwtLegend::renderLegend( QPainter *painter,
     const QRectF &rect, bool fillBackground ) const
 {
@@ -664 +676 @@
     }
 
-    const QwtDynGridLayout *legendLayout = 
+    const QwtDynGridLayout *legendLayout =
         qobject_cast<QwtDynGridLayout *>( contentsWidget()->layout() );
     if ( legendLayout == NULL )
@@ -672 +684 @@
     getContentsMargins( &left, &top, &right, &bottom );
 
-    QRect layoutRect; 
+    QRect layoutRect;
     layoutRect.setLeft( qCeil( rect.left() ) + left );
     layoutRect.setTop( qCeil( rect.top() ) + top );
@@ -679 +691 @@
 
     uint numCols = legendLayout->columnsForWidth( layoutRect.width() );
-    QList<QRect> itemRects =
+    const QList<QRect> itemRects =
         legendLayout->layoutItems( layoutRect, numCols );
 
@@ -707 +719 @@
   \param widget Widget representing a legend entry
   \param rect Bounding rectangle
-  \param fillBackground When true, fill rect with the widget background 
+  \param fillBackground When true, fill rect with the widget background
 
   \note When widget is not derived from QwtLegendLabel renderItem
         does nothing beside the background
 */
-void QwtLegend::renderItem( QPainter *painter, 
+void QwtLegend::renderItem( QPainter *painter,
     const QWidget *widget, const QRectF &rect, bool fillBackground ) const
 {
@@ -733 +745 @@
 
         const QRectF iconRect( rect.x() + label->margin(),
-            rect.center().y() - 0.5 * sz.height(), 
+            rect.center().y() - 0.5 * sz.height(),
             sz.width(), sz.height() );
 
@@ -743 +755 @@
         titleRect.setX( iconRect.right() + 2 * label->spacing() );
 
-        painter->setFont( label->font() );
+        QFont labelFont = label->font();
+        labelFont.resolve( QFont::AllPropertiesResolved );
+
+        painter->setFont( labelFont );
         painter->setPen( label->palette().color( QPalette::Text ) );
+
         const_cast< QwtLegendLabel *>( label )->drawText( painter, titleRect );
     }
@@ -795 +811 @@
     Return the extent, that is needed for the scrollbars
 
-    \param orientation Orientation ( 
+    \param orientation Orientation
     \return The width of the vertical scrollbar for Qt::Horizontal and v.v.
  */