From kde-commits Sun Mar 08 13:55:40 2009 From: Shashank Singh Date: Sun, 08 Mar 2009 13:55:40 +0000 To: kde-commits Subject: KDE/kdeedu/marble/src/plugins/render Message-Id: <1236520540.399766.2309.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=123652054800663 SVN commit 936799 by ssingh: finally i have been able to draw a widget usign marble's geopainter , so now i guess i can try implementing on click feature for this plugin M +5 -5 CMakeLists.txt M +1 -1 fileview/FileViewFloatItem.cpp M +3 -1 panoramio/PanoramioPlugin.cpp M +5 -1 panoramio/PanoramioPlugin.h --- trunk/KDE/kdeedu/marble/src/plugins/render/CMakeLists.txt #936798:936799 @@ -1,18 +1,18 @@ # add_subdirectory( test ) # add_subdirectory( coordinategrid ) -add_subdirectory( crosshairs ) -add_subdirectory( geodata ) +#add_subdirectory( crosshairs ) +#add_subdirectory( geodata ) # add_subdirectory( placemarks ) -add_subdirectory( compass ) +#add_subdirectory( compass ) #add_subdirectory( satellites ) add_subdirectory( overviewmap ) add_subdirectory( mapscale ) add_subdirectory( stars ) -# add_subdirectory( panoramio ) +add_subdirectory( panoramio ) # add_subdirectory ( twitter ) add_subdirectory( navigation ) # add_subdirectory ( FITemplate ) #add_subdirectory( dataview ) -add_subdirectory( fileview ) \ No newline at end of file +add_subdirectory( fileview ) --- trunk/KDE/kdeedu/marble/src/plugins/render/fileview/FileViewFloatItem.cpp #936798:936799 @@ -41,7 +41,7 @@ m_fileView(0), m_persIndex(0) { // Plugin is not enabled by default - setEnabled(false); + setEnabled(true); } FileViewFloatItem::~FileViewFloatItem() --- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/PanoramioPlugin.cpp #936798:936799 @@ -105,6 +105,7 @@ painter->setPen(Qt::white); painter->drawRect(GeoDataCoordinates(parsedData[x].longitude, parsedData[x].latitude, 0.0, GeoDataCoordinates::Degree),/*parsedData[x].height , parsedData[x].width*/50, 50); qDebug() <<"Shanky: Coordinates are lon-lat: " << parsedData[x].longitude << parsedData[x].latitude; + tempLabel.render(painter->device(),QPoint(),QRegion(),QWidget::RenderFlags(QWidget::DrawChildren));//,my attempt at drawing a widget } } //qDebug() << "deltas" << west - deltaWest << east - deltaEast << south - deltaSouth << north - deltaNorth; @@ -139,10 +140,11 @@ void PanoramioPlugin::slotImageDownloadComplete(const QString relativeUrlString, const QString id) { - // temp.loadFromData ( m_storagePolicy->data ( id ) ); tempImage.load(MarbleDirs::localPath() + "/cache/" + relativeUrlString); imagesWeHave.append(tempImage.scaled(QSize(50, 50), Qt::IgnoreAspectRatio , Qt::FastTransformation)); + tempLabel.setPixmap(tempImage); + // images.append(label,Qt::IgnoreAspectRatio,Qt::FastTransformation); qDebug() << "::::::::::::::shanky2" << id << "=" << tempImage.isNull() << MarbleDirs::localPath() + "/cache/" + relativeUrlString ; flag = 1; } --- trunk/KDE/kdeedu/marble/src/plugins/render/panoramio/PanoramioPlugin.h #936798:936799 @@ -22,7 +22,8 @@ // #include "../lib/HttpJob.h" #include "jsonparser.h" #include "MarbleRenderPlugin.h" - +#include +#include namespace Marble { @@ -76,9 +77,12 @@ QList parsedData; panoramioDataStructure temp; QPixmap tempImage; + QLabel tempLabel; int flag;//this flag is one when globe has an Image (downloaded or already there in cache) // HttpJob *job; int numberOfImagesToShow;//this factor stires how many are to be downloaded and shown on the globe + QWidget *parent; + QListimages;//these widgets are supposed to show draw images and take click events }; }