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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkstars=5D_kstars/skyobjects=3A_Just_assign_booleans?=
From:       Khudyakov Alexey <alexey.skladnoy () gmail ! com>
Date:       2011-05-07 18:58:59
Message-ID: 20110507185859.B3CB6A60BB () git ! kde ! org
[Download RAW message or body]

Git commit f9d4db1a13373ab07920d07ca37c9038d877dd33 by Khudyakov Alexey.
Committed on 07/05/2011 at 20:56.
Pushed by khudyakov into branch 'master'.

Just assign booleans

M  +3    -17   kstars/skyobjects/satellite.cpp     

http://commits.kde.org/kstars/f9d4db1a13373ab07920d07ca37c9038d877dd33

diff --git a/kstars/skyobjects/satellite.cpp b/kstars/skyobjects/satellite.cpp
index 6addebb..5a17d9b 100644
--- a/kstars/skyobjects/satellite.cpp
+++ b/kstars/skyobjects/satellite.cpp
@@ -85,10 +85,7 @@ Satellite::Satellite( const QString name, const QString line1, const QString lin
     setType( SkyObject::SATELLITE );
     setMag( 0.0 );
 
-    if ( Options::selectedSatellites().contains( name ) )
-        m_is_selected = true;
-    else
-        m_is_selected = false;
+    m_is_selected = Options::selectedSatellites().contains( name )
 
     // Convert TLE epoch to Julian date
     double day = modf( m_epoch * 1.e-3, &m_epoch_year) * 1.e3;
@@ -1154,19 +1151,8 @@ int Satellite::sgp4( double tsince )
     depth = sd_earth - sd_sun - delta;
     KSSun *sun = (KSSun*)data->skyComposite()->findByName( "Sun" );
 
-    if( sd_earth < sd_sun )
-        m_is_eclipsed = false;
-    else {
-        if ( depth >= 0 )
-            m_is_eclipsed = true;
-        else
-            m_is_eclipsed = false;
-    }
-
-    if ( !m_is_eclipsed && sun->alt().Degrees() <= -12.0 && elevation >= 0.0 )
-        m_is_visible = true;
-    else
-        m_is_visible = false;
+    m_is_eclipsed = sd_earth >= sd_sun  &&  depth >= 0
+    m_is_visible  = !m_is_eclipsed && sun->alt().Degrees() <= -12.0 && elevation >= 0.0;
 
     return( 0 );
 }

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