[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/plugins/render/mapscale: - Fix regression of the scale bar introduced by myself:
From:       Torsten Rahn <rahn () kde ! org>
Date:       2013-01-06 0:58:23
Message-ID: 20130106005823.A718DA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 163da31bf2027d49547a2a856eefec7ee73caa73 by Torsten Rahn.
Committed on 06/01/2013 at 01:57.
Pushed by rahn into branch 'master'.

- Fix regression of the scale bar introduced by myself:
  Sometimes the highest value label was a duplicate.

M  +25   -25   src/plugins/render/mapscale/MapScaleFloatItem.cpp

http://commits.kde.org/marble/163da31bf2027d49547a2a856eefec7ee73caa73

diff --git a/src/plugins/render/mapscale/MapScaleFloatItem.cpp \
b/src/plugins/render/mapscale/MapScaleFloatItem.cpp index 4770ec3..f22c940 100644
--- a/src/plugins/render/mapscale/MapScaleFloatItem.cpp
+++ b/src/plugins/render/mapscale/MapScaleFloatItem.cpp
@@ -231,35 +231,35 @@ void MapScaleFloatItem::paintContent( QPainter *painter )
 	    painter->drawLine( m_leftBarMargin + j * m_pixelInterval + 1, fontHeight + 4,
 			       m_leftBarMargin + (j + 1) * m_pixelInterval - 1, fontHeight + 4 );
 	    painter->setPen(   QColor( Qt::black ) );
+        }
 
-            QLocale::MeasurementSystem distanceUnit;
-            distanceUnit = \
                MarbleGlobal::getInstance()->locale()->measurementSystem();
-
-            switch ( distanceUnit ) {
-            case QLocale::MetricSystem:
-                if ( m_bestDivisor * m_valueInterval > 10000 ) {
-                    m_unit = tr("km");
-                    intervalStr.setNum( j * m_valueInterval / 1000 );
-                }
-                else {
-                    m_unit = tr("m");
-                    intervalStr.setNum( j * m_valueInterval );
-                }
-                break;
+        QLocale::MeasurementSystem distanceUnit;
+        distanceUnit = MarbleGlobal::getInstance()->locale()->measurementSystem();
 
-            case QLocale::ImperialSystem:
-                m_unit = tr("mi");
+        switch ( distanceUnit ) {
+        case QLocale::MetricSystem:
+            if ( m_bestDivisor * m_valueInterval > 10000 ) {
+                m_unit = tr("km");
                 intervalStr.setNum( j * m_valueInterval / 1000 );
+            }
+            else {
+                m_unit = tr("m");
+                intervalStr.setNum( j * m_valueInterval );
+            }
+            break;
 
-                if ( m_bestDivisor * m_valueInterval > 3800 ) {
-                    intervalStr.setNum( j * m_valueInterval / 1000 );
-                }
-                else {
-                    intervalStr.setNum( qreal(j * m_valueInterval ) / 1000.0, 'f', 2 \
                );
-                }
-                break;
+        case QLocale::ImperialSystem:
+            m_unit = tr("mi");
+            intervalStr.setNum( j * m_valueInterval / 1000 );
+
+            if ( m_bestDivisor * m_valueInterval > 3800 ) {
+                intervalStr.setNum( j * m_valueInterval / 1000 );
             }
-	}
+            else {
+                intervalStr.setNum( qreal(j * m_valueInterval ) / 1000.0, 'f', 2 );
+            }
+            break;
+        }
 
         painter->setFont( font() );
 


[prev in list] [next in list] [prev in thread] [next in thread]