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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-03-31 21:16:14
Message-ID: 1206998174.257383.4298.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 792351 by rahn:

- Fixing measuretool



 M  +9 -1      MarbleMap.cpp  
 M  +1 -0      MeasureTool.cpp  
 M  +2 -2      VectorComposer.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #792350:792351
@@ -879,8 +879,16 @@
                           d->m_viewParams.m_canvasImage->height() );
 
     // 5. Paint measure points if there are any.
-    d->m_measureTool->paint( &painter, d->m_viewParams.viewport(), true );
 
+    bool antialiased = false;
+
+    if (   d->m_viewParams.mapQuality( d->m_viewParams.m_viewContext ) == Marble::High
+        || d->m_viewParams.mapQuality( d->m_viewParams.m_viewContext ) == Marble::Print ) {
+            antialiased = true;
+    }
+
+    d->m_measureTool->paint( &painter, d->m_viewParams.viewport(), antialiased );
+
     // Set the Bounding Box
     d->setBoundingBox();
 
--- trunk/KDE/kdeedu/marble/src/lib/MeasureTool.cpp #792350:792351
@@ -150,6 +150,7 @@
     int  width  = viewport->width();
 
     // Paint the mark, and repeat it if the projection allows it.
+    painter->setRenderHint( QPainter::Antialiasing, false );
     painter->setPen( QColor( Qt::white ) );
     if ( viewport->currentProjection()->repeatX() ) {
 
--- trunk/KDE/kdeedu/marble/src/lib/VectorComposer.cpp #792350:792351
@@ -233,8 +233,8 @@
          m_vectorMap -> paintMap( painter, antialiased );
 
         // International Dateline
-         m_vectorMap -> setzBoundingBoxLimit( 0.0 );
-         m_vectorMap -> setzPointLimit( 0.0 );
+         m_vectorMap -> setzBoundingBoxLimit( -1.0 );
+         m_vectorMap -> setzPointLimit( -1.0 );
          m_vectorMap -> createFromPntMap( m_dateLine, viewParams->viewport() );
 
          m_vectorMap -> setPen( m_dateLinePen );
[prev in list] [next in list] [prev in thread] [next in thread]