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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/plugins/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-07-08 5:45:40
Message-ID: 1215495940.538455.17570.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 829316 by rahn:

- Fixing Panoramio support.

- Disabling the Panoramio support as it currently only shows two pictures 
and as it doesn't update the view. Otherwise it's a nice start already.



 M  +1 -1      CMakeLists.txt  
 M  +8 -10     panoramio/PanoramioPlugin.cpp  
 M  +4 -3      panoramio/PanoramioPlugin.h  


--- trunk/KDE/kdeedu/marble/src/plugins/marble/CMakeLists.txt #829315:829316
@@ -3,6 +3,6 @@
 #add_subdirectory( satellites )
 add_subdirectory( overviewmap )
 add_subdirectory( stars )
-add_subdirectory( panoramio )
+# add_subdirectory( panoramio )
 # add_subdirectory( satellites )
 
--- trunk/KDE/kdeedu/marble/src/plugins/marble/panoramio/PanoramioPlugin.cpp \
#829315:829316 @@ -65,8 +65,8 @@
     flag = 0;
     numberOfImagesToShow = 5;
     m_storagePolicy = new CacheStoragePolicy ( MarbleDirs::localPath() + "/cache/" \
                );
-    m_downloadManager = new HttpDownloadManager ( QUrl ( "htttp://mw2.google.com/" \
                ),m_storagePolicy );
-    downloadPanoramio ( 0,numberOfImagesToShow );
+    m_downloadManager = new HttpDownloadManager ( QUrl ( "htttp://mw2.google.com/" \
), m_storagePolicy ); +    downloadPanoramio ( 0, numberOfImagesToShow );
 
 }
 
@@ -81,9 +81,9 @@
 
     if ( flag == 1 )
     {
-        for ( int x=0; x< imagesWeHave.count();x++ )
+        for ( int x = 0; x < imagesWeHave.count(); ++x )
         {
-            painter->drawPixmap ( GeoDataPoint ( \
parsedData[x].longitude,parsedData[x].latitude,/*2.0,3.0,*/0.0 ), imagesWeHave[x], \
GeoDataPoint::Degree); +            painter->drawPixmap ( GeoDataPoint ( \
parsedData[x].longitude,parsedData[x].latitude, 0.0, GeoDataPoint::Degree ), \
                imagesWeHave[x] );
             qDebug() <<"Shanky=Coordinates arelon_lat" << parsedData[x].longitude << \
parsedData[x].latitude;  }
     }
@@ -92,19 +92,16 @@
 
 void PanoramioPlugin::slotJsonDownloadComplete ( QString relativeUrlString, QString \
id )  {
-    disconnect ( m_downloadManager,SIGNAL ( downloadComplete ( QString, QString ) \
                ),this, SLOT ( slotJsonDownloadComplete ( QString , QString ) ) );
-    connect ( m_downloadManager,SIGNAL ( downloadComplete ( QString, QString ) \
),this, SLOT ( slotImageDownloadComplete ( QString , QString ) ) ); +    disconnect ( \
m_downloadManager,SIGNAL ( downloadComplete ( QString, QString ) ), this, SLOT ( \
slotJsonDownloadComplete ( QString , QString ) ) ); +    connect ( \
m_downloadManager,SIGNAL ( downloadComplete ( QString, QString ) ), this, SLOT ( \
slotImageDownloadComplete ( QString , QString ) ) );  
     for ( int x=0;x<numberOfImagesToShow;x++ )
     {
         temp=panoramioJsonParser.parseObjectOnPosition ( QString::fromUtf8 ( \
m_storagePolicy->data ( id ) ), x );  parsedData.append ( temp );
         m_downloadManager->addJob ( QUrl ( temp.photo_file_url ),temp.photo_title, \
                QString::number ( x ) );
-        qDebug() <<":::::::shanky1"<<temp.photo_file_url;
+        qDebug() <<":::::::shanky1" << temp.photo_file_url;
     }
-
-//     qDebug() <<"::::::::::::::shanky1"<<parsedData.photo_file_url;
-
 }
 
 void PanoramioPlugin::slotImageDownloadComplete ( const QString relativeUrlString, \
const QString id ) @@ -116,6 +113,7 @@
     qDebug() <<"::::::::::::::shanky2"<< id << "=" << tempImage.isNull() << \
MarbleDirs::localPath() + "/cache/"+relativeUrlString ;  flag = 1;
 }
+
 void PanoramioPlugin::downloadPanoramio ( int rangeFrom , int rangeTo )
 {
     m_downloadManager->addJob ( QUrl ( \
"http://www.panoramio.com/map/get_panoramas.php?from="+QString::number(rangeFrom) + \
"&to=" + QString::number(rangeTo) + "&minx=-180&miny=-90&maxx=180&maxy=90" \
                ),"panoramio","panoramio" );
--- trunk/KDE/kdeedu/marble/src/plugins/marble/panoramio/PanoramioPlugin.h \
#829315:829316 @@ -59,18 +59,19 @@
     public slots:
         void slotJsonDownloadComplete ( QString , QString );//completed download of \
                json reply fom panoramio
         void slotImageDownloadComplete ( QString , QString );//completed download of \
image +
     private:
         CacheStoragePolicy *m_storagePolicy;
         HttpDownloadManager *m_downloadManager;
         jsonParser panoramioJsonParser;
         int decimalToSexagecimal();//convert decimal to DMS system
         void downloadPanoramio ( int,int );
-        QList <QPixmap > imagesWeHave;//this list will hold pointers to pixmaps we \
have downlaoded +        QList <QPixmap > imagesWeHave;//this list will hold pointers \
to pixmaps we have downloaded  QList <panoramioDataStructure> parsedData;
         panoramioDataStructure temp;
         QPixmap tempImage;
-        int flag;//this flag is one when globe has a Image  (downloaded or already \
                there in cache)
-        int numberOfImagesToShow;//this factor stires how many are to be downlaoded \
and shown on globe +        int flag;//this flag is one when globe has an Image  \
(downloaded or already there in cache) +        int numberOfImagesToShow;//this \
factor stires how many are to be downloaded and shown on the globe  };
 
 #endif


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