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

List:       kde-commits
Subject:    KDE/kdeedu/marble/src/lib/geodata
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-03-10 2:53:40
Message-ID: 1205117620.551124.16423.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 783935 by rahn:

- raiseError
- More properties for GeoSceneDocument.



 M  +2 -1      handlers/dgml/DGMLAttributeDictionary.cpp  
 M  +2 -0      handlers/dgml/DGMLAttributeDictionary.h  
 M  +4 -0      handlers/dgml/DGMLMaximumTagHandler.cpp  
 M  +4 -0      handlers/dgml/DGMLMinimumTagHandler.cpp  
 M  +31 -0     scene/GeoSceneDocument.cpp  
 M  +11 -2     scene/GeoSceneDocument.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLAttributeDictionary.cpp #783934:783935
@@ -21,7 +21,8 @@
 
 #include "DGMLAttributeDictionary.h"
 
-// One static list of all tag names, to avoid string comparisons all-over-the-place
+// One static list of all attribute names, to avoid string comparisons all-over-the-place
+
 namespace GeoSceneAttributeDictionary {
 
 const char* dgmlAttr_nameSpace20 = "http://edu.kde.org/marble/dgml/2.0";
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLAttributeDictionary.h #783934:783935
@@ -26,7 +26,9 @@
 
 // Lists all known DGML 2.0 attributes
 // http://edu.kde.org/marble/apis/dgml/documentation/dgmltags.html)
+
 namespace GeoSceneAttributeDictionary {
+
     extern const char* dgmlAttr_nameSpace20;
 
     extern const char* dgmlAttr_bgcolor;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLMaximumTagHandler.cpp #783934:783935
@@ -54,6 +54,10 @@
         {
             parentItem.nodeAs<GeoSceneZoom>()->setMaximum( parsedInt );
         }
+        else
+        {
+            parser.raiseError("Error: no valid value for Maximum.");
+        }
     }
 
     return 0;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/handlers/dgml/DGMLMinimumTagHandler.cpp #783934:783935
@@ -54,6 +54,10 @@
         {
             parentItem.nodeAs<GeoSceneZoom>()->setMinimum( parsedInt );
         }
+        else
+        {
+            parser.raiseError("Error: no valid value for Minimum.");
+        }
     }
 
     return 0;
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneDocument.cpp #783934:783935
@@ -25,12 +25,19 @@
 GeoSceneDocument::GeoSceneDocument()
     : GeoDocument()
     , m_head(0)
+    , m_map(0)
+    , m_settings(0)
+    , m_legend(0)
 {
 }
 
 GeoSceneDocument::~GeoSceneDocument()
 {
     delete m_head;
+    delete m_map;
+    delete m_settings;
+    delete m_legend;
+
 }
 
 GeoSceneHead* GeoSceneDocument::head() const
@@ -40,3 +47,27 @@
 
     return m_head;
 }
+
+GeoSceneMap* GeoSceneDocument::map() const
+{
+    if (!m_map)
+        m_map = new GeoSceneMap;
+
+    return m_map;
+}
+
+GeoSceneSettings* GeoSceneDocument::settings() const
+{
+    if (!m_settings)
+        m_settings = new GeoSceneSettings;
+
+    return m_settings;
+}
+
+GeoSceneLegend* GeoSceneDocument::legend() const
+{
+    if (!m_legend)
+        m_legend = new GeoSceneLegend;
+
+    return m_legend;
+}
--- trunk/KDE/kdeedu/marble/src/lib/geodata/scene/GeoSceneDocument.h #783934:783935
@@ -24,6 +24,9 @@
 #define GEOSCENEDOCUMENT_H
 
 #include "GeoSceneHead.h"
+#include "GeoSceneMap.h"
+#include "GeoSceneSettings.h"
+#include "GeoSceneLegend.h"
 #include "GeoDocument.h"
 
 /**
@@ -37,10 +40,16 @@
 
     virtual bool isGeoSceneDocument() const { return true; }
 
-    GeoSceneHead* head() const;
+    GeoSceneHead*     head() const;
+    GeoSceneMap*      map() const;
+    GeoSceneSettings* settings() const;
+    GeoSceneLegend*   legend() const;
 
 protected:
-    mutable GeoSceneHead* m_head;
+    mutable GeoSceneHead*     m_head;
+    mutable GeoSceneMap*      m_map;
+    mutable GeoSceneSettings* m_settings;
+    mutable GeoSceneLegend*   m_legend;
 };
 
 
[prev in list] [next in list] [prev in thread] [next in thread]