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

List:       kde-commits
Subject:    KDE/kdeedu/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-04-18 7:10:39
Message-ID: 1208502639.125392.15095.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 798381 by rahn:

- some initial use of vector stuff
- changed my mind about colors for vectors
  in DGML: we should have a pen and a brush (like in Qt)



 M  +5 -4      data/maps/earth/srtm/srtm.dgm2  
 M  +16 -7     src/lib/MarbleModel.cpp  


--- trunk/KDE/kdeedu/marble/data/maps/earth/srtm/srtm.dgm2 #798380:798381
@@ -77,19 +77,20 @@
             <layer name="mwdbii" backend="vector" role="polyline">
                 <vector name="pdiffborder" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/PDIFFBORDER.PNT </sourcefile>
-                    <color>#f29b68</color>
+                    <pen color="#f29b68" />
                 </vector>
                 <vector name="pusa48.diff" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/PUSA48.DIFF.PNT </sourcefile>
-                    <color>#f29b68</color>
+                    <pen color="#f29b68" />
+                    <brush color="#f29b68" />
                 </vector>
                 <vector name="international dateline" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/DATELINE.PNT </sourcefile>
-                    <color>#000000</color>
+                    <pen color="#000000" />
                 </vector>
                 <vector name="pusa48" feature="border">
                     <sourcefile format="PNT"> earth/mwdbii/PUSA48.DIFF.PNT </sourcefile>
-                    <color>#637bff</color>
+                    <pen color="#637bff" />
                 </vector>
             </layer>
         
--- trunk/KDE/kdeedu/marble/src/lib/MarbleModel.cpp #798380:798381
@@ -26,6 +26,7 @@
 #include "GeoSceneDocument.h"
 #include "GeoSceneLayer.h"
 #include "GeoSceneTexture.h"
+#include "GeoSceneVector.h"
 
 #include "AbstractScanlineTextureMapper.h"
 #include "ClipPainter.h"
@@ -348,15 +349,23 @@
     else {
         d->m_tileLoader->flush();
     }
+
+    // Set all the colors for the vector layers
+    if ( d->m_mapTheme->map()->hasVectorLayers() ) {
+        GeoSceneVector *vector = 
+            static_cast<GeoSceneVector*>( d->m_mapTheme->map()->layer( "mwdbii" )->datasets().first() );
+
+
+        d->m_veccomposer->setOceanColor( d->m_mapTheme->map()->backgroundColor() );
 /*
-    // Set all the colors for the vector layers
-    d->m_veccomposer->setOceanColor( d->m_maptheme->oceanColor() );
-    d->m_veccomposer->setLandColor( d->m_maptheme->landColor() );
-    d->m_veccomposer->setCountryBorderColor( d->m_maptheme->countryBorderColor() );
-    d->m_veccomposer->setStateBorderColor( d->m_maptheme->countryBorderColor() );
-    d->m_veccomposer->setLakeColor( d->m_maptheme->lakeColor() );
-    d->m_veccomposer->setRiverColor( d->m_maptheme->riverColor() );
+        d->m_veccomposer->setLandColor( d->m_maptheme->landColor() );
+        d->m_veccomposer->setCountryBorderColor( d->m_maptheme->countryBorderColor() );
+        d->m_veccomposer->setStateBorderColor( d->m_maptheme->countryBorderColor() );
+        d->m_veccomposer->setLakeColor( d->m_maptheme->lakeColor() );
+        d->m_veccomposer->setRiverColor( d->m_maptheme->riverColor() );
 */
+    }
+
     if ( d->m_placeMarkLayout == 0)
         d->m_placeMarkLayout = new PlaceMarkLayout( this );
     d->m_placeMarkLayout->requestStyleReset();
[prev in list] [next in list] [prev in thread] [next in thread]