[Marble-commits] KDE/kdeedu/marble/src/lib

[Thibaut Gridel]

SVN commit 1135199 by tgridel:

gpslayer: drop updateGps and paintCurrentPosition,
call positiontracking directly

 M  +2 -1      MarbleMap.cpp  
 M  +2 -1      MarbleWidget.cpp  
 M  +2 -16     gps/GpsLayer.cpp  
 M  +0 -8      gps/GpsLayer.h  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleMap.cpp #1135198:1135199
@@ -58,6 +58,7 @@
 #include "ViewParams.h"
 #include "ViewportParams.h"
 #include "gps/GpsLayer.h"
+#include "gps/PositionTracking.h"
 
 using namespace Marble;
 
@@ -1144,7 +1145,7 @@
 {
     QRegion temp;
 //    const bool draw = 
-    d->m_model->gpsLayer()->updateGps( size(),&d->m_viewParams, temp );
+    d->m_model->positionTracking()->update( size(),&d->m_viewParams, temp );
 #if 0  // FIXME: move to MarbleWidget?
     if ( draw ) {
         update(temp);
--- trunk/KDE/kdeedu/marble/src/lib/MarbleWidget.cpp #1135198:1135199
@@ -48,6 +48,7 @@
 #include "ViewParams.h"
 #include "ViewportParams.h"
 #include "gps/GpsLayer.h"
+#include "gps/PositionTracking.h"
 
 
 namespace Marble
@@ -1069,7 +1070,7 @@
 void MarbleWidget::updateGps()
 {
     QRegion temp;
-    const bool draw = d->m_model->gpsLayer()->updateGps( size(),
+    const bool draw = d->m_model->positionTracking()->update( size(),
                                                          d->m_map->viewParams(),
                                                          temp );
     if ( draw ) {
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.cpp #1135198:1135199
@@ -46,13 +46,6 @@
     delete m_currentPosition;
 }
 
-bool GpsLayer::updateGps( const QSize &canvasSize, ViewParams *viewParams,
-                          QRegion &reg )
-{
-    return  m_tracking->update( canvasSize, viewParams, reg );
-//     return QRegion();
-}
-
 void GpsLayer::paintLayer( ClipPainter *painter,
                           const QSize &canvasSize, ViewParams *viewParams )
 {
@@ -61,8 +54,8 @@
         m_currentPosition->draw( painter, canvasSize,
                                  viewParams );
         QRegion temp; // useless variable
-        updateGps( canvasSize, viewParams, temp );
-        paintCurrentPosition( painter, canvasSize, viewParams );
+        m_tracking->update( canvasSize, viewParams, temp );
+        m_tracking->draw( painter, canvasSize, viewParams );
     }
 
     const QVector<GpxFile*> * const allFiles = m_fileModel->allFiles();
@@ -74,13 +67,6 @@
     painter->restore();
 }
 
-void GpsLayer::paintCurrentPosition( ClipPainter *painter,
-                                     const QSize &canvasSize,
-                                     ViewParams *viewParams )
-{
-    m_tracking->draw( painter, canvasSize, viewParams );
-}
-
 void GpsLayer::changeCurrentPosition( qreal lat, qreal lon )
 {
     m_currentPosition->setPosition( lat, lon );
--- trunk/KDE/kdeedu/marble/src/lib/gps/GpsLayer.h #1135198:1135199
@@ -37,16 +37,8 @@
     virtual void paintLayer( ClipPainter *painter, 
                              const QSize &canvasSize,
                              ViewParams *viewParams );
-    virtual void paintCurrentPosition( ClipPainter *painter, 
-                                       const QSize &canvasSize, 
-                                       ViewParams *viewParams );
-
     void changeCurrentPosition( qreal lat, qreal lon );
 
-//  public slots:
-    bool updateGps(const QSize &canvasSize, ViewParams *viewParams,
-                   QRegion &reg);
-
     GpxFileModel        *m_fileModel;
 public slots:
     virtual void clearModel();