Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_plot_scaleitem.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_scaleitem.cpp (modified) (14 diffs)

trunk/BNC/qwt/qwt_plot_scaleitem.cpp

@@ -10 +10 @@
 #include "qwt_plot_scaleitem.h"
 #include "qwt_plot.h"
-#include "qwt_plot_canvas.h"
 #include "qwt_scale_map.h"
 #include "qwt_interval.h"
@@ -32 +31 @@
     }
 
-    void updateBorders( const QRectF &,
-        const QwtScaleMap &, const QwtScaleMap & );
+    QwtInterval scaleInterval( const QRectF &,
+        const QwtScaleMap &, const QwtScaleMap & ) const;
 
     QPalette palette;
@@ -41 +40 @@
     bool scaleDivFromAxis;
     QwtScaleDraw *scaleDraw;
-    QRectF canvasRectCache;
 };
 
-void QwtPlotScaleItem::PrivateData::updateBorders( const QRectF &canvasRect,
-    const QwtScaleMap &xMap, const QwtScaleMap &yMap )
-{
-    canvasRectCache = canvasRect;
-
+QwtInterval QwtPlotScaleItem::PrivateData::scaleInterval( const QRectF &canvasRect,
+    const QwtScaleMap &xMap, const QwtScaleMap &yMap ) const
+{
     QwtInterval interval;
     if ( scaleDraw->orientation() == Qt::Horizontal )
@@ -61 +57 @@
     }
 
-    QwtScaleDiv scaleDiv = scaleDraw->scaleDiv();
-    scaleDiv.setInterval( interval );
-    scaleDraw->setScaleDiv( scaleDiv );
-}
+    return interval;
+}
+
 /*!
    \brief Constructor for scale item at the position pos.
@@ -84 +79 @@
     d_data->scaleDraw->setAlignment( alignment );
 
+    setItemInterest( QwtPlotItem::ScaleInterest, true );
     setZ( 11.0 );
 }
@@ -137 +133 @@
             if ( plt )
             {
-                updateScaleDiv( *plt->axisScaleDiv( xAxis() ),
-                    *plt->axisScaleDiv( yAxis() ) );
+                updateScaleDiv( plt->axisScaleDiv( xAxis() ),
+                    plt->axisScaleDiv( yAxis() ) );
                 itemChanged();
             }
@@ -164 +160 @@
     {
         d_data->palette = palette;
+
+        legendChanged();
         itemChanged();
     }
@@ -223 +221 @@
     if ( plt )
     {
-        updateScaleDiv( *plt->axisScaleDiv( xAxis() ),
-            *plt->axisScaleDiv( yAxis() ) );
+        updateScaleDiv( plt->axisScaleDiv( xAxis() ),
+            plt->axisScaleDiv( yAxis() ) );
     }
 
@@ -282 +280 @@
 
    If distance is >= 0 the scale will be aligned to a
-   border of the contents rect of the canvas. If
+   border of the contents rectangle of the canvas. If
    alignment() is QwtScaleDraw::LeftScale, the scale will
    be aligned to the right border, if it is QwtScaleDraw::TopScale
@@ -348 +346 @@
     const QRectF &canvasRect ) const
 {
+    QwtScaleDraw *sd = d_data->scaleDraw;
+
     if ( d_data->scaleDivFromAxis )
     {
-        if ( canvasRect != d_data->canvasRectCache )
-            d_data->updateBorders( canvasRect, xMap, yMap );
+        const QwtInterval interval = 
+            d_data->scaleInterval( canvasRect, xMap, yMap );
+
+        if ( interval != sd->scaleDiv().interval() )
+        {
+            QwtScaleDiv scaleDiv = sd->scaleDiv();
+            scaleDiv.setInterval( interval );
+            sd->setScaleDiv( scaleDiv );
+        }
     }
 
@@ -358 +365 @@
     painter->setPen( pen );
 
-    QwtScaleDraw *sd = d_data->scaleDraw;
     if ( sd->orientation() == Qt::Horizontal )
     {
@@ -382 +388 @@
         sd->move( canvasRect.left(), y );
         sd->setLength( canvasRect.width() - 1 );
-        sd->setTransformation( xMap.transformation()->copy() );
+
+        QwtTransform *transform = NULL;
+        if ( xMap.transformation() )
+            transform = xMap.transformation()->copy();
+
+        sd->setTransformation( transform );
     }
     else // == Qt::Vertical
@@ -405 +416 @@
         sd->move( x, canvasRect.top() );
         sd->setLength( canvasRect.height() - 1 );
-        sd->setTransformation( yMap.transformation()->copy() );
+
+        QwtTransform *transform = NULL;
+        if ( yMap.transformation() )
+            transform = yMap.transformation()->copy();
+
+        sd->setTransformation( transform );
     }
 
@@ -428 +444 @@
     const QwtScaleDiv& yScaleDiv )
 {
-    QwtScaleDraw *sd = d_data->scaleDraw;
-    if ( d_data->scaleDivFromAxis && sd )
-    {
-        sd->setScaleDiv(
-            sd->orientation() == Qt::Horizontal ? xScaleDiv : yScaleDiv );
+    QwtScaleDraw *scaleDraw = d_data->scaleDraw;
+
+    if ( d_data->scaleDivFromAxis && scaleDraw )
+    {
+        const QwtScaleDiv &scaleDiv = 
+            scaleDraw->orientation() == Qt::Horizontal ? xScaleDiv : yScaleDiv;
 
         const QwtPlot *plt = plot();
         if ( plt != NULL )
         {
-            d_data->updateBorders( plt->canvas()->contentsRect(),
-                plt->canvasMap( xAxis() ), plt->canvasMap( yAxis() ) );
-        }
-    }
-}
+            const QRectF canvasRect = plt->canvas()->contentsRect();
+
+            const QwtInterval interval = d_data->scaleInterval( 
+                canvasRect, plt->canvasMap( xAxis() ), plt->canvasMap( yAxis() ) );
+
+            QwtScaleDiv sd = scaleDiv;
+            sd.setInterval( interval );
+
+            if ( sd != scaleDraw->scaleDiv() )
+            {
+                // the internal label cache of QwtScaleDraw
+                // is cleared here, so better avoid pointless
+                // assignments.
+
+                scaleDraw->setScaleDiv( sd );
+            }
+        }
+        else
+        {
+            scaleDraw->setScaleDiv( scaleDiv );
+        }
+    }
+}