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

List:       kde-commits
Subject:    branches/KDE/4.1/kdeedu/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-07-23 6:27:48
Message-ID: 1216794468.297739.3344.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 836835 by rahn:


- Fixing labelcolor regression for dark maps



 M  +1 -1      data/maps/earth/bluemarble/bluemarble.dgml  
 M  +1 -1      data/maps/earth/citylights/citylights.dgml  
 M  +10 -0     src/lib/PlaceMarkLayout.cpp  
 M  +1 -0      src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.cpp  
 M  +1 -0      src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.h  
 M  +8 -1      src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp  
 M  +15 -3     src/lib/geodata/scene/GeoSceneMap.cpp  
 M  +6 -2      src/lib/geodata/scene/GeoSceneMap.h  


--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/bluemarble/bluemarble.dgml \
#836834:836835 @@ -27,7 +27,7 @@
             <!-- Now we create the layer structure that gets handled by the
     layer management class -->
         
-        <map bgcolor="#000000">
+        <map bgcolor="#000000" labelColor="#ffffff">
             <canvas/>
             <!-- In this place one could e.g. insert a sky plugin -->
             <target/>
--- branches/KDE/4.1/kdeedu/marble/data/maps/earth/citylights/citylights.dgml \
#836834:836835 @@ -27,7 +27,7 @@
             <!-- Now we create the layer structure that gets handled by the
     layer management class -->
         
-        <map bgcolor="#000000">
+        <map bgcolor="#000000" labelColor="#ffffff">
             <canvas/>
             <!-- In this place one could e.g. insert a sky plugin -->
             <target/>
--- branches/KDE/4.1/kdeedu/marble/src/lib/PlaceMarkLayout.cpp #836834:836835
@@ -21,6 +21,8 @@
 #include <QtGui/QItemSelectionModel>
 #include <QtGui/QPainter>
 
+#include "GeoSceneDocument.h"
+#include "GeoSceneMap.h"
 #include "GeoDataPlacemark.h"
 #include "GeoDataStyle.h"
 
@@ -436,6 +438,14 @@
 
         m_paintOrder.append( mark );
     }
+    if ( viewParams->mapTheme() )
+    {
+        QColor labelColor = viewParams->mapTheme()->map()->labelColor();
+
+        m_placeMarkPainter->setDefaultLabelColor( labelColor );
+
+    }
+
     m_placeMarkPainter->drawPlaceMarks( painter, m_paintOrder, selection, 
                                         viewParams->viewport() );
 }
--- branches/KDE/4.1/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.cpp \
#836834:836835 @@ -37,6 +37,7 @@
 const char* dgmlAttr_feature          = "feature";
 const char* dgmlAttr_format           = "format";
 const char* dgmlAttr_host             = "host";
+const char* dgmlAttr_labelColor       = "labelColor";
 const char* dgmlAttr_levelZeroColumns = "levelZeroColumns";
 const char* dgmlAttr_levelZeroRows    = "levelZeroRows";
 const char* dgmlAttr_mode             = "mode";
--- branches/KDE/4.1/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlAttributeDictionary.h \
#836834:836835 @@ -40,6 +40,7 @@
     extern const char* dgmlAttr_feature;
     extern const char* dgmlAttr_format;
     extern const char* dgmlAttr_host;
+    extern const char* dgmlAttr_labelColor;
     extern const char* dgmlAttr_levelZeroColumns;
     extern const char* dgmlAttr_levelZeroRows;
     extern const char* dgmlAttr_mode;
--- branches/KDE/4.1/kdeedu/marble/src/lib/geodata/handlers/dgml/DgmlMapTagHandler.cpp \
#836834:836835 @@ -22,6 +22,7 @@
 
 #include "DgmlMapTagHandler.h"
 
+#include <QtGui/QColor>
 #include <QtCore/QDebug>
 
 #include "DgmlElementDictionary.h"
@@ -48,13 +49,19 @@
 {
     Q_ASSERT(parser.isStartElement() && parser.isValidElement(dgmlTag_Map));
 
+    QColor  labelColor  = parser.attribute(dgmlAttr_labelColor).trimmed();
+
+    if ( !labelColor.isValid() ) 
+        labelColor = Qt::black;
+
     GeoSceneMap* map = 0;
 
     // Checking for parent item
     GeoStackItem parentItem = parser.parentElement();
     if (parentItem.represents(dgmlTag_Document)) {
         map = parentItem.nodeAs<GeoSceneDocument>()->map();
-        map->setBackgroundColor(parser.attribute(dgmlAttr_bgcolor).trimmed());
+        map->setBackgroundColor( QColor( parser.attribute( dgmlAttr_bgcolor \
).trimmed() ) ); +        map->setLabelColor( labelColor );
     }
 
     return map;
--- branches/KDE/4.1/kdeedu/marble/src/lib/geodata/scene/GeoSceneMap.cpp \
#836834:836835 @@ -48,7 +48,8 @@
     /// The vector holding all the filters in the map.
     QVector<GeoSceneFilter*> m_filters;
 
-    QString m_backgroundColor;
+    QColor m_backgroundColor;
+    QColor m_labelColor;
 };
 
 
@@ -177,12 +178,23 @@
     return false;
 }
 
-QString GeoSceneMap::backgroundColor() const
+QColor GeoSceneMap::backgroundColor() const
 {
     return d->m_backgroundColor;
 }
 
-void GeoSceneMap::setBackgroundColor( const QString& backgroundColor )
+void GeoSceneMap::setBackgroundColor( const QColor& backgroundColor )
 {
     d->m_backgroundColor = backgroundColor;
 }
+
+
+QColor GeoSceneMap::labelColor() const
+{
+    return d->m_labelColor;
+}
+
+void GeoSceneMap::setLabelColor( const QColor& backgroundColor )
+{
+    d->m_labelColor = backgroundColor;
+}
--- branches/KDE/4.1/kdeedu/marble/src/lib/geodata/scene/GeoSceneMap.h #836834:836835
@@ -22,6 +22,7 @@
 #ifndef GEOSCENEMAP_H
 #define GEOSCENEMAP_H
 
+#include <QtGui/QColor>
 #include <QtCore/QString>
 #include <QtCore/QVector>
 
@@ -42,9 +43,12 @@
     GeoSceneMap();
     ~GeoSceneMap();
 
-    QString backgroundColor() const;
-    void setBackgroundColor( const QString& );
+    QColor backgroundColor() const;
+    void setBackgroundColor( const QColor& );
 
+    QColor labelColor() const;
+    void setLabelColor( const QColor& );
+
     /**
      * @brief  Add a new layer to the map
      * @param  section  The new layer


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