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

[Jason Harris]

SVN commit 762902 by harris:

Fixing bug #132994: We come to bury Pluto, not praise him.

We have already been deriving Pluto from the KSAsteroid class 
for practical reasons.  With this change, Pluto is now labeled 
an "asteroid" in the details dialog.  

BUG: 132994
CCMAIL: kstars-devel at kde.org



 M  +5 -6      ksasteroid.h  
 M  +1 -1      ksplanetbase.cpp  
 M  +1 -2      kspluto.cpp  


--- trunk/KDE/kdeedu/kstars/kstars/ksasteroid.h #762901:762902
@@ -20,6 +20,10 @@
 
 #include "ksplanetbase.h"
 
+class KStarsData;
+class KSNumbers;
+class dms;
+
 /**@class KSAsteroid
 	*@short A subclass of KSPlanetBase that implements asteroids.
 	*
@@ -41,11 +45,6 @@
 	*@author Jason Harris
 	*@version 1.0
 	*/
-
-class KStarsData;
-class KSNumbers;
-class dms;
-
 class KSAsteroid : public KSPlanetBase
 {
 public:
@@ -78,7 +77,7 @@
     	*@p N the longitude of the orbit's ascending node
     	*@p M the mean anomaly for the Julian Day
     	*@p H absolute magnitude
-	*@p G slope parameter
+      *@p G slope parameter
     	*/
     KSAsteroid( KStarsData *kd, const QString &s, const QString &image_file,
                 long double JD, double a, double e, dms i, dms w, dms N, dms M, double H, double G );
--- trunk/KDE/kdeedu/kstars/kstars/ksplanetbase.cpp #762901:762902
@@ -91,7 +91,7 @@
 bool KSPlanetBase::isMajorPlanet() const {
     if ( name() == "Mercury" || name() == "Venus" || name() == "Mars" ||
             name() == "Jupiter" || name() == "Saturn" || name() == "Uranus" ||
-            name() == "Neptune" || name() == "Pluto" )
+            name() == "Neptune" )
         return true;
     return false;
 }
--- trunk/KDE/kdeedu/kstars/kstars/kspluto.cpp #762901:762902
@@ -35,7 +35,7 @@
 KSPluto::KSPluto(KStarsData *kd, const QString &fn, double pSize )
         : KSAsteroid( kd, i18n("Pluto"), fn, J2000,
                       39.48168677, 0.24880766, dms(17.14175), dms(113.76329),
-              dms(110.30347), dms(14.86205), 1.0 ) {
+											dms(110.30347), dms(14.86205), 1.0, 0.0 ) {
     //Initialize the base orbital element values for J2000:
     a0 = 39.48168677; //semi-major axis (AU)
     e0 = 0.24880766;  //eccentricity
@@ -53,7 +53,6 @@
     M1 = 522880.15/3600.; // dM/dt (degrees/century)
 
     setPhysicalSize( pSize );
-    setType( 2 ); //It's really a planet, not an asteroid
 }
 
 KSPluto::~KSPluto() {