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

[Dennis Nienhüser]

SVN commit 1193902 by nienhueser:

Remove setCelestialBodyId in favor of the existing MarbleModel which provides the same information. Set the model in the bookmark dialog to fix reverse geocoding results appearing for moon or other planets.
CCMAIL: wiedi at frubar.net

 M  +1 -0      BookmarkInfoDialog.cpp  
 M  +3 -8      MarbleRunnerManager.cpp  
 M  +0 -6      MarbleRunnerManager.h  
 M  +1 -4      NavigationWidget.cpp  


--- trunk/KDE/kdeedu/marble/src/lib/BookmarkInfoDialog.cpp #1193901:1193902
@@ -55,6 +55,7 @@
 
     //reverse geocode the bookmark point for better user experience
     m_manager = new MarbleRunnerManager( m_widget->model()->pluginManager(), q );
+    m_manager->setModel( m_widget->model() );
     QObject::connect( m_manager, SIGNAL( reverseGeocodingFinished( GeoDataCoordinates, GeoDataPlacemark ) ),
             q, SLOT( retrieveGeocodeResult( GeoDataCoordinates, GeoDataPlacemark ) ) );
     m_manager->reverseGeocoding( coordinates );
--- trunk/KDE/kdeedu/marble/src/lib/MarbleRunnerManager.cpp #1193901:1193902
@@ -12,7 +12,9 @@
 
 #include "MarblePlacemarkModel.h"
 #include "MarbleDebug.h"
+#include "MarbleModel.h"
 #include "PlacemarkManager.h"
+#include "Planet.h"
 #include "GeoDataPlacemark.h"
 #include "PluginManager.h"
 #include "RunnerPlugin.h"
@@ -42,7 +44,6 @@
     QVector<GeoDataDocument*> m_routingResult;
     QList<GeoDataCoordinates> m_reverseGeocodingResults;
     RouteRequest* m_routeRequest;
-    QString m_celestialBodyId;
     bool m_workOffline;
     PluginManager* m_pluginManager;
 
@@ -57,7 +58,6 @@
         m_model( new MarblePlacemarkModel ),
         m_searchTasks( 0 ),
         m_routeRequest( 0 ),
-        m_celestialBodyId( "earth" ),
         m_workOffline( false ),
         m_pluginManager( pluginManager )
 {
@@ -85,7 +85,7 @@
             continue;
         }
 
-        if ( !plugin->supportsCelestialBody( m_celestialBodyId ) )
+        if ( m_marbleModel && !plugin->supportsCelestialBody( m_marbleModel->planet()->id() ) )
         {
             continue;
         }
@@ -173,11 +173,6 @@
     d->m_marbleModel = model;
 }
 
-void MarbleRunnerManager::setCelestialBodyId( const QString &celestialBodyId )
-{
-    d->m_celestialBodyId = celestialBodyId;
-}
-
 void MarbleRunnerManager::setWorkOffline( bool offline )
 {
     d->m_workOffline = offline;
--- trunk/KDE/kdeedu/marble/src/lib/MarbleRunnerManager.h #1193901:1193902
@@ -45,12 +45,6 @@
     ~MarbleRunnerManager();
 
     /**
-      * Set the currently used planet used to decide whether MarbleAbstractRunner instances
-      * can be run or not
-      */
-    void setCelestialBodyId(const QString &celestialBodyId);
-
-    /**
       * Set a pointer to the map instance to be passed to MarbleAbstractRunner instances
       */
     void setModel( MarbleModel * model );
--- trunk/KDE/kdeedu/marble/src/lib/NavigationWidget.cpp #1193901:1193902
@@ -1,4 +1,4 @@
-//
+///
 // This file is part of the Marble Desktop Globe.
 //
 // This program is free software licensed under the GNU LGPL. You can
@@ -206,9 +206,6 @@
 
     d->m_navigationUi.zoomSlider->setMaximum( d->m_widget->maximumZoom() );
     updateButtons( d->m_navigationUi.zoomSlider->value() );
-
-    QString selectedId = d->m_widget->mapTheme()->head()->target();
-    d->m_runnerManager->setCelestialBodyId( selectedId );
 }
 
 void NavigationWidget::updateButtons( int value )