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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2008-12-23 2:13:11
Message-ID: 1229998391.610661.28765.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 900501 by sengels:

parse geodata tag
pick will stay undefined for longer since I don't see any use for that
CCBUG:178512

 A             handlers/dgml/DgmlGeodataTagHandler.cpp   [License: LGPL (v2+)]
 A             handlers/dgml/DgmlGeodataTagHandler.h   [License: LGPL (v2+)]
 M  +8 -2      handlers/dgml/DgmlSourceFileTagHandler.cpp  
 A             scene/GeoSceneXmlDataSource.cpp   [License: LGPL (v2+)]
 A             scene/GeoSceneXmlDataSource.h   [License: LGPL (v2+)]


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlSourceFileTagHandler.cpp #900500:900501
@@ -25,6 +25,7 @@
 #include "DgmlAttributeDictionary.h"
 #include "GeoParser.h"
 #include "GeoSceneVector.h"
+#include "GeoSceneXmlDataSource.h"
 
 namespace Marble
 {
@@ -39,14 +40,19 @@
 
     QString format = parser.attribute(dgmlAttr_format).trimmed();
 
-    GeoSceneVector *vector = 0;
-
     // Checking for parent item
     GeoStackItem parentItem = parser.parentElement();
     if (parentItem.represents(dgmlTag_Vector)) {
+        GeoSceneVector *vector = 0;
+
         vector = parentItem.nodeAs<GeoSceneVector>();
         vector->setSourceFile( parser.readElementText().trimmed() );
         vector->setFileFormat(format);
+    } else if(parentItem.represents(dgmlTag_Geodata)) {
+        GeoSceneXmlDataSource *dataSource = 0;
+        dataSource = parentItem.nodeAs<GeoSceneXmlDataSource>();
+        dataSource->setFilename( parser.readElementText().trimmed() );
+        dataSource->setFileFormat(format);
     }
 
     return 0;
[prev in list] [next in list] [prev in thread] [next in thread]