Changeset 9383 in ntrip for trunk/BNC/qwt/qwt_plot_multi_barchart.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_plot_multi_barchart.cpp (modified) (15 diffs)

trunk/BNC/qwt/qwt_plot_multi_barchart.cpp

@@ -109 +109 @@
 /*!
   Assign a series of samples
-    
+
   setSamples() is just a wrapper for setData() without any additional
   value - beside that it is easier to find for the developer.
-    
+
   \param data Data
   \warning The item takes ownership of the data object, deleting
            it when its not used anymore.
-*/  
-void QwtPlotMultiBarChart::setSamples( 
+*/
+void QwtPlotMultiBarChart::setSamples(
     QwtSeriesData<QwtSetSample> *data )
-{       
+{
     setData( data );
-}       
+}
 
 /*!
@@ -138 +138 @@
 }
 
-/*! 
+/*!
   \return Bar titles
   \sa setBarTitles(), legendData()
@@ -163 +163 @@
         return;
 
-    QMap<int, QwtColumnSymbol *>::iterator it = 
+    QMap<int, QwtColumnSymbol *>::iterator it =
         d_data->symbolMap.find(valueIndex);
     if ( it == d_data->symbolMap.end() )
@@ -207 +207 @@
 {
     QMap<int, QwtColumnSymbol *>::const_iterator it =
-        d_data->symbolMap.find( valueIndex );
-
-    return ( it == d_data->symbolMap.end() ) ? NULL : it.value();
+        d_data->symbolMap.constFind( valueIndex );
+
+    return ( it == d_data->symbolMap.constEnd() ) ? NULL : it.value();
 }
 
@@ -220 +220 @@
   \sa setSymbol(), specialSymbol(), drawBar()
 */
-QwtColumnSymbol *QwtPlotMultiBarChart::symbol( int valueIndex ) 
-{
-    QMap<int, QwtColumnSymbol *>::iterator it =
-        d_data->symbolMap.find( valueIndex );
-
-    return ( it == d_data->symbolMap.end() ) ? NULL : it.value();
+QwtColumnSymbol *QwtPlotMultiBarChart::symbol( int valueIndex )
+{
+    QMap<int, QwtColumnSymbol *>::const_iterator it =
+        d_data->symbolMap.constFind( valueIndex );
+
+    return ( it == d_data->symbolMap.constEnd() ) ? NULL : it.value();
 }
 
@@ -233 +233 @@
 void QwtPlotMultiBarChart::resetSymbolMap()
 {
-    for ( QMap<int, QwtColumnSymbol *>::iterator it 
-        = d_data->symbolMap.begin(); it != d_data->symbolMap.end(); ++it )
-    {
-        delete it.value();
-    }
-
+    qDeleteAll( d_data->symbolMap );
     d_data->symbolMap.clear();
 }
@@ -253 +248 @@
 
   When no symbol ( NULL ) is returned, the value will be displayed
-  with the standard symbol that is used for all symbols with the same 
+  with the standard symbol that is used for all symbols with the same
   valueIndex.
 
@@ -260 +255 @@
 
   \return NULL, meaning that the value is not special
-    
+
  */
-QwtColumnSymbol *QwtPlotMultiBarChart::specialSymbol( 
+QwtColumnSymbol *QwtPlotMultiBarChart::specialSymbol(
     int sampleIndex, int valueIndex ) const
 {
@@ -456 +451 @@
   \param index Index of the sample to be painted
   \param sampleWidth Boundng width for all bars of the smaple
-  \param sample Sample 
+  \param sample Sample
 
   \sa drawSeries(), sampleWidth()
@@ -536 +531 @@
   \param index Index of the sample to be painted
   \param sampleWidth Width of the bars
-  \param sample Sample 
+  \param sample Sample
 
   \sa drawSeries(), sampleWidth()
@@ -542 +537 @@
 void QwtPlotMultiBarChart::drawStackedBars( QPainter *painter,
     const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-    const QRectF &canvasRect, int index, 
+    const QRectF &canvasRect, int index,
     double sampleWidth, const QwtSetSample& sample ) const
 {
@@ -568 +563 @@
         double sum = baseline();
 
-        const int numBars = sample.set.size();
         for ( int i = 0; i < numBars; i++ )
         {
@@ -670 +664 @@
     {
         // we build a temporary default symbol
-        QwtColumnSymbol sym( QwtColumnSymbol::Box );
-        sym.setLineWidth( 1 );
-        sym.setFrameStyle( QwtColumnSymbol::Plain );
-        sym.draw( painter, rect );
+        QwtColumnSymbol columnSymbol( QwtColumnSymbol::Box );
+        columnSymbol.setLineWidth( 1 );
+        columnSymbol.setFrameStyle( QwtColumnSymbol::Plain );
+        columnSymbol.draw( painter, rect );
     }
 
@@ -702 +696 @@
         {
             QVariant iconValue;
-            qVariantSetValue( iconValue, 
+            qVariantSetValue( iconValue,
                 legendIcon( i, legendIconSize() ) );
 
@@ -719 +713 @@
   \param index Index of the bar
   \param size Icon size
-  
+
   \return An icon showing a bar
   \sa drawBar(), legendData()