[Kstars-devel] KDE/kdeedu/kstars/kstars

[Alexey Khudyakov]

SVN commit 1223416 by khudyakov:

Use CompassColor for labels for horizon, equator and ecliptic

Make CompassColor contrast with both sky and horizon

CCMAIL: kstars-devel at kde.org

 M  +1 -1      data/classic.colors  
 M  +1 -1      data/moonless-night.colors  
 M  +1 -1      data/night.colors  
 M  +3 -0      skycomponents/ecliptic.cpp  
 M  +3 -1      skycomponents/equator.cpp  
 M  +3 -0      skycomponents/horizoncomponent.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/data/classic.colors #1223415:1223416
@@ -15,7 +15,7 @@
 #FFFFFF :EqColor
 #666633 :EclColor
 #55AA33 :HorzColor
-#000022 :CompassColor
+#FFFFFF :CompassColor
 #445566 :GridColor
 #FFFFFF :BoxTextColor
 #FF0000 :BoxGrabColor
--- trunk/KDE/kdeedu/kstars/kstars/data/moonless-night.colors #1223415:1223416
@@ -15,7 +15,7 @@
 #909090 :EqColor
 #613d12 :EclColor
 #091f14 :HorzColor
-#909055 :CompassColor
+#a0a0a0 :CompassColor
 #445566 :GridColor
 #d2dbef :BoxTextColor
 #900000 :BoxGrabColor
--- trunk/KDE/kdeedu/kstars/kstars/data/night.colors #1223415:1223416
@@ -15,7 +15,7 @@
 #AA0000 :EqColor 
 #AA0000 :EclColor 
 #993333 :HorzColor
-#000000 :CompassColor
+#AA7777 :CompassColor
 #770000 :GridColor
 #AA0000 :BoxTextColor
 #FF0000 :BoxGrabColor
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/ecliptic.cpp #1223415:1223416
@@ -83,6 +83,9 @@
     const Projector*  proj = SkyMap::Instance()->projector();
     KStarsData*       data = KStarsData::Instance();
     SkyLabeler* skyLabeler = SkyLabeler::Instance();
+    // Set proper color for labels
+    QColor color( data->colorScheme()->colorNamed( "CompassColor" ) );
+    skyLabeler->setPen( QPen( QBrush(color), 1, Qt::SolidLine) );
     
     KSNumbers num( data->ut().djd() );
     dms elat(0.0), elng(0.0);
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/equator.cpp #1223415:1223416
@@ -86,9 +86,11 @@
     const Projector *proj  = SkyMap::Instance()->projector();
     KStarsData *data       = KStarsData::Instance();
     SkyLabeler* skyLabeler = SkyLabeler::Instance();
+    // Set proper color for labels
+    QColor color( data->colorScheme()->colorNamed( "CompassColor" ) );
+    skyLabeler->setPen( QPen( QBrush(color), 1, Qt::SolidLine) );
 
     KSNumbers num( data->ut().djd() );
-
     for( int ra = 0; ra < 23; ra += 2 ) {
         SkyPoint o( ra, 0.0 );
         o.EquatorialToHorizontal( data->lst(), data->geo()->lat() );
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/horizoncomponent.cpp #1223415:1223416
@@ -448,6 +448,9 @@
     KStarsData *data = KStarsData::Instance();
     
     SkyLabeler* skyLabeler = SkyLabeler::Instance();
+    // Set proper color for labels
+    QColor color( data->colorScheme()->colorNamed( "CompassColor" ) );
+    skyLabeler->setPen( QPen( QBrush(color), 1, Qt::SolidLine) );
     
     double az = -0.01;
     static QString name[8];