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

[Jens-Michael Hoffmann]

SVN commit 1080536 by jmhoffmann:

MarbleModel::paintTile: Remove redundant arguments x, y and level as this
information is contained within the given TextureTile's TileId.


 M  +2 -2      MarbleModel.cpp  
 M  +1 -3      MarbleModel.h  
 M  +2 -5      TileLoader.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #1080535:1080536
@@ -834,8 +834,8 @@
     }
 }
 
-void MarbleModel::paintTile( TextureTile* tile, int x, int y, int level,
-                             GeoSceneTexture *textureLayer, bool requestTileUpdate )
+void MarbleModel::paintTile( TextureTile* tile, GeoSceneTexture *textureLayer,
+                             bool requestTileUpdate )
 {
 //    mDebug() << "MarbleModel::paintTile: " << "x: " << x << "y:" << y << "level: " << level
 //             << "requestTileUpdate" << requestTileUpdate;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.h #1080535:1080536
@@ -306,9 +306,7 @@
     void clearPersistentTileCache();
 
 //  private Q_SLOTS:
-    void paintTile( TextureTile* tile, int x, int y, int level,
-                    GeoSceneTexture *textureLayer,
-                    bool requestTileUpdate );
+    void paintTile( TextureTile* tile, GeoSceneTexture *textureLayer, bool requestTileUpdate );
 
     /**
      * @brief Update the model
--- trunk/KDE/kdeedu/marble/src/lib/TileLoader.cpp #1080535:1080536
@@ -259,7 +259,7 @@
 
     // TODO should emit signal rather than directly calling paintTile
     // emit paintTile( tile, tilx, tily, tileLevel, d->m_theme, false );
-    m_parent->paintTile( tile, tilx, tily, tileLevel, texture, false );
+    m_parent->paintTile( tile, texture, false );
 
     return tile;
 }
@@ -357,16 +357,13 @@
  
     const TileId id = TileId::fromString( idStr );
     if ( d->m_tilesOnDisplay.contains( id ) ) {
-        int  level = id.zoomLevel();
-        int  y     = id.y();
-        int  x     = id.x();
 
         // TODO should emit signal rather than directly calling paintTile
 //         emit paintTile( d->m_tilesOnDisplay[id], x, y, level, d->m_theme, true );
         GeoSceneTexture * texture = static_cast<GeoSceneTexture *>( d->m_layer->groundDataset() );
 
         d->m_tilesOnDisplay[id]->loadDataset( texture, id, &d->m_tileCache ); 
-        m_parent->paintTile( d->m_tilesOnDisplay[id], x, y, level, texture, true );
+        m_parent->paintTile( d->m_tilesOnDisplay[id], texture, true );
 //         (d->m_tilesOnDisplay[id])->reloadTile( x, y, level, d->m_theme );
     } else {
       // Remove "false" tile from cache so it doesn't get loaded anymore