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

List:       kde-commits
Subject:    [marble] src/lib/geodata/writers/kml: Fix writing random colormode. Don't write default values.
From:       Dennis_Nienhüser <earthwings () gentoo ! org>
Date:       2012-11-24 10:01:33
Message-ID: 20121124100133.0A15DA60C6 () git ! kde ! org
[Download RAW message or body]

Git commit a5d09cd770c8a90dea4a5537a4816cb5eef94960 by Dennis Nienhüser.
Committed on 24/11/2012 at 10:58.
Pushed by nienhueser into branch 'master'.

Fix writing random colormode. Don't write default values.

REVIEW: 102611
CCBUG: 310575

M  +12   -4    src/lib/geodata/writers/kml/KmlColorStyleTagWriter.cpp

http://commits.kde.org/marble/a5d09cd770c8a90dea4a5537a4816cb5eef94960

diff --git a/src/lib/geodata/writers/kml/KmlColorStyleTagWriter.cpp \
b/src/lib/geodata/writers/kml/KmlColorStyleTagWriter.cpp index 5026415..1c79abf \
                100644
--- a/src/lib/geodata/writers/kml/KmlColorStyleTagWriter.cpp
+++ b/src/lib/geodata/writers/kml/KmlColorStyleTagWriter.cpp
@@ -37,10 +37,18 @@ bool KmlColorStyleTagWriter::write( const Marble::GeoNode *node, \
                GeoWriter &writ
                              .arg( color.blue(), 2, 16, fill )
                              .arg( color.green(), 2, 16, fill )
                              .arg( color.red(), 2, 16, fill );
-    writer.writeElement( kml::kmlTag_color, colorString );
-
-    /** @todo: support random color mode */
-    writer.writeElement( kml::kmlTag_colorMode, "normal" );
+    if ( colorString != "ffffffff" ) { // Only write non-default values
+        writer.writeElement( kml::kmlTag_color, colorString );
+    }
+
+    switch( colorStyle->colorMode() ) {
+    case GeoDataColorStyle::Random:
+        writer.writeElement( kml::kmlTag_colorMode, "random" );
+        break;
+    case GeoDataColorStyle::Normal:
+        // default value, no need to write it
+        break;
+    }
 
     bool const result = writeMid( node, writer );
     writer.writeEndElement();


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