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

List:       kde-commits
Subject:    KDE/kdeedu/kstars/kstars/skycomponents
From:       Alexey Khudyakov <alexey.skladnoy () gmail ! com>
Date:       2011-03-02 21:06:57
Message-ID: 20110302210657.6053EAC8C4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1223410 by khudyakov:

Minor cleanup

 M  +3 -6      ecliptic.cpp  
 M  +2 -4      equator.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/ecliptic.cpp #1223409:1223410
@@ -95,15 +95,12 @@
         elng.setH( ra );
         SkyPoint* o = new SkyPoint();
         o->setFromEcliptic( num.obliquity(), &elng, &elat );
-        o->setRA0( o->ra().Hours() );
-        o->setDec0( o->dec().Degrees() );
+        o->setRA0(  o->ra()  );
+        o->setDec0( o->dec() );
         o->EquatorialToHorizontal( data->lst(), data->geo()->lat() );
         cpoint = proj->toScreen( o, false, &visible );
         if ( proj->checkVisibility( o ) && visible ) {
-            if ( o->ra().Degrees() < 0 )
-                label.setNum( o->ra().Degrees() + 360 );
-            else
-                label.setNum( o->ra().Degrees() );
+            label.setNum( o->ra().reduce().Degrees() );
             skyLabeler->drawGuideLabel( cpoint, label, 0.0 );
         }
     }
--- trunk/KDE/kdeedu/kstars/kstars/skycomponents/equator.cpp #1223409:1223410
@@ -82,7 +82,6 @@
 
 void Equator::drawCompassLabels() {
     QPointF cpoint;
-    bool visible;
     QString label;
 
     const Projector *proj = SkyMap::Instance()->projector();
@@ -90,14 +89,13 @@
     SkyLabeler* skyLabeler = SkyLabeler::Instance();
 
     KSNumbers num( data->ut().djd() );
-    dms elat(0.0), elng(0.0);
 
     for( int ra = 0; ra < 23; ra += 2 ) {
-        elng.setH( ra );
         SkyPoint* o = new SkyPoint( ra, 0.0 );
         o->EquatorialToHorizontal( data->lst(), data->geo()->lat() );
+        bool visible;
         cpoint = proj->toScreen( o, false, &visible );
-        if ( proj->checkVisibility( o ) && visible ) {
+        if ( visible && proj->checkVisibility( o ) ) {
             label.setNum( o->ra().hour() );
             skyLabeler->drawGuideLabel( cpoint, label, 0.0 );
         }
[prev in list] [next in list] [prev in thread] [next in thread]