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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/plugins/render/panoramio
From:       Shashank Singh <shashank.personal () gmail ! com>
Date:       2009-02-16 12:09:03
Message-ID: 1234786143.986019.30351.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 926857 by ssingh:

this code wont execute by default[commneted in CMakeLists.txt] , i am still trying to \
revive this plugin , jsonparser was not executing as it was being derived from
qobject without any moc generation and function a(){} was needed around return value \
fixed those problems ,
but still i don't know why lattitudes are not being hadnled correctly..
this code is still under flux :) i will format it after getting it in
workable condition :)


 M  +5 -5      PanoramioPlugin.cpp  
 M  +18 -5     jsonparser.cpp  
 M  +1 -2      jsonparser.h  


--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/PanoramioPlugin.cpp \
#926856:926857 @@ -107,7 +107,7 @@
 //             qDebug() <<"Shanky: Coordinates are lon-lat: " << \
parsedData[x].longitude << parsedData[x].latitude;  }
     }
-    qDebug() << "deltas" << west - deltaWest << east - deltaEast << south - \
deltaSouth << north - deltaNorth; +    //qDebug() << "deltas" << west - deltaWest << \
east - deltaEast << south - deltaSouth << north - deltaNorth;  
     deltaWest = west;
     deltaEast = east ;
@@ -126,9 +126,9 @@
         parsedData.append(temp);
         if (!m_storagePolicy->fileExists(temp.photo_title)) {
             m_downloadManager->addJob(QUrl(temp.photo_file_url), temp.photo_title, \
                QString::number(x));
-            qDebug() << "skipping " << temp.photo_title;
+      //      qDebug() << "skipping " << temp.photo_title;
         }
-        qDebug() << ":::::::shanky1" << temp.photo_file_url;
+       // qDebug() << ":::::::shanky1" << temp.photo_file_url;
     }
 
 //         HttpJob *job = new HttpJob ( sourceUrl, destFileName, id );
@@ -141,7 +141,7 @@
     //     temp.loadFromData ( m_storagePolicy->data ( id ) );
     tempImage.load(MarbleDirs::localPath() + "/cache/" + relativeUrlString);
     imagesWeHave.append(tempImage.scaled(QSize(50, 50),  Qt::IgnoreAspectRatio , \
                Qt::SmoothTransformation));
-    qDebug() << "::::::::::::::shanky2" << id << "=" << tempImage.isNull() << \
MarbleDirs::localPath() + "/cache/" + relativeUrlString ; +//    qDebug() << \
"::::::::::::::shanky2" << id << "=" << tempImage.isNull() << MarbleDirs::localPath() \
+ "/cache/" + relativeUrlString ;  flag = 1;
 }
 
@@ -155,7 +155,7 @@
                                    + "&maxx=" + QString::number(north * \
RADIANSTODEGREES)  + "&maxy=" + QString::number(south * RADIANSTODEGREES) + \
"&size=medium"), "panoramio" + QString::number(east), "panoramio" + \
                QString::number(east));
     connect(m_downloadManager, SIGNAL(downloadComplete(QString, QString)), this, \
                SLOT(slotJsonDownloadComplete(QString , QString)));
-    qDebug() << "::::::::::::::shanky0";
+//    qDebug() << "::::::::::::::shanky0";
 //         job = new HttpJob ( QUrl ( \
"http://www.panoramio.com/map/get_panoramas.php?from="  //                            \
+ QString::number ( rangeFrom )  //                                    + "&to=" + \
                QString::number ( rangeTo )
--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/jsonparser.cpp \
#926856:926857 @@ -9,6 +9,7 @@
 
 jsonParser::jsonParser()
 {
+   myEngine.setProcessEventsInterval(10);//this lets the gui remain responsive
 }
 
 jsonParser::~jsonParser()
@@ -19,10 +20,17 @@
 {
     QString temp = "var myJSONObject =" + content;
     myEngine.evaluate(temp);
+    myEngine.evaluate(QString("function count(){ return myJSONObject.count };"));
+    myEngine.evaluate(QString("function height(x){return \
myJSONObject.photos[x].height};")); +    myEngine.evaluate(QString("function \
latitude(x){return myJSONObject.photos[x].latitude};")); +    \
myEngine.evaluate(QString("function longitue (x){return \
myJSONObject.photos[x].longitude};")); +   myEngine.evaluate(QString("function \
owner_id(x){return myJSONObject.photos[x].owner_id};")); +   \
myEngine.evaluate(QString("function photo_file_url(x){return \
myJSONObject.photos[x].photo_file_url};"));  
-    dataStorage.count = myEngine.evaluate("return myJSONObject.count;").toInteger();
+	
+     dataStorage.count = myEngine.evaluate("count();").toInteger();
 
-    dataStorage.height = myEngine.evaluate(QString("return myJSONObject.photos[")
+/*    dataStorage.height = myEngine.evaluate(QString("return myJSONObject.photos[")
                                            + QString::number(requiredObjectPosition)
                                            + QString("].height;")) .toInteger();
     dataStorage.latitude = myEngine.evaluate(QString("return myJSONObject.photos[")
@@ -59,13 +67,18 @@
                                            + QString::number(requiredObjectPosition)
                                            + QString("].width;")).toInteger();
 
-
+*/
+	myEngine.evaluate(QString("var x="+QString::number(requiredObjectPosition)));
+	dataStorage.longitude=myEngine.evaluate(QString("longitude(x)")).toNumber();
+	dataStorage.latitude=myEngine.evaluate(QString("latitude(x)")).toNumber();
+	dataStorage.photo_file_url=myEngine.evaluate(QString("photo_file_url(x)")).toString();
 +qDebug()<<":::::::"<<myEngine.evaluate("count()").toString();
     return dataStorage;
 }
 
 QList <panoramioDataStructure> jsonParser::parseAllObjects(const QString &content , \
int numberOfObjects)  {
-    QString temp = "var myJSONObject = " + content;
+    /*QString temp = "var myJSONObject = " + content;
     int iterator = 0;//the count starts fom one
 
     myEngine.evaluate(temp);
@@ -111,6 +124,6 @@
         parsedJsonOutput.insert(iterator , dataStorage);
         ++iterator;
     }
-
+*/
     return parsedJsonOutput;
 }
--- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/jsonparser.h #926856:926857
@@ -43,9 +43,8 @@
     QString owner_url; // Url of the User Uplaoded
 };
 
-class jsonParser : public QObject
+class jsonParser 
 {
-    Q_OBJECT
 public:
     jsonParser();
 


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