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

List:       kde-commits
Subject:    [marble] /: adapt to latest changes in GeoDataExtendedData
From:       Niko Sams <niko.sams () gmail ! com>
Date:       2011-12-31 15:16:59
Message-ID: 20111231151659.5F684580C9 () git ! kde ! org
[Download RAW message or body]

Git commit 58f1a0fd0305dd570deaf81e73d7351226e1c447 by Niko Sams.
Committed on 08/12/2011 at 21:20.
Pushed by nsams into branch 'master'.

adapt to latest changes in GeoDataExtendedData

M  +1    -1    CMakeLists.txt
M  +1    -1    src/lib/geodata/data/GeoDataExtendedData.h
M  +1    -0    src/lib/geodata/data/GeoDataTrack.cpp
M  +1    -1    src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
M  +4    -4    src/plugins/runner/gpx/tests/TestTrack.cpp

http://commits.kde.org/marble/58f1a0fd0305dd570deaf81e73d7351226e1c447

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3857121..7dbac43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -312,7 +312,7 @@ if(WIN32)
   SET(CMAKE_DEBUG_POSTFIX "d")
 endif(WIN32)
 # reenable this if you want to debug kml tags
-#add_definitions("-DDEBUG_TAGS")
+add_definitions("-DDEBUG_TAGS")
 ####################################################
 # add cmake macros
 include( MarbleMacros )
diff --git a/src/lib/geodata/data/GeoDataExtendedData.h \
b/src/lib/geodata/data/GeoDataExtendedData.h index d318fa6..96d7ad5 100644
--- a/src/lib/geodata/data/GeoDataExtendedData.h
+++ b/src/lib/geodata/data/GeoDataExtendedData.h
@@ -95,7 +95,7 @@ class GEODATA_EXPORT GeoDataExtendedData : public GeoDataObject
     void setSimpleArrayData( const QString& key, GeoDataSimpleArrayData* values );
 
     /**
-     * @brief return SimpleArrayData for given @p key as a modifiable reference
+     * @brief return SimpleArrayData for given @p key, 0 pointer if none is set
      */
     GeoDataSimpleArrayData* simpleArrayData( const QString& key ) const;
 
diff --git a/src/lib/geodata/data/GeoDataTrack.cpp \
b/src/lib/geodata/data/GeoDataTrack.cpp index ca5a7c0..86b47ff 100644
--- a/src/lib/geodata/data/GeoDataTrack.cpp
+++ b/src/lib/geodata/data/GeoDataTrack.cpp
@@ -109,6 +109,7 @@ QList<QDateTime> GeoDataTrack::whenList() const
 
 GeoDataCoordinates GeoDataTrack::coordinatesAt( const QDateTime &when ) const
 {
+		qDebug() << "GeoDataTrack::coordinatesAt" << when;
     if ( d->m_when.isEmpty() ) {
         return GeoDataCoordinates();
     }
diff --git a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp \
b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp index c3b2020..d700147 100644
--- a/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
+++ b/src/plugins/runner/gpx/handlers/GPXhrTagHandler.cpp
@@ -41,7 +41,7 @@ GeoNode* GPXhrTagHandler::parse(GeoParser& parser) const
 
     if ( parentItem.is<GeoDataTrack>() )
     {
-        GeoDataSimpleArrayData* arrayData = &parentItem.nodeAs<GeoDataTrack>()
+        GeoDataSimpleArrayData* arrayData = parentItem.nodeAs<GeoDataTrack>()
                         ->extendedData().simpleArrayData( "heartrate" );
         QVariant value( parser.readElementText().toInt() );
         arrayData->append( value );
diff --git a/src/plugins/runner/gpx/tests/TestTrack.cpp \
b/src/plugins/runner/gpx/tests/TestTrack.cpp index 24b4707..da0badb 100644
--- a/src/plugins/runner/gpx/tests/TestTrack.cpp
+++ b/src/plugins/runner/gpx/tests/TestTrack.cpp
@@ -371,10 +371,10 @@ void TestTrack::extendedDataHeartRateTest()
     QCOMPARE( track->size(), 3 );
 
     {
-        GeoDataSimpleArrayData hr = track->extendedData().simpleArrayData( \
                "heartrate" );
-        QCOMPARE( hr.size(), 3 );
-        QCOMPARE( hr.valueAt( 0 ), QVariant( "108" ) );
-        QCOMPARE( hr.valueAt( 2 ), QVariant( "110" ) );
+        GeoDataSimpleArrayData* hr = track->extendedData().simpleArrayData( \
"heartrate" ); +        QCOMPARE( hr->size(), 3 );
+        QCOMPARE( hr->valueAt( 0 ), QVariant( "108" ) );
+        QCOMPARE( hr->valueAt( 2 ), QVariant( "110" ) );
     }
 
     delete document;


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