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

List:       kde-commits
Subject:    [kstars] kstars: Fix display of magnitude in details dialog and observing list.
From:       Jasem Mutlaq <mutlaqja () ikarustech ! com>
Date:       2015-01-27 15:25:45
Message-ID: E1YG81R-0001rk-Ez () scm ! kde ! org
[Download RAW message or body]

Git commit 762016de11e585ce285f74a739fbf1c1b938a20f by Jasem Mutlaq.
Committed on 27/01/2015 at 15:25.
Pushed by mutlaqja into branch 'master'.

Fix display of magnitude in details dialog and observing list.
BUGS:338121
FIXED-IN:15.04

M  +5    -2    kstars/dialogs/detaildialog.cpp
M  +11   -1    kstars/tools/observinglist.cpp

http://commits.kde.org/kstars/762016de11e585ce285f74a739fbf1c1b938a20f

diff --git a/kstars/dialogs/detaildialog.cpp b/kstars/dialogs/detaildialog.cpp
index d5b4d59..eb32746 100644
--- a/kstars/dialogs/detaildialog.cpp
+++ b/kstars/dialogs/detaildialog.cpp
@@ -209,14 +209,17 @@ void DetailDialog::createGeneralTab()
             ((KSMoon *)selectedObject)->updateMag();
         }
         
+        // JM: Shouldn't we use the calculated magnitude? Disabling the following
+        /*
         if(selectedObject->type() == SkyObject::COMET){
             Data->Magnitude->setText( xi18nc( "number in magnitudes", "%1 mag" ,
                                              QLocale().toString( ((KSComet \
*)selectedObject)->getTotalMagnitudeParameter(), 'f', 2 ) ) );  //show to hundredth \
place +
         }
-        else{
+        else{*/
             Data->Magnitude->setText( xi18nc( "number in magnitudes", "%1 mag" ,
                                              QLocale().toString( ps->mag(), 'f', 2 ) \
                ) );  //show to hundredth place
-        }
+        //}
 
         //Distance from Earth.  The moon requires a unit conversion
         if ( ps->name() == "Moon" ) {
diff --git a/kstars/tools/observinglist.cpp b/kstars/tools/observinglist.cpp
index 976cbf7..537fb21 100644
--- a/kstars/tools/observinglist.cpp
+++ b/kstars/tools/observinglist.cpp
@@ -256,9 +256,19 @@ void ObservingList::slotAddObject( SkyObject *obj, bool session, \
bool update ) {  return;
     }
 
+    // JM: If we are loading observing list from disk, solar system objects \
magnitudes are not calculated until later +    // Therefore, we manual invoke \
updateCoords to force computation of magnitude. +    if ( (obj->type() == \
SkyObject::COMET || obj->type() == SkyObject::ASTEROID || obj->type() == \
SkyObject::MOON || +          obj->type() == SkyObject::PLANET) && obj->mag() == 0)
+    {
+        KSNumbers num( dt.djd() );
+        dms LST = geo->GSTtoLST( dt.gst() );
+        obj->updateCoords(&num, true, geo->lat(), &LST, true);
+    }
+
     QString smag = "--";
     if (  - 30.0 < obj->mag() && obj->mag() < 90.0 )
-        smag = QString::number( obj->mag(), 'g', 2 ); // The lower limit to avoid \
display of unrealistic comet magnitudes +        smag = QString::number( obj->mag(), \
'f', 2 ); // The lower limit to avoid display of unrealistic comet magnitudes  
     SkyPoint p = obj->recomputeCoords( dt, geo );
 


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