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

List:       kde-commits
Subject:    branches/KDE/4.2/kdeedu/marble/src/lib
From:       Henry de Valence <hdevalence () gmail ! com>
Date:       2009-03-14 19:37:45
Message-ID: 1237059465.721164.30677.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 939397 by hdevalence:

Backport of r939317; don't show night map on non-earth planets.


 M  +1 -1      MergedLayerDecorator.cpp  
 M  +5 -0      SunLocator.cpp  
 M  +2 -0      SunLocator.h  


--- branches/KDE/4.2/kdeedu/marble/src/lib/MergedLayerDecorator.cpp #939396:939397
@@ -180,7 +180,7 @@
     const qreal nInverse = 1.0 / (qreal)(n);
     const int ipRight = n * (int)( tileWidth / n );
 
-    if ( m_sunLocator->getCitylights() ) {
+    if ( m_sunLocator->getCitylights() && m_sunLocator->body() == "earth") {
         QImage nighttile = loadDataset( m_cityLightsTextureLayer );
         if ( nighttile.isNull() )
             return;
--- branches/KDE/4.2/kdeedu/marble/src/lib/SunLocator.cpp #939396:939397
@@ -229,4 +229,9 @@
     }
 }
 
+QString SunLocator::body() const
+{
+	return m_body;
+}
+
 #include "SunLocator.moc"
--- branches/KDE/4.2/kdeedu/marble/src/lib/SunLocator.h #939396:939397
@@ -66,6 +66,8 @@
     qreal getLat() {return -m_lat * 180.0 / M_PI;}
 	
     ExtDateTime* datetime() {return m_datetime;}
+
+	QString body() const;
 	
  public Q_SLOTS:
     void update();
[prev in list] [next in list] [prev in thread] [next in thread]