Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_histogram.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_histogram.cpp (modified) (22 diffs)

trunk/BNC/qwt/qwt_plot_histogram.cpp

@@ -10 +10 @@
 #include "qwt_plot_histogram.h"
 #include "qwt_plot.h"
-#include "qwt_legend.h"
-#include "qwt_legend_item.h"
 #include "qwt_painter.h"
 #include "qwt_column_symbol.h"
@@ -18 +16 @@
 #include <qpainter.h>
 
-static inline bool isCombinable( const QwtInterval &d1,
+static inline bool qwtIsCombinable( const QwtInterval &d1,
     const QwtInterval &d2 )
 {
@@ -63 +61 @@
   \param title Title of the histogram.
 */
-
 QwtPlotHistogram::QwtPlotHistogram( const QwtText &title ):
-    QwtPlotSeriesItem<QwtIntervalSample>( title )
+    QwtPlotSeriesItem( title )
 {
     init();
@@ -75 +72 @@
 */
 QwtPlotHistogram::QwtPlotHistogram( const QString &title ):
-    QwtPlotSeriesItem<QwtIntervalSample>( title )
+    QwtPlotSeriesItem( title )
 {
     init();
@@ -90 +87 @@
 {
     d_data = new PrivateData();
-    d_series = new QwtIntervalSeriesData();
+    setData( new QwtIntervalSeriesData() );
 
     setItemAttribute( QwtPlotItem::AutoScale, true );
@@ -109 +106 @@
     {
         d_data->style = style;
+
+        legendChanged();
         itemChanged();
     }
@@ -114 +113 @@
 
 /*!
-    Return the current style
+    \return Style of the histogram
     \sa HistogramStyle, setStyle()
 */
@@ -121 +120 @@
     return d_data->style;
 }
+
+/*!
+  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 QwtPlotHistogram::setPen( const QColor &color, qreal width, Qt::PenStyle style )
+{   
+    setPen( QPen( color, width, style ) );
+}   
 
 /*!
@@ -133 +150 @@
     {
         d_data->pen = pen;
+
+        legendChanged();
         itemChanged();
     }
@@ -157 +176 @@
     {
         d_data->brush = brush;
+
+        legendChanged();
         itemChanged();
     }
@@ -181 +202 @@
 
   \note In applications, where different intervals need to be displayed
-        in a different way ( f.e different colors or even using differnt symbols)
+        in a different way ( f.e different colors or even using different symbols)
         it is recommended to overload drawColumn().
 */
@@ -190 +211 @@
         delete d_data->symbol;
         d_data->symbol = symbol;
+
+        legendChanged();
         itemChanged();
     }
@@ -238 +261 @@
 QRectF QwtPlotHistogram::boundingRect() const
 {
-    QRectF rect = d_series->boundingRect();
+    QRectF rect = data()->boundingRect();
     if ( !rect.isValid() )
         return rect;
@@ -276 +299 @@
     const QVector<QwtIntervalSample> &samples )
 {
-    delete d_series;
-    d_series = new QwtIntervalSeriesData( samples );
-    itemChanged();
+    setData( new QwtIntervalSeriesData( samples ) );
+}
+
+/*!
+  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 QwtPlotHistogram::setSamples( 
+    QwtSeriesData<QwtIntervalSample> *data )
+{
+    setData( data );
 }
 
@@ -287 +324 @@
   \param xMap Maps x-values into pixel coordinates.
   \param yMap Maps y-values into pixel coordinates.
-  \param canvasRect Contents rect of the canvas
+  \param canvasRect Contents rectangle of the canvas
   \param from Index of the first sample to be painted
   \param to Index of the last sample to be painted. If to < 0 the
@@ -350 +387 @@
     for ( int i = from; i <= to; i++ )
     {
-        const QwtIntervalSample sample = d_series->sample( i );
+        const QwtIntervalSample sample = this->sample( i );
 
         if ( !sample.interval.isValid() )
@@ -361 +398 @@
         if ( previous.interval.isValid() )
         {
-            if ( !isCombinable( previous.interval, sample.interval ) )
+            if ( !qwtIsCombinable( previous.interval, sample.interval ) )
                 flushPolygon( painter, v0, polygon );
         }
@@ -426 +463 @@
     painter->setBrush( d_data->brush );
 
+    const QwtSeriesData<QwtIntervalSample> *series = data();
+
     for ( int i = from; i <= to; i++ )
     {
-        const QwtIntervalSample sample = d_series->sample( i );
+        const QwtIntervalSample sample = series->sample( i );
         if ( !sample.interval.isNull() )
         {
@@ -458 +497 @@
     painter->setBrush( Qt::NoBrush );
 
+    const QwtSeriesData<QwtIntervalSample> *series = data();
+
     for ( int i = from; i <= to; i++ )
     {
-        const QwtIntervalSample sample = d_series->sample( i );
+        const QwtIntervalSample sample = series->sample( i );
         if ( !sample.interval.isNull() )
         {
@@ -532 +573 @@
             polygon += QPointF( baseLine, polygon.first().y() );
         }
+
         QwtPainter::drawPolygon( painter, polygon );
-        polygon.resize( polygon.size() - 2 );
+
+        polygon.pop_back();
+        polygon.pop_back();
     }
     if ( d_data->pen.style() != Qt::NoPen )
@@ -601 +645 @@
 
   \note In applications, where different intervals need to be displayed
-        in a different way ( f.e different colors or even using differnt symbols)
+        in a different way ( f.e different colors or even using different symbols)
         it is recommended to overload drawColumn().
 */
@@ -630 +674 @@
 
 /*!
-  Draw a plain rectangle without pen using the brush() as identifier
-
-  \param painter Painter
-  \param rect Bounding rectangle for the identifier
-*/
-void QwtPlotHistogram::drawLegendIdentifier(
-    QPainter *painter, const QRectF &rect ) const
-{
-    const double dim = qMin( rect.width(), rect.height() );
-
-    QSizeF size( dim, dim );
-
-    QRectF r( 0, 0, size.width(), size.height() );
-    r.moveCenter( rect.center() );
-
-    painter->fillRect( r, d_data->brush );
-}
+  A plain rectangle without pen using the brush()
+
+  \param index Index of the legend entry 
+                ( ignored as there is only one )
+  \param size Icon size
+  \return A graphic displaying the icon
+    
+  \sa QwtPlotItem::setLegendIconSize(), QwtPlotItem::legendData()
+*/
+QwtGraphic QwtPlotHistogram::legendIcon( int index,
+    const QSizeF &size ) const
+{
+    Q_UNUSED( index );
+    return defaultIcon( d_data->brush, size );
+}