Exoplanet.hpp   Exoplanet.hpp 
skipping to change at line 36 skipping to change at line 36
#include <QList> #include <QList>
#include <QDateTime> #include <QDateTime>
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "StelFader.hpp" #include "StelFader.hpp"
//! @ingroup exoplanets //! @ingroup exoplanets
typedef struct typedef struct
{ {
QString planetName; //! Exoplanet name QString planetName; //! Exoplanet designation
float mass; //! Exoplanet mass (Mjup) QString planetProperName; //! Exoplanet proper name
float radius; //! Exoplanet radius (Rjup) float mass; //! Exoplanet mass (Mjup)
float period; //! Exoplanet period (days) float radius; //! Exoplanet radius (Rjup)
float semiAxis; //! Exoplanet orbit semi-major axis (AU) float period; //! Exoplanet period (days)
float eccentricity; //! Exoplanet orbit eccentricity float semiAxis; //! Exoplanet orbit semi-major axis
float inclination; //! Exoplanet orbit inclination (AU)
float angleDistance; //! Exoplanet angle distance float eccentricity; //! Exoplanet orbit eccentricity
int discovered; //! Exoplanet discovered year float inclination; //! Exoplanet orbit inclination
QString pclass; //! Exoplanet classification from host star float angleDistance; //! Exoplanet angle distance
spectral type (F, G, K, M), habitable zone (hot, warm, cold) and size (mini int discovered; //! Exoplanet discovered year
terran, subterran, terran, superterran, jovian, neptunian) QString pclass; //! Exoplanet classification from ho
int EqTemp; //! Exoplanet equilibrium temperature in kel st star spectral type (F, G, K, M), habitable zone (hot, warm, cold) and si
vins (K) assuming a 0.3 bond albedo (Earth = 255 K). ze (miniterran, subterran, terran, superterran, jovian, neptunian)
int ESI; //! Exoplanet Earth Similarity Index int EqTemp; //! Exoplanet equilibrium temperatur
e in kelvins (K) assuming a 0.3 bond albedo (Earth = 255 K).
int ESI; //! Exoplanet Earth Similarity Index
} exoplanetData; } exoplanetData;
class StelPainter; class StelPainter;
//! @class Exoplanet //! @class Exoplanet
//! A exoplanet object represents one pulsar on the sky. //! A exoplanet object represents one pulsar on the sky.
//! Details about the exoplanets are passed using a QVariant which contains //! Details about the exoplanets are passed using a QVariant which contains
//! a map of data from the json file. //! a map of data from the json file.
//! @ingroup exoplanets //! @ingroup exoplanets
skipping to change at line 94 skipping to change at line 95
{ {
return XYZ; return XYZ;
} }
//! Get the visual magnitude //! Get the visual magnitude
virtual float getVMagnitude(const StelCore* core) const; virtual float getVMagnitude(const StelCore* core) const;
//! Get the angular size of pulsar //! Get the angular size of pulsar
virtual double getAngularSize(const StelCore* core) const; virtual double getAngularSize(const StelCore* core) const;
//! Get the localized name of pulsar //! Get the localized name of pulsar
virtual QString getNameI18n(void) const; virtual QString getNameI18n(void) const;
//! Get the english name //! Get the english name
virtual QString getEnglishName(void) const virtual QString getEnglishName(void) const;
{
return designation; QString getDesignation(void) const;
} QStringList getExoplanetsEnglishNames(void) const;
QStringList getExoplanetsNamesI18n(void) const;
QStringList getExoplanetsDesignations(void) const;
bool isDiscovered(const StelCore* core); bool isDiscovered(const StelCore* core);
void update(double deltaTime); void update(double deltaTime);
int getCountExoplanets(void) const int getCountExoplanets(void) const
{ {
return EPCount; return EPCount;
} }
int getCountHabitableExoplanets(void) const int getCountHabitableExoplanets(void) const
{ {
return PHEPCount; return PHEPCount;
} }
QList<double> getData(int mode)
{
switch(mode)
{
case 1:
return semiAxisList;
break;
case 2:
return massList;
break;
case 3:
return radiusList;
break;
case 4:
return periodList;
break;
case 5:
return angleDistanceList;
break;
default:
return eccentricityList;
}
}
private: private:
QString getPlanetaryClassI18n(QString ptype) const; QString getPlanetaryClassI18n(QString ptype) const;
bool initialized; bool initialized;
Vec3d XYZ; // holds J2000 position Vec3d XYZ; // holds J2000 position
static StelTextureSP hintTexture; static StelTextureSP hintTexture;
static StelTextureSP markerTexture; static StelTextureSP markerTexture;
skipping to change at line 135 skipping to change at line 162
static bool timelineMode; static bool timelineMode;
static bool habitableMode; static bool habitableMode;
void draw(StelCore* core, StelPainter *painter); void draw(StelCore* core, StelPainter *painter);
int EPCount; int EPCount;
int PHEPCount; int PHEPCount;
//! Variables for description of properties of exoplanets //! Variables for description of properties of exoplanets
QString designation; //! The designation of the h ost star QString designation; //! The designation of the h ost star
QString starProperName; //! The proper name of the h ost star
float RA; //! J2000 right ascension of host star float RA; //! J2000 right ascension of host star
float DE; //! J2000 declination of hos t star float DE; //! J2000 declination of hos t star
float distance; //! Distance to star in pc float distance; //! Distance to star in pc
QString stype; //! Spectral type of star QString stype; //! Spectral type of star
float smass; //! Mass of star in Msun float smass; //! Mass of star in Msun
float smetal; //! [Fe/H] of star float smetal; //! [Fe/H] of star
float Vmag; //! Visual magnitude of star float Vmag; //! Visual magnitude of star
float sradius; //! Radius of star in Rsun float sradius; //! Radius of star in Rsun
int effectiveTemp; //! Effective temperature of star in K int effectiveTemp; //! Effective temperature of star in K
bool hasHabitableExoplanets; //! Has potential habitable exoplanets bool hasHabitableExoplanets; //! Has potential habitable exoplanets
QList<exoplanetData> exoplanets; //! List of exoplanets QList<exoplanetData> exoplanets; //! List of exoplanets
LinearFader labelsFader; QStringList englishNames, translatedNames, exoplanetDesignations;
QList<double> eccentricityList, semiAxisList, massList, radiusList,
periodList, angleDistanceList;
LinearFader labelsFader;
}; };
#endif // _EXOPLANET_HPP_ #endif // _EXOPLANET_HPP_
 End of changes. 6 change blocks. 
20 lines changed or deleted 53 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/