[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3799: Update to Marble 0.7.1 (r938110). (in marble/trunk: data/maps/earth/bluemarble data/maps/earth/citylights data/maps/earth/plain data/maps/earth/precip-dec data/maps/earth/precip-july data/maps/earth/srtm data/maps/earth/temp-dec data/maps/earth/temp-july data/placemarks src src/lib src/lib/geodata/data src/plasmoid src/plugins/render/fileview src/plugins/render/navigation src/plugins/render/panoramio)
Author: edmanm
Date: 2009-05-29 18:27:23 -0400 (Fri, 29 May 2009)
New Revision: 3799
Added:
marble/trunk/src/lib/Planet.cpp
marble/trunk/src/lib/Planet.h
Modified:
marble/trunk/data/maps/earth/bluemarble/bluemarble.dgml
marble/trunk/data/maps/earth/citylights/citylights.dgml
marble/trunk/data/maps/earth/plain/plain.dgml
marble/trunk/data/maps/earth/precip-dec/precip-dec.dgml
marble/trunk/data/maps/earth/precip-july/precip-july.dgml
marble/trunk/data/maps/earth/srtm/srtm.dgml
marble/trunk/data/maps/earth/temp-dec/temp-dec.dgml
marble/trunk/data/maps/earth/temp-july/temp-july.dgml
marble/trunk/data/placemarks/otherplacemarks.cache
marble/trunk/data/placemarks/otherplacemarks.kml
marble/trunk/src/kdemain.cpp
marble/trunk/src/lib/CMakeLists.txt
marble/trunk/src/lib/MarbleCacheSettingsWidget.ui
marble/trunk/src/lib/MarbleControlBox.ui
marble/trunk/src/lib/MarbleMap.cpp
marble/trunk/src/lib/MarbleModel.cpp
marble/trunk/src/lib/MarbleNavigator.ui
marble/trunk/src/lib/MarblePlacemarkModel.cpp
marble/trunk/src/lib/MarbleWidget.cpp
marble/trunk/src/lib/PlaceMarkInfoDialog.cpp
marble/trunk/src/lib/PlaceMarkInfoDialog.ui
marble/trunk/src/lib/PlaceMarkLayout.cpp
marble/trunk/src/lib/geodata/data/GeoDataFeature.cpp
marble/trunk/src/lib/geodata/data/GeoDataFeature.h
marble/trunk/src/marble.desktop
marble/trunk/src/marble_part.desktop
marble/trunk/src/plasmoid/plasma-applet-kworldclock.desktop
marble/trunk/src/plugins/render/fileview/FileViewFloatItem.cpp
marble/trunk/src/plugins/render/navigation/navigation.ui
marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.cpp
marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.h
marble/trunk/src/plugins/render/panoramio/jsonparser.cpp
Log:
Update to Marble 0.7.1 (r938110).
Modified: marble/trunk/data/maps/earth/bluemarble/bluemarble.dgml
===================================================================
--- marble/trunk/data/maps/earth/bluemarble/bluemarble.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/bluemarble/bluemarble.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -78,6 +78,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -206,6 +210,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="surface" checkable="false" spacing="12">
Modified: marble/trunk/data/maps/earth/citylights/citylights.dgml
===================================================================
--- marble/trunk/data/maps/earth/citylights/citylights.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/citylights/citylights.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -74,6 +74,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -198,6 +202,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="surface" checkable="false" spacing="12">
Modified: marble/trunk/data/maps/earth/plain/plain.dgml
===================================================================
--- marble/trunk/data/maps/earth/plain/plain.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/plain/plain.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -73,6 +73,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -187,6 +191,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/maps/earth/precip-dec/precip-dec.dgml
===================================================================
--- marble/trunk/data/maps/earth/precip-dec/precip-dec.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/precip-dec/precip-dec.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -89,6 +89,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -217,6 +221,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/maps/earth/precip-july/precip-july.dgml
===================================================================
--- marble/trunk/data/maps/earth/precip-july/precip-july.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/precip-july/precip-july.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -89,6 +89,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -217,6 +221,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/maps/earth/srtm/srtm.dgml
===================================================================
--- marble/trunk/data/maps/earth/srtm/srtm.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/srtm/srtm.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -107,6 +107,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -231,6 +235,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/maps/earth/temp-dec/temp-dec.dgml
===================================================================
--- marble/trunk/data/maps/earth/temp-dec/temp-dec.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/temp-dec/temp-dec.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -89,6 +89,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -217,6 +221,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/maps/earth/temp-july/temp-july.dgml
===================================================================
--- marble/trunk/data/maps/earth/temp-july/temp-july.dgml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/maps/earth/temp-july/temp-july.dgml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -89,6 +89,10 @@
<sourcefile format="KML">elevplacemarks.kml</sourcefile>
<pick>placemark</pick>
</geodata>
+ <geodata name="observatoryplacemarks">
+ <sourcefile format="KML">observatoryplacemarks.kml</sourcefile>
+ <pick>placemark</pick>
+ </geodata>
<geodata name="otherplacemarks">
<sourcefile
format="KML">otherplacemarks.kml</sourcefile>
@@ -217,6 +221,9 @@
<icon pixmap="bitmaps/shipwreck.png"/>
<text>Shipwreck</text>
</item>
+ <item name="observatory">
+ <text>Astronomical Observatory</text>
+ </item>
</section>
<section name="borders" checkable="true" connect="borders" spacing="12">
Modified: marble/trunk/data/placemarks/otherplacemarks.cache
===================================================================
(Binary files differ)
Modified: marble/trunk/data/placemarks/otherplacemarks.kml
===================================================================
--- marble/trunk/data/placemarks/otherplacemarks.kml 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/data/placemarks/otherplacemarks.kml 2009-05-29 22:27:23 UTC (rev 3799)
@@ -13,6 +13,375 @@
<Point>
<coordinates>-49.947,41.725,-3925.0</coordinates>
</Point>
- </Placemark>
+ </Placemark>
+ <Placemark>
+ <name>Allegheny Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-80.0205555556,40.4833333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Amherst Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-72.3455555556,42.3847222222</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Arecibo Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-66.7541666667,18.3355555556</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Big Bear Solar Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-116.916666667,34.2505555556</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Cerro Tololo Int'l Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-70.8166666667,-30.1666666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Dearborn Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-87.6705555556,42.0516666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Dwingeloo Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>6.39555555556,52.8022222222</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Dyer Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-86.7916666667,36.0505555556</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Fred Lawrence Whipple Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-110.883888889,31.6886111111</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Fremont Peak Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-121.498611111,36.7602777778</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Green Bank Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-79.8416666667,38.4188888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Harvard Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-71.1205555556,42.3669444444</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Hat Creek Radio Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-121.475,40.8169444444</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Haystack Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-71.4875,42.6177777778</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Kitt Peak Nat'l. Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-111.595555556,31.7013888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>La Palma Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-17.8825,28.7602777778</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>La Silla Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-70.7291666667,-29.2511111111</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Las Campanas Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-70.7,-29.0013888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Lick Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-121.6375,37.335</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Lowell Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-111.6625,35.2002777778</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mauna Kea Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-155.470555556,19.8186111111</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>McCormick Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-78.525,38.0333333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>McDonald Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-104.029166667,30.6675</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Meudon Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>2.23305555556,48.8008333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mount Evans Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-105.641666667,39.5838888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mount Graham Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-109.891388889,32.7016666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mount Lemmon Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-110.791666667,32.4347222222</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mount Palomar Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-116.8625,33.3511111111</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Mount Wilson Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-118.0625,34.2166666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatoire de Nançay</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>2.23305555556,47.3688888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Nassau Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-81.075,41.5847222222</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>North Liberty Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-91.575,41.7675</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Oak Ridge Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-71.5580555556,42.5008333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatorio Astronómico de Madrid</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-3.6875,40.4013888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Osservatorio di Milano</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>9.42916666667,45.7</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatoire de Haute Provence</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>5.7125,43.9191666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Owens Valley Radio Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-118.283055556,37.2191666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Perkins Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-83.0541666667,40.2502777778</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatoire du Pic du Midi</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>0.145555555556,42.9338888889</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatoire du Plateau de Bure</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>5.90805555556,44.6333333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Observatoire du Plateau de Calern</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>6.925,43.7358333333</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Princeton Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-74.65,40.3355555556</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>US Naval Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-77.0666666667,38.9175</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Wilcox Solar Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-122.166666667,37.4016666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Yale Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-72.8125,41.3166666667</coordinates>
+ </Point>
+ </Placemark>
+ <Placemark>
+ <name>Yerkes Observatory</name>
+ <role>A</role>
+ <pop>100000</pop>
+ <Point>
+ <coordinates>-88.5580555556,42.5672222222</coordinates>
+ </Point>
+ </Placemark>
+
</Document>
</kml>
Modified: marble/trunk/src/kdemain.cpp
===================================================================
--- marble/trunk/src/kdemain.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/kdemain.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -7,6 +7,7 @@
//
// Copyright 2007 Torsten Rahn <tackat@xxxxxxx>"
// Copyright 2007 Inge Wallin <ingwa@xxxxxxx>"
+// Copyright 2009 Jens-Michael Hoffmann <jensmh@xxxxxx>
//
#include <KApplication>
@@ -38,13 +39,143 @@
KAboutData::License_LGPL, ki18n( "(c) 2007, 2008, 2009" ),
KLocalizedString(),
"http://edu.kde.org/marble"; );
+
+ // Active Development Team of Marble 0.7
aboutData.addAuthor( ki18n( "Torsten Rahn" ),
- ki18n( "Original Author, Developer and Maintainer" ),
+ ki18n( "Core Developer and Original Author" ),
"rahn@xxxxxxx" );
+ aboutData.addAuthor( ki18n( "Patrick Spendrin" ),
+ ki18n( "Core Developer: KML and Windows support" ),
+ "pspendrin@xxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Henry de Valence" ),
+ ki18n( "Core Developer: Marble Runners, World-Clock Plasmoid" ),
+ "hdevalence@xxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Pino Toscano" ),
+ ki18n( "Network plugins" ),
+ "pino@xxxxxxx" );
+ aboutData.addAuthor( ki18n( "Simon Edwards" ),
+ ki18n( "Marble Python Bindings" ),
+ "simon@xxxxxxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Dennis Nienhüser" ),
+ ki18n( "Navigator Float Item" ),
+ "earthwings@xxxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Jens-Michael Hoffmann" ),
+ ki18n( "OpenStreetMap Integration, OSM Namefinder" ),
+ "jensmh@xxxxxx" );
+ aboutData.addAuthor( ki18n( "Magnus Valle" ),
+ ki18n( "Historical Maps" ),
+ "" );
+ aboutData.addAuthor( ki18n( "Eckhart Wörner" ),
+ ki18n( "Bugfixes" ),
+ "kde@xxxxxxxxxxxxx" );
+
+ // Google Summer of Code
+ aboutData.addAuthor( ki18n( "Patrick Spendrin" ),
+ ki18n( "Google Summer of Code 2008 Project:"
+ " Vector Tiles for Marble" ),
+ "pspendrin@xxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Shashank Singh" ),
+ ki18n( "Google Summer of Code 2008 Project:"
+ " Panoramio / Wikipedia -photo support for Marble" ),
+ "shashank.personal@xxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Carlos Licea" ),
+ ki18n( "Google Summer of Code 2007 Project:"
+ " Equirectangular Projection (\"Flat Map\")" ),
+ "carlos.licea@xxxxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Andrew Manson" ),
+ ki18n( "Google Summer of Code 2007 Project:"
+ " GPS Support for Marble" ),
+ "g.real.ate@xxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Murad Tagirov" ),
+ ki18n( "Google Summer of Code 2007 Project:"
+ " KML Support for Marble" ),
+ "tmurad@xxxxxxxxx" );
+
+ // Developers
aboutData.addAuthor( ki18n( "Inge Wallin" ),
- ki18n( "Co-maintainer and Architect" ),
+ ki18n( "Core Developer and Co-Maintainer" ),
"inge@xxxxxxxxxxxxxx" );
+ aboutData.addAuthor( ki18n( "Simon Schmeisser" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Claudiu Covaci" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "David Roberts" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Nikolas Zimmermann" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Jan Becker" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Stefan Asserhäll" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Laurent Montel" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Prashanth Udupa" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Anne-Marie Mahfouf" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Josef Spillner" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Frerich Raabe" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Frederik Gladhorn" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Fredrik Höglund" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Albert Astals Cid" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Thomas Zander" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Joseph Wenninger" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Kris Thomsen" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Daniel Molkentin" ),
+ ki18n( "Development & Patches" ));
+ aboutData.addAuthor( ki18n( "Tim Sutton" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Christian Ehrlicher" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Ralf Habacker" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Steffen Joeris" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Marcus Czeslinski" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Marcus D. Hanwell" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Chitlesh Goorah" ),
+ ki18n( "Platforms & Distributions" ));
+ aboutData.addAuthor( ki18n( "Nuno Pinheiro" ),
+ ki18n( "Artwork" ));
+ aboutData.addAuthor( ki18n( "Torsten Rahn" ),
+ ki18n( "Artwork" ));
+ // Credits
+ aboutData.addCredit( ki18n( "Stefan Jordan" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Robert Scott" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Lubos Petrovic" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Benoit Sigoure" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Martin Konold" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Matthias Welwarsky" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Rainer Endres" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Luis Silva" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Ralf Gesellensetter" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "Tim Alder" ),
+ ki18n( "Various Suggestions & Testing" ));
+ aboutData.addCredit( ki18n( "John Layt" ),
+ ki18n( "Special thanks for providing an"
+ " important source of inspiration by creating"
+ " Marble's predecessor \"Kartographer\"." ));
+
KCmdLineArgs::init( argc, argv, &aboutData );
@@ -53,7 +184,7 @@
options.add( "gpsdemo", ki18n( "Check speed of gps drawing" ) );
options.add( "fps", ki18n( "Show frame rate" ) );
options.add( "enableCurrentLocation", ki18n( "Enable tab to show the current location" ) );
- options.add( "enableFileView",
+ options.add( "enableFileView",
ki18n( "Enable tab to see gpxFileView") );
KCmdLineArgs::addCmdLineOptions( options );
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
Modified: marble/trunk/src/lib/CMakeLists.txt
===================================================================
--- marble/trunk/src/lib/CMakeLists.txt 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/CMakeLists.txt 2009-05-29 22:27:23 UTC (rev 3799)
@@ -107,6 +107,7 @@
PlaceMarkLoader.cpp
PlaceMarkPainter.cpp
PlaceMarkInfoDialog.cpp
+ Planet.cpp
Quaternion.cpp
TextureColorizer.cpp
AbstractScanlineTextureMapper.cpp
@@ -315,6 +316,7 @@
MarbleRenderPlugin.h
MarbleRenderPluginInterface.h
marble_export.h
+ Planet.h
LatLonEdit.h
BoundingBox.h
Modified: marble/trunk/src/lib/MarbleCacheSettingsWidget.ui
===================================================================
--- marble/trunk/src/lib/MarbleCacheSettingsWidget.ui 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleCacheSettingsWidget.ui 2009-05-29 22:27:23 UTC (rev 3799)
@@ -16,7 +16,7 @@
<string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There are two caches being used for Marble: The physical memory which is needed to keep map data in the computer's memory. Increasing the value will make the application more responsive. The hard disc memory cache is used by download contents from the internet (e.g. Wikipedia data or map data). Decrease this value if you want to save space on the hard disc and if high usage of the internet is not an issue. </p></body></html></string>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">There are two caches being used for Marble: The physical memory which is needed to keep map data in the computer's memory. Increasing the value will make the application more responsive. The hard disc memory cache is used by download contents from the Internet (e.g. Wikipedia data or map data). Decrease this value if you want to save space on the hard disc and if high usage of the Internet is not an issue. </p></body></html></string>
</property>
<property name="title" >
<string>C&ache</string>
Modified: marble/trunk/src/lib/MarbleControlBox.ui
===================================================================
--- marble/trunk/src/lib/MarbleControlBox.ui 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleControlBox.ui 2009-05-29 22:27:23 UTC (rev 3799)
@@ -209,7 +209,7 @@
<string>Zoom Out</string>
</property>
<property name="whatsThis" >
- <string>Zoom out by pressing this button to see less details.</string>
+ <string>Zoom out by pressing this button to see less detail.</string>
</property>
<property name="text" >
<string>...</string>
@@ -323,7 +323,7 @@
<string>Zoom In</string>
</property>
<property name="whatsThis" >
- <string>Zoom in by pressing this button to see more details.</string>
+ <string>Zoom in by pressing this button to see more detail.</string>
</property>
<property name="text" >
<string>...</string>
Modified: marble/trunk/src/lib/MarbleMap.cpp
===================================================================
--- marble/trunk/src/lib/MarbleMap.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleMap.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -356,7 +356,7 @@
{
#ifdef MARBLE_DBUS
QDBusConnection::sessionBus().registerObject("/MarbleMap", this,
- QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals );
+ QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAllProperties);
#endif
QTime t;
t.start();
Modified: marble/trunk/src/lib/MarbleModel.cpp
===================================================================
--- marble/trunk/src/lib/MarbleModel.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleModel.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -62,6 +62,7 @@
#include "PlaceMarkManager.h"
#include "PlaceMarkLayout.h"
#include "PlaceMarkPainter.h"
+#include "Planet.h"
#include "StoragePolicy.h"
#include "SunLocator.h"
#include "TextureColorizer.h"
@@ -826,39 +827,9 @@
{
if ( d->m_mapTheme ) {
QString target = d->m_mapTheme->head()->target().toLower();
-
- // I'd like to be able to use strings in switch statements ...
-
- // Make sure to use the radius, not the diameter!
-
- // planets
- if ( target == "mercury" ) {
- return 2440000.0;
- } else if ( target == "venus" ) {
- return 6051800.0;
- } else if ( target == "earth" ) {
- return 6378000.0;
- } else if ( target == "mars" ) {
- return 3397000.0;
- } else if ( target == "jupiter" ) {
- return 71492000.0;
- } else if ( target == "saturn" ) {
- return 60268000.0;
- } else if ( target == "uranus" ) {
- return 25559000.0;
- } else if ( target == "neptune" ) {
- return 24766000.0;
-
- // dwarf planets ... (everybody likes pluto)
- } else if ( target == "pluto" ) {
- return 1151000.0;
-
- // sun and moon
- } else if ( target == "sun" ) {
- return 695000000.0;
- } else if ( target == "moon" ) {
- return 1738000.0;
- }
+ const Planet *p = Planet::planetByName( target );
+ if( p )
+ return p->radius();
}
// Fallback to assuming that we deal with the earth
@@ -869,35 +840,10 @@
{
if ( d->m_mapTheme ) {
QString target = d->m_mapTheme->head()->target().toLower();
+ const Planet *p = Planet::planetByName( target );
+ if( p )
+ return p->name();
- // planets
- if ( target == "mercury" ) {
- return QString("Mercury");
- } else if ( target == "venus" ) {
- return QString("Venus");
- } else if ( target == "earth" ) {
- return QString("Earth");
- } else if ( target == "mars" ) {
- return QString("Mars");
- } else if ( target == "jupiter" ) {
- return QString("Jupiter");
- } else if ( target == "saturn" ) {
- return QString("Saturn");
- } else if ( target == "uranus" ) {
- return QString("Uranus");
- } else if ( target == "neptune" ) {
- return QString("Neptune");
-
- // dwarf planets ... (everybody likes pluto)
- } else if ( target == "pluto" ) {
- return QString("Pluto");
-
- // sun and moon
- } else if ( target == "sun" ) {
- return QString("Sun");
- } else if ( target == "moon" ) {
- return QString("Moon");
- }
}
// Fallback to assuming that we deal with the earth
Modified: marble/trunk/src/lib/MarbleNavigator.ui
===================================================================
--- marble/trunk/src/lib/MarbleNavigator.ui 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleNavigator.ui 2009-05-29 22:27:23 UTC (rev 3799)
@@ -151,7 +151,7 @@
<string>Zoom In</string>
</property>
<property name="whatsThis" >
- <string>Zoom in by pressing this button to see more details.</string>
+ <string>Zoom in by pressing this button to see more detail.</string>
</property>
<property name="text" >
<string>...</string>
@@ -209,7 +209,7 @@
<string>Zoom Out</string>
</property>
<property name="whatsThis" >
- <string>Zoom out by pressing this button to see less details.</string>
+ <string>Zoom out by pressing this button to see less detail.</string>
</property>
<property name="text" >
<string>...</string>
Modified: marble/trunk/src/lib/MarblePlacemarkModel.cpp
===================================================================
--- marble/trunk/src/lib/MarblePlacemarkModel.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarblePlacemarkModel.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -399,6 +399,7 @@
else if ( placemark->role() == 'M' ) placemark->setVisualCategory( GeoDataPlacemark::MagneticPole );
else if ( placemark->role() == 'W' ) placemark->setVisualCategory( GeoDataPlacemark::ShipWreck );
else if ( placemark->role() == 'F' ) placemark->setVisualCategory( GeoDataPlacemark::AirPort );
+ else if ( placemark->role() == 'A' ) placemark->setVisualCategory( GeoDataPlacemark::Observatory );
else if ( placemark->role() == 'K' ) placemark->setVisualCategory( GeoDataPlacemark::Continent );
else if ( placemark->role() == 'O' ) placemark->setVisualCategory( GeoDataPlacemark::Ocean );
else if ( placemark->role() == 'S' ) placemark->setVisualCategory( GeoDataPlacemark::Nation );
Modified: marble/trunk/src/lib/MarbleWidget.cpp
===================================================================
--- marble/trunk/src/lib/MarbleWidget.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/MarbleWidget.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -118,7 +118,7 @@
{
#ifdef MARBLE_DBUS
QDBusConnection::sessionBus().registerObject("/MarbleWidget", this,
- QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals );
+ QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAllProperties);
#endif
d->construct();
Modified: marble/trunk/src/lib/PlaceMarkInfoDialog.cpp
===================================================================
--- marble/trunk/src/lib/PlaceMarkInfoDialog.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/PlaceMarkInfoDialog.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -105,6 +105,9 @@
case 'K':
rolestring = tr("Continent");
break;
+ case 'A':
+ rolestring = tr("Astronomical observatory");
+ break;
default:
rolestring = tr("Other Place");
}
Modified: marble/trunk/src/lib/PlaceMarkInfoDialog.ui
===================================================================
--- marble/trunk/src/lib/PlaceMarkInfoDialog.ui 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/PlaceMarkInfoDialog.ui 2009-05-29 22:27:23 UTC (rev 3799)
@@ -173,7 +173,7 @@
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">No description available.</p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">If you are connected to the internet please click the "Wikipedia" tab at the top of this page to get more information.</p></body></html></string>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;">If you are connected to the Internet please click the "Wikipedia" tab at the top of this page to get more information.</p></body></html></string>
</property>
</widget>
</item>
Modified: marble/trunk/src/lib/PlaceMarkLayout.cpp
===================================================================
--- marble/trunk/src/lib/PlaceMarkLayout.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/PlaceMarkLayout.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -374,7 +374,7 @@
// Skip other places if we're not showing other places.
if ( !showOtherPlaces
&& ( visualCategory >= (int)(GeoDataFeature::GeographicPole) )
- && visualCategory <= (int)(GeoDataFeature::AirPort) )
+ && visualCategory <= (int)(GeoDataFeature::Observatory) )
continue;
// Skip landing sites if we're not showing landing sites.
Added: marble/trunk/src/lib/Planet.cpp
===================================================================
--- marble/trunk/src/lib/Planet.cpp (rev 0)
+++ marble/trunk/src/lib/Planet.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -0,0 +1,394 @@
+//Copyright 2009 Henry de Valence <hdevalence@xxxxxxxxx>
+//Copyright 2009 David Roberts <dvdr18@xxxxxxxxx>
+//
+// This file is part of the Marble Desktop Globe.
+//
+// This program is free software licensed under the GNU LGPL. You can
+// find a copy of this license in LICENSE.txt in the top directory of
+// the source code.
+//
+#include "Planet.h"
+
+#include <QtCore/QString>
+#include <QtCore/QHash>
+#include <QtCore/QObject>
+#include <QtCore/QDebug>
+
+#include "global.h"
+
+namespace Marble {
+
+class PlanetPrivate
+{
+public:
+ qreal M_0, M_1; // for calculating mean anomaly
+ qreal C_1, C_2, C_3, C_4, C_5, C_6; // for calculating equation of center
+ qreal Pi; // ecliptic longitude of the perihelion
+ qreal epsilon; // obliquity of the ecliptic plane
+ qreal theta_0, theta_1; // for calculating sidereal time
+ qreal radius; //in metres
+ QString name, target; //localized and nonlocalized names
+};
+
+
+//Constructor
+Planet::Planet(qreal M_0, qreal M_1, qreal C_1, qreal C_2, qreal C_3, qreal C_4,
+ qreal C_5, qreal C_6, qreal Pi, qreal epsilon, qreal theta_0,
+ qreal theta_1, qreal radius, const QString& name,
+ const QString& target )
+{
+ d = new PlanetPrivate;
+ d->M_0 = M_0;
+ d->M_1 = M_1;
+ d->C_1 = C_1;
+ d->C_2 = C_2;
+ d->C_3 = C_3;
+ d->C_4 = C_4;
+ d->C_5 = C_5;
+ d->C_6 = C_6;
+ d->Pi = Pi;
+ d->epsilon = epsilon;
+ d->theta_0 = theta_0;
+ d->theta_1 = theta_1;
+ d->radius = radius;
+ d->name = name;
+ d->target = target;
+}
+
+//Copy Constructor
+Planet::Planet( const Planet& other )
+{
+ d = new PlanetPrivate;
+ d->M_0 = other.M_0();
+ d->M_1 = other.M_1();
+ d->C_1 = other.C_1();
+ d->C_2 = other.C_2();
+ d->C_3 = other.C_3();
+ d->C_4 = other.C_4();
+ d->C_5 = other.C_5();
+ d->C_6 = other.C_6();
+ d->Pi = other.Pi();
+ d->epsilon = other.epsilon();
+ d->theta_0 = other.theta_0();
+ d->theta_1 = other.theta_1();
+ d->radius = other.radius();
+ d->name = other.name();
+ d->target = other.target();
+}
+//Destructor
+Planet::~Planet()
+{
+ delete d;
+}
+
+
+ /* Getter functions */
+ // for calculating mean anomaly
+qreal Planet::M_0() const
+{
+ return d->M_0;
+}
+qreal Planet::M_1() const
+{
+ return d->M_1;
+}
+
+ // for calculating equation of center
+qreal Planet::C_1() const
+{
+ return d->C_1;
+}
+qreal Planet::C_2() const
+{
+ return d->C_2;
+}
+qreal Planet::C_3() const
+{
+ return d->C_3;
+}
+qreal Planet::C_4() const
+{
+ return d->C_4;
+}
+qreal Planet::C_5() const
+{
+ return d->C_5;
+}
+qreal Planet::C_6() const
+{
+ return d->C_6;
+}
+
+ // ecliptic longitude of the perihelion
+qreal Planet::Pi() const
+{
+ return d->Pi;
+}
+
+ // obliquity of the ecliptic plane
+qreal Planet::epsilon() const
+{
+ return d->epsilon;
+}
+
+ // for calculating sidereal time
+qreal Planet::theta_0() const
+{
+ return d->theta_0;
+}
+qreal Planet::theta_1() const
+{
+ return d->theta_1;
+}
+
+ // the radius of the planet, in metres
+qreal Planet::radius() const
+{
+ return d->radius;
+}
+
+QString Planet::name() const
+{
+ return d->name;
+}
+
+QString Planet::target() const
+{
+ return d->target;
+}
+
+
+ /* Setter functions */
+void Planet::setM_0( qreal M_0 )
+{
+ d->M_0 = M_0;
+}
+void Planet::setM_1( qreal M_1 )
+{
+ d->M_1 = M_1;
+}
+
+void Planet::setC_1( qreal C_1 )
+{
+ d->C_1 = C_1;
+}
+void Planet::setC_2( qreal C_2 )
+{
+ d->C_2 = C_2;
+}
+void Planet::setC_3( qreal C_3 )
+{
+ d->C_3 = C_3;
+}
+void Planet::setC_4( qreal C_4 )
+{
+ d->C_4 = C_4;
+}
+void Planet::setC_5( qreal C_5 )
+{
+ d->C_5 = C_5;
+}
+void Planet::setC_6( qreal C_6 )
+{
+ d->C_6 = C_6;
+}
+
+void Planet::setPi( qreal Pi )
+{
+ d->Pi = Pi;
+}
+
+void Planet::setEpsilon( qreal epsilon )
+{
+ d->epsilon = epsilon;
+}
+
+void Planet::setTheta_0( qreal theta_0 )
+{
+ d->theta_0 = theta_0;
+}
+void Planet::setTheta_1( qreal theta_1 )
+{
+ d->theta_1 = theta_1;
+}
+
+void Planet::setRadius( qreal radius )
+{
+ d->radius = radius;
+}
+
+void Planet::setName( const QString& name )
+{
+ d->name = name;
+}
+
+void Planet::setTarget( const QString& target )
+{
+ d->target = target;
+}
+
+
+void Planet::operator=(const Planet& other)
+{
+ d->M_0 = other.M_0();
+ d->M_1 = other.M_1();
+ d->C_1 = other.C_1();
+ d->C_2 = other.C_2();
+ d->C_3 = other.C_3();
+ d->C_4 = other.C_4();
+ d->C_5 = other.C_5();
+ d->C_6 = other.C_6();
+ d->Pi = other.Pi();
+ d->epsilon = other.epsilon();
+ d->theta_0 = other.theta_0();
+ d->theta_1 = other.theta_1();
+ d->radius = other.radius();
+ d->name = other.name();
+ d->target = other.target();
+}
+
+//Planet Creation stuff:
+
+QHash<QString,Planet*> *existingPlanets = 0;
+
+const Planet* Planet::addPlanet(Planet *planet, const QString& target,
+ bool overwrite)
+{
+ //Check if the planet registry exists
+ if( !existingPlanets )
+ existingPlanets = new QHash<QString,Planet*>();
+
+ //If we're not to overwrite an existing planet and there is one, fail.
+ bool exists = existingPlanets->contains( target );
+ if( exists && !overwrite )
+ return 0;
+
+ if( !exists ) {
+ //We make a copy to protect against e.g. the original one going out of
+ //scope or some other unexpected circumstance.
+ Planet *newplanet = new Planet( *planet );
+ existingPlanets->insert( target, newplanet );
+ //Return a pointer to the new planet.
+ return newplanet;
+ } else {
+ //Doing it this way means everything still using the existing pointer
+ //gets the new value.
+ Planet *oldplanet = existingPlanets->value( target );
+ *oldplanet = *planet;
+ //Return a pointer to the old planet with new values.
+ return oldplanet;
+ }
+
+}
+
+const Planet* Planet::planetByName( const QString& target )
+{
+ //qDebug() << "Slartibartfast making planet" << target;
+ //Check if the planet registry exists
+ if( !existingPlanets )
+ existingPlanets = new QHash<QString,Planet*>();
+
+ //If there's no existing planet, return a null pointer
+ Planet *p = existingPlanets->value( target, 0 );
+ if( p ) {
+ //Success, we have this planet already made!
+ //qDebug() << "Planet already exists!";
+ return p;
+ } else {
+ //qDebug() << "Manufacturing custom planet";
+ // constants taken from
+ // http://www.astro.uu.nl/~strous/AA/en/reken/zonpositie.html
+ if ( target == "mercury" ) {
+ p = new Planet( (174.7948*DEG2RAD), (4.09233445*DEG2RAD),
+ (23.4400*DEG2RAD), (2.9818*DEG2RAD), (0.5255*DEG2RAD),
+ (0.1058*DEG2RAD), (0.0241*DEG2RAD), (0.0055*DEG2RAD),
+ (111.5943*DEG2RAD), (0.02*DEG2RAD), (13.5964*DEG2RAD),
+ (6.1385025*DEG2RAD), 2440000.0,
+ QObject::tr("Mercury", "the planet"), QString("mercury") );
+ } else if ( target == "venus" ) {
+ p = new Planet( (50.4161*DEG2RAD), (1.60213034*DEG2RAD),
+ (0.7758*DEG2RAD), (0.0033*DEG2RAD), (0.0000*DEG2RAD),
+ (0.0000*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (73.9519*DEG2RAD), (2.64*DEG2RAD), (215.2995*DEG2RAD),
+ (-1.4813688*DEG2RAD), 6051800.0,
+ QObject::tr("Venus", "the planet"), QString("venus") );
+ } else if ( target == "earth" ) {
+ p = new Planet( (357.5291*DEG2RAD), (0.98560028*DEG2RAD),
+ (1.9148*DEG2RAD), (0.0200*DEG2RAD), (0.0003*DEG2RAD),
+ (0.0000*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (102.9372*DEG2RAD), (23.45*DEG2RAD), (280.1600*DEG2RAD),
+ (360.9856235*DEG2RAD), 6378000.0,
+ QObject::tr("Earth", "the planet"), QString("earth") );
+ } else if ( target == "mars" ) {
+ p = new Planet( (19.3730*DEG2RAD), (0.52402068*DEG2RAD),
+ (10.6912*DEG2RAD), (0.6228*DEG2RAD), (0.0503*DEG2RAD),
+ (0.0046*DEG2RAD), (0.0005*DEG2RAD), (0.0000*DEG2RAD),
+ (70.9812*DEG2RAD), (25.19*DEG2RAD), (313.4803*DEG2RAD),
+ (350.89198226*DEG2RAD), 3397000.0,
+ QObject::tr("Mars", "the planet"), QString("mars") );
+ } else if ( target == "jupiter" ) {
+ p = new Planet( (20.0202*DEG2RAD), (0.08308529*DEG2RAD),
+ (5.5549*DEG2RAD), (0.1683*DEG2RAD), (0.0071*DEG2RAD),
+ (0.0003*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (237.2074*DEG2RAD), (3.12*DEG2RAD), (146.0727*DEG2RAD),
+ (870.5366420*DEG2RAD), 71492000.0,
+ QObject::tr("Jupiter", "the planet"), QString("jupiter") );
+ } else if ( target == "saturn" ) {
+ p = new Planet( (317.0207*DEG2RAD), (0.03344414*DEG2RAD),
+ (6.3585*DEG2RAD), (0.2204*DEG2RAD), (0.0106*DEG2RAD),
+ (0.0006*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (99.4571*DEG2RAD), (26.74*DEG2RAD), (174.3479*DEG2RAD),
+ (810.7939024*DEG2RAD), 60268000.0,
+ QObject::tr("Saturn", "the planet"), QString("saturn") );
+ } else if ( target == "uranus" ) {
+ p = new Planet( (141.0498*DEG2RAD), (0.01172834*DEG2RAD),
+ (5.3042*DEG2RAD), (0.1534*DEG2RAD), (0.0062*DEG2RAD),
+ (0.0003*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (5.4639*DEG2RAD), (82.22*DEG2RAD), (17.9705*DEG2RAD),
+ (-501.1600928*DEG2RAD), 25559000.0,
+ QObject::tr("Uranus", "the planet"), QString("uranus") );
+ } else if ( target == "neptune" ) {
+ p = new Planet( (256.2250*DEG2RAD), (0.00598103*DEG2RAD),
+ (1.0302*DEG2RAD), (0.0058*DEG2RAD), (0.0000*DEG2RAD),
+ (0.0000*DEG2RAD), (0.0000*DEG2RAD), (0.0000*DEG2RAD),
+ (182.1957*DEG2RAD), (27.84*DEG2RAD), (52.3996*DEG2RAD),
+ (536.3128492*DEG2RAD), 24766000.0,
+ QObject::tr("Neptune", "the planet"), QString("neptune") );
+ // dwarf planets ... (everybody likes pluto)
+ } else if ( target == "pluto" ) {
+ p = new Planet( (14.882*DEG2RAD), (0.00396*DEG2RAD),
+ (28.3150*DEG2RAD), (4.3408*DEG2RAD), (0.9214*DEG2RAD),
+ (0.2235*DEG2RAD), (0.0627*DEG2RAD), (0.0174*DEG2RAD),
+ (4.5433*DEG2RAD), (57.46*DEG2RAD), (56.3183*DEG2RAD),
+ (-56.3623195*DEG2RAD), 1151000.0,
+ QObject::tr("Pluto", "the planet"), QString("pluto") );
+ // sun and moon
+ } else if ( target == "sun" ) {
+ qDebug() << "WARNING:";
+ qDebug() << "creating \"sun\" which has invalid orbital elements";
+ //FIXME: fill in with valid data
+ p = new Planet( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 695000000.0,
+ QObject::tr("Sun", "the earth's star"), QString("sun") );
+ } else if ( target == "moon" ) {
+ qDebug() << "WARNING:";
+ qDebug() << "creating \"moon\" which has invalid orbital elements";
+ //FIXME: fill in with valid data
+ p = new Planet( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1738000.0,
+ QObject::tr("Moon", "the earth's moon"), QString("moon") );
+ }
+
+ //If we created a planet, add it to the list for later
+ if( p )
+ existingPlanets->insert( target, p );
+ else {
+ qDebug() << "Warning: couldn't create planet" << target;
+ qDebug() << "Returning 0, hope it doesn't crash";
+ }
+
+ //If we didn't make a valid planet, return 0
+ return p;
+ }
+}
+
+} //namespace Marble
+
Added: marble/trunk/src/lib/Planet.h
===================================================================
--- marble/trunk/src/lib/Planet.h (rev 0)
+++ marble/trunk/src/lib/Planet.h 2009-05-29 22:27:23 UTC (rev 3799)
@@ -0,0 +1,129 @@
+//Copyright 2009 Henry de Valence <hdevalence@xxxxxxxxx>
+//Copyright 2009 David Roberts <dvdr18@xxxxxxxxx>
+//
+// This file is part of the Marble Desktop Globe.
+//
+// This program is free software licensed under the GNU LGPL. You can
+// find a copy of this license in LICENSE.txt in the top directory of
+// the source code.
+//
+
+#ifndef PLANET_H
+#define PLANET_H
+
+#include "marble_export.h"
+
+namespace Marble {
+
+class PlanetPrivate;
+
+class MARBLE_EXPORT Planet
+{
+//Not a QObject because we don't need sigs/slots
+public:
+
+ //Constructor
+ Planet( qreal M_0, qreal M_1, qreal C_1, qreal C_2, qreal C_3, qreal C_4,
+ qreal C_5, qreal C_6, qreal Pi, qreal epsilon, qreal theta_0,
+ qreal theta_1, qreal radius, const QString& name,
+ const QString& target );
+
+ //Copy Constructor
+ Planet( const Planet& other );
+ //Destructor
+ ~Planet();
+
+
+ /* Getter functions */
+ // for calculating mean anomaly
+ qreal M_0() const;
+ qreal M_1() const;
+
+ // for calculating equation of center
+ qreal C_1() const;
+ qreal C_2() const;
+ qreal C_3() const;
+ qreal C_4() const;
+ qreal C_5() const;
+ qreal C_6() const;
+
+ // ecliptic longitude of the perihelion
+ qreal Pi() const;
+
+ // obliquity of the ecliptic plane
+ qreal epsilon() const;
+
+ // for calculating sidereal time
+ qreal theta_0() const;
+ qreal theta_1() const;
+
+ // the radius of the planet, in metres
+ qreal radius() const;
+
+ /** The user visible name of the planet */
+ QString name() const;
+ /** The internal, nonlocalized name of the planet */
+ QString target() const;
+
+ /* Setter functions */
+ void setM_0( qreal M_0 );
+ void setM_1( qreal M_1 );
+
+ void setC_1( qreal C_1 );
+ void setC_2( qreal C_2 );
+ void setC_3( qreal C_3 );
+ void setC_4( qreal C_4 );
+ void setC_5( qreal C_5 );
+ void setC_6( qreal C_6 );
+
+ void setPi( qreal Pi );
+
+ void setEpsilon( qreal epsilon );
+
+ void setTheta_0( qreal theta_0 );
+ void setTheta_1( qreal theta_1 );
+
+ void setRadius( qreal radius );
+
+ void setName( const QString& name );
+ void setTarget( const QString& target );
+
+ void operator=( const Planet& other );
+
+
+ /**
+ Returns a pointer to a shared Planet object.
+ Use this to create planets.
+ @param target the (nonlocalized) name of the planet
+ @return a pointer to a shared instance of the planet
+ @note if you wish to modify an existing planet, you may get a const Planet
+ object here and then use the Planet copy constructor. @see addPlanet()
+ */
+ static const Planet* planetByName(const QString& target);
+ /**
+ Adds a custom planet to the list.
+ @param planet a pointer to the new custom planet. Ownership of this pointer
+ is <b>not</b> transferred
+ @param target the nonlocalized name of the new planet
+ @param overwrite if false, addPlanet() will not overwrite an existing
+ planet of the same name
+ @return a pointer to the planet that was added. If adding the planet failed,
+ it returns a null pointer. Note that it will never equal @param planet
+ since if there is an existing planet and @p overwrite is true, it assigns
+ the exisiting planet the value of @p planet, so anyone already using that
+ planet gets the new value, and if there was no exisitng planet, it makes a
+ copy of @p planet
+ */
+ static const Planet* addPlanet( Planet *planet, const QString& target,
+ bool overwrite = false );
+
+private:
+ PlanetPrivate * d;
+};
+
+
+
+} //namespace Marble
+
+
+#endif
Modified: marble/trunk/src/lib/geodata/data/GeoDataFeature.cpp
===================================================================
--- marble/trunk/src/lib/geodata/data/GeoDataFeature.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/geodata/data/GeoDataFeature.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -272,6 +272,10 @@
= new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/airport.png" ) ),
QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
+ s_defaultStyle[Observatory]
+ = new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/other.png" ) ),
+ QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
+
s_defaultStyle[Wikipedia]
= new GeoDataStyle( QPixmap( MarbleDirs::path( "bitmaps/wikipedia.png" ) ),
QFont( defaultFamily, defaultSize, 50, false ), QColor( Qt::black ) );
Modified: marble/trunk/src/lib/geodata/data/GeoDataFeature.h
===================================================================
--- marble/trunk/src/lib/geodata/data/GeoDataFeature.h 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/lib/geodata/data/GeoDataFeature.h 2009-05-29 22:27:23 UTC (rev 3799)
@@ -109,6 +109,7 @@
MagneticPole,
ShipWreck,
AirPort,
+ Observatory,
// Runners
Wikipedia,
Modified: marble/trunk/src/marble.desktop
===================================================================
--- marble/trunk/src/marble.desktop 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/marble.desktop 2009-05-29 22:27:23 UTC (rev 3799)
@@ -4,6 +4,7 @@
Name=Marble
Name[gu]=માર્બલ
Name[hi]=संगमरमर
+Name[hne]=संगमरमर
Name[km]=ថ្មម៉ាប
Name[ml]=മാര്ബിള്
Name[ne]=मार्बल
@@ -27,6 +28,7 @@
GenericName[gu]=ડેસ્કટોપ પૃથ્વીનો ગોળો
GenericName[he]=פלנטריום שולחני
GenericName[hi]=डेस्कटॉप ग्लोब
+GenericName[hne]=डेस्कटाप ग्लोब
GenericName[hu]=Asztali földgömb
GenericName[it]=Globo per il desktop
GenericName[ja]=デスクトップ地球儀
Modified: marble/trunk/src/marble_part.desktop
===================================================================
--- marble/trunk/src/marble_part.desktop 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/marble_part.desktop 2009-05-29 22:27:23 UTC (rev 3799)
@@ -12,6 +12,7 @@
Name[gl]=Componente para Marble
Name[gu]=માર્બલ ભાગ
Name[hi]=मार्बल पार्ट
+Name[hne]=मार्बल पार्ट
Name[hu]=Marble objektum
Name[it]=Componente Marble
Name[ja]=Marble コンポーネント
Modified: marble/trunk/src/plasmoid/plasma-applet-kworldclock.desktop
===================================================================
--- marble/trunk/src/plasmoid/plasma-applet-kworldclock.desktop 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plasmoid/plasma-applet-kworldclock.desktop 2009-05-29 22:27:23 UTC (rev 3799)
@@ -11,6 +11,7 @@
Name[gl]=Reloxo mundial
Name[gu]=વિશ્વ ઘડિયાળ
Name[he]=שעון עולמי
+Name[hne]=संसार घड़ी
Name[it]=Orologio del mondo
Name[ja]=世界時計
Name[km]=នាឡិកាពិភពលោក
Modified: marble/trunk/src/plugins/render/fileview/FileViewFloatItem.cpp
===================================================================
--- marble/trunk/src/plugins/render/fileview/FileViewFloatItem.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plugins/render/fileview/FileViewFloatItem.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -41,7 +41,7 @@
m_fileView(0), m_persIndex(0)
{
// Plugin is not enabled by default
- setEnabled(false);
+ setEnabled(true);
}
FileViewFloatItem::~FileViewFloatItem()
Modified: marble/trunk/src/plugins/render/navigation/navigation.ui
===================================================================
--- marble/trunk/src/plugins/render/navigation/navigation.ui 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plugins/render/navigation/navigation.ui 2009-05-29 22:27:23 UTC (rev 3799)
@@ -33,7 +33,7 @@
<string>Zoom Out</string>
</property>
<property name="whatsThis" >
- <string>Zoom out by pressing this button to see less details.</string>
+ <string>Zoom out by pressing this button to see less detail.</string>
</property>
<property name="text" >
<string>...</string>
@@ -147,7 +147,7 @@
<string>Zoom In</string>
</property>
<property name="whatsThis" >
- <string>Zoom in by pressing this button to see more details.</string>
+ <string>Zoom in by pressing this button to see more detail.</string>
</property>
<property name="text" >
<string>...</string>
Modified: marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.cpp
===================================================================
--- marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -67,7 +67,7 @@
void PanoramioPlugin::initialize()
{
flag = 0;
- numberOfImagesToShow = 5;
+ numberOfImagesToShow = 20;
m_storagePolicy = new CacheStoragePolicy(MarbleDirs::localPath() + "/cache/");
m_downloadManager = new HttpDownloadManager(QUrl("htttp://mw2.google.com/"), m_storagePolicy);
downloadPanoramio(0, numberOfImagesToShow , -180.00 / RADIANSTODEGREES , -90.00 / RADIANSTODEGREES , 180.00 / RADIANSTODEGREES , 90.00 / RADIANSTODEGREES);
@@ -85,7 +85,7 @@
painter->autoMapQuality();
GeoDataLatLonAltBox mylatLonAltBox = viewport->viewLatLonAltBox();
- qreal west = mylatLonAltBox.west();
+ /* qreal west = mylatLonAltBox.west();
qreal east = mylatLonAltBox.east();
qreal south = mylatLonAltBox.south();
qreal north = mylatLonAltBox.north();
@@ -96,7 +96,7 @@
downloadPanoramio(0 , numberOfImagesToShow , west , east , north , south);
disconnect(m_downloadManager, SIGNAL(downloadComplete(QString, QString)), this, SLOT(slotImageDownloadComplete(QString , QString)));
}
-
+*/
if (flag == 1) {
for (int x = 0; x < imagesWeHave.count(); ++x) {
painter->drawPixmap(GeoDataCoordinates(parsedData[x].longitude, parsedData[x].latitude, 0.0, GeoDataCoordinates::Degree), imagesWeHave[x]);
@@ -105,15 +105,17 @@
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;
-
+/*
deltaWest = west;
deltaEast = east ;
deltaSouth = south ;
deltaNorth = north;
- return true;
+*/
+ return true;
}
void PanoramioPlugin::slotJsonDownloadComplete(QString relativeUrlString, QString id)
@@ -138,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;
}
Modified: marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.h
===================================================================
--- marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.h 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plugins/render/panoramio/PanoramioPlugin.h 2009-05-29 22:27:23 UTC (rev 3799)
@@ -22,7 +22,8 @@
// #include "../lib/HttpJob.h"
#include "jsonparser.h"
#include "MarbleRenderPlugin.h"
-
+#include <QWidget>
+#include <QLabel>
namespace Marble
{
@@ -76,9 +77,12 @@
QList <panoramioDataStructure> 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;
+ QList<QLabel>images;//these widgets are supposed to show draw images and take click events
};
}
Modified: marble/trunk/src/plugins/render/panoramio/jsonparser.cpp
===================================================================
--- marble/trunk/src/plugins/render/panoramio/jsonparser.cpp 2009-05-29 06:56:11 UTC (rev 3798)
+++ marble/trunk/src/plugins/render/panoramio/jsonparser.cpp 2009-05-29 22:27:23 UTC (rev 3799)
@@ -9,7 +9,7 @@
jsonParser::jsonParser()
{
- myEngine.setProcessEventsInterval(10);//this lets the gui remain responsive
+// myEngine.setProcessEventsInterval(10);//this lets the gui remain responsive
}
jsonParser::~jsonParser()
@@ -24,11 +24,12 @@
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 longitude (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};"));
+ 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};"));
+ myEngine.evaluate(QString("function photo_title(x){return myJSONObject.photos[x].photo_title};"));
- dataStorage.count = myEngine.evaluate("count();").toInteger();
+ dataStorage.count = myEngine.evaluate("count();").toInteger();
/* dataStorage.height = myEngine.evaluate(QString("return myJSONObject.photos[")
+ QString::number(requiredObjectPosition)
@@ -72,7 +73,9 @@
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("longitude(x)").toNumber();
+ dataStorage.photo_title=myEngine.evaluate(QString("photo_title(x)")).toString();
+
+qDebug()<<":::::::"<<__func__<<myEngine.evaluate("longitude(x)").toNumber();
return dataStorage;
}