[Marble-commits] KDE/kdeedu/marble/src/lib/geodata

[Torsten Rahn]

SVN commit 1009071 by rahn:


- Implementation of GeoDataLod



 A             data/GeoDataLod.cpp   [License: LGPL]
 M  +10 -11    data/GeoDataLod.h  
 A             data/GeoDataLod_p.h   [License: LGPL]
 M  +3 -0      data/GeoDataObject.cpp  
 M  +1 -0      parser/GeoDocument.cpp  
 M  +1 -0      parser/GeoDocument.h  


--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataLod.h #1009070:1009071
@@ -68,7 +68,7 @@
     A value of 0 would mean no minimum number of pixels which is also the
     standard value.
 */
-    int minLodPixels() const;
+    qreal minLodPixels() const;
 
     
 /*!
@@ -76,17 +76,17 @@
     Sets the minimum number of \a pixels the region has to be projected on for
     the feature to be considered active.
 */
-    void setMinLodPixels( int pixels );
+    void setMinLodPixels( qreal pixels );
 
     
 /*!
     \brief Returns the maximum size that is needed for the region to be active
     Returns the maximum number of pixels the region has to be projected on for
     the feature to be considered active. 
-    A value of 0 would mean no minimum number of pixels which is also the
+    A value of -1 would mean no minimum number of pixels which is also the
     standard value.
 */
-    int maxLodPixels() const;
+    qreal maxLodPixels() const;
 
     
 /*!
@@ -94,7 +94,7 @@
     Sets the maximum number of \a pixels the region has to be projected on for
     the feature to be considered active.
 */
-    void setMaxLodPixels( int pixels );
+    void setMaxLodPixels( qreal pixels );
    
 
 /*!
@@ -102,7 +102,7 @@
     Returns the distance (counted from minLodPixels) over which the feature
     fades in or out. 
 */
-    int minFadeExtent() const;
+    qreal minFadeExtent() const;
 
     
 /*!
@@ -110,7 +110,7 @@
     Sets the distance (counted from minLodPixels) over which the feature fades
     in or out. 
 */
-    void setMinFadeExtent( int pixels );
+    void setMinFadeExtent( qreal pixels );
 
     
 /*!
@@ -118,7 +118,7 @@
     Returns the distance (counted from maxLodPixels) over which the feature
     fades in or out. 
 */
-    int maxFadeExtent() const;
+    qreal maxFadeExtent() const;
 
     
 /*!
@@ -126,7 +126,7 @@
     Sets the distance (counted from maxLodPixels) over which the feature fades
     in or out. 
 */
-    void setMaxFadeExtent( int pixels );
+    void setMaxFadeExtent( qreal pixels );
     
     
     // Serialization
@@ -145,8 +145,7 @@
 
     
  protected:
-    GeoDataLodPrivate *p() const;
-    GeoDataLod(GeoDataLodPrivate* priv);
+    GeoDataLodPrivate  * const d;
 };
 
 }
--- trunk/KDE/kdeedu/marble/src/lib/geodata/data/GeoDataObject.cpp #1009070:1009071
@@ -15,6 +15,9 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QDataStream>
 
+#include "GeoDataObject.h"
+
+
 namespace Marble
 {
 
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoDocument.cpp #1009070:1009071
@@ -46,6 +46,7 @@
 const char* GeoDataLinearRingType = "GeoDataLinearRing";
 const char* GeoDataLineStringType = "GeoDataLineString";
 const char* GeoDataLineStyleType = "GeoDataLineStyle";
+const char* GeoDataLodType = "GeoDataLod";
 const char* GeoDataMultiGeometryType = "GeoDataMultyGeometry";
 const char* GeoDataObjectType = "GeoDataObject";
 const char* GeoDataOuterBoundaryType = "GeoDataOuterBoundary";
--- trunk/KDE/kdeedu/marble/src/lib/geodata/parser/GeoDocument.h #1009070:1009071
@@ -58,6 +58,7 @@
 extern const char* GeoDataLinearRingType;
 extern const char* GeoDataLineStringType;
 extern const char* GeoDataLineStyleType;
+extern const char* GeoDataLodType;
 extern const char* GeoDataMultiGeometryType;
 extern const char* GeoDataObjectType;
 extern const char* GeoDataOuterBoundaryType;