Changeset 8127 in ntrip for trunk/BNC/qwt/qwt_scale_widget.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_scale_widget.cpp (modified) (17 diffs)

trunk/BNC/qwt/qwt_scale_widget.cpp

@@ -15 +15 @@
 #include "qwt_scale_div.h"
 #include "qwt_text.h"
+#include "qwt_scale_engine.h"
 #include <qpainter.h>
 #include <qevent.h>
@@ -107 +108 @@
     d_data->scaleDraw->setLength( 10 );
 
+    d_data->scaleDraw->setScaleDiv(
+        QwtLinearScaleEngine().divideScale( 0.0, 100.0, 10, 5 ) );
+
     d_data->colorBar.colorMap = new QwtLinearColorMap();
     d_data->colorBar.isEnabled = false;
@@ -202 +206 @@
 void QwtScaleWidget::setAlignment( QwtScaleDraw::Alignment alignment )
 {
+    if ( d_data->scaleDraw )
+        d_data->scaleDraw->setAlignment( alignment );
+
     if ( !testAttribute( Qt::WA_WState_OwnSizePolicy ) )
     {
@@ -208 +215 @@
         if ( d_data->scaleDraw->orientation() == Qt::Vertical )
             policy.transpose();
+
         setSizePolicy( policy );
 
@@ -213 +221 @@
     }
 
-    if ( d_data->scaleDraw )
-        d_data->scaleDraw->setAlignment( alignment );
     layoutScale();
 }
@@ -305 +311 @@
 /*!
   Set a scale draw
-  sd has to be created with new and will be deleted in
+
+  scaleDraw has to be created with new and will be deleted in
   ~QwtScaleWidget() or the next call of setScaleDraw().
-
-  \param sd ScaleDraw object
+  scaleDraw will be initialized with the attributes of
+  the previous scaleDraw object.
+
+  \param scaleDraw ScaleDraw object
   \sa scaleDraw()
 */
-void QwtScaleWidget::setScaleDraw( QwtScaleDraw *sd )
-{
-    if ( sd == NULL || sd == d_data->scaleDraw )
+void QwtScaleWidget::setScaleDraw( QwtScaleDraw *scaleDraw )
+{
+    if ( ( scaleDraw == NULL ) || ( scaleDraw == d_data->scaleDraw ) )
         return;
 
-    if ( d_data->scaleDraw )
-        sd->setAlignment( d_data->scaleDraw->alignment() );
+    const QwtScaleDraw* sd = d_data->scaleDraw;
+    if ( sd )
+    {
+        scaleDraw->setAlignment( sd->alignment() );
+        scaleDraw->setScaleDiv( sd->scaleDiv() );
+
+        QwtTransform *transform = NULL;
+        if ( sd->scaleMap().transformation() )
+            transform = sd->scaleMap().transformation()->copy();
+
+        scaleDraw->setTransformation( transform );
+    }
 
     delete d_data->scaleDraw;
-    d_data->scaleDraw = sd;
+    d_data->scaleDraw = scaleDraw;
 
     layoutScale();
@@ -326 +345 @@
 
 /*!
-    scaleDraw of this scale
+    \return scaleDraw of this scale
     \sa setScaleDraw(), QwtScaleDraw::setScaleDraw()
 */
@@ -335 +354 @@
 
 /*!
-    scaleDraw of this scale
+    \return scaleDraw of this scale
     \sa QwtScaleDraw::setScaleDraw()
 */
@@ -436 +455 @@
 
   \param rect Bounding rectangle for all components of the scale
-  \return Rectabgle for the color bar
+  \return Rectangle for the color bar
 */
 QRectF QwtScaleWidget::colorBarRect( const QRectF& rect ) const
@@ -490 +509 @@
 
 /*!
-  Event handler for resize event
+  Event handler for resize events
   \param event Resize event
 */
@@ -501 +520 @@
 /*!
   Recalculate the scale's geometry and layout based on
-  the current rect and fonts.
+  the current geometry and fonts.
 
   \param update_geometry Notify the layout system and call update
@@ -646 +665 @@
     QwtText title = d_data->title;
     title.setRenderFlags( flags );
-    title.draw( painter, QRect( 0, 0, r.width(), r.height() ) );
+    title.draw( painter, QRectF( 0.0, 0.0, r.width(), r.height() ) );
 
     painter->restore();
@@ -713 +732 @@
 int QwtScaleWidget::titleHeightForWidth( int width ) const
 {
-    return d_data->title.heightForWidth( width, font() );
+    return qCeil( d_data->title.heightForWidth( width, font() ) );
 }
 
@@ -749 +768 @@
   is returned.
 
+  \param start Return parameter for the border width at 
+               the beginning of the scale
+  \param end Return parameter for the border width at the 
+             end of the scale
+
   \warning
   <ul> <li>The minimum border distance depends on the font.</ul>
@@ -784 +808 @@
   the widget borders.
 
+  \param start Return parameter for the border width at 
+               the beginning of the scale
+  \param end Return parameter for the border width at the 
+             end of the scale
+
   \sa setMinBorderDist(), getBorderDistHint()
 */
@@ -797 +826 @@
   The scale division determines where to set the tick marks.
 
-  \param transformation Transformation, needed to translate between
-                        scale and pixal values
   \param scaleDiv Scale Division
   \sa For more information about scale divisions, see QwtScaleDiv.
 */
-void QwtScaleWidget::setScaleDiv(
-    QwtScaleTransformation *transformation,
-    const QwtScaleDiv &scaleDiv )
+void QwtScaleWidget::setScaleDiv( const QwtScaleDiv &scaleDiv )
 {
     QwtScaleDraw *sd = d_data->scaleDraw;
-    if ( sd->scaleDiv() != scaleDiv ||
-        sd->scaleMap().transformation()->type() != transformation->type() )
-    {
-        sd->setTransformation( transformation );
+    if ( sd->scaleDiv() != scaleDiv )
+    {
         sd->setScaleDiv( scaleDiv );
         layoutScale();
@@ -816 +839 @@
         Q_EMIT scaleDivChanged();
     }
-    else
-    {
-        /*
-          The transformation doesn't anything different as the 
-          previous one. So we better throw it silently away instead of 
-          initiating heavy updates
-         */
-
-        delete transformation;
-    }
+}
+
+/*!
+  Set the transformation
+
+  \param transformation Transformation
+  \sa QwtAbstractScaleDraw::scaleDraw(), QwtScaleMap
+ */
+void QwtScaleWidget::setTransformation( QwtTransform *transformation )
+{
+    d_data->scaleDraw->setTransformation( transformation );
+    layoutScale();
 }