MeteorShower.hpp   MeteorShower.hpp 
skipping to change at line 40 skipping to change at line 40
//! @class MeteorShower //! @class MeteorShower
//! A MeteorShower object represents one meteor shower on the sky. //! A MeteorShower object represents one meteor shower on the sky.
//! Details about the meteor showers are passed using a QVariant which cont ains //! Details about the meteor showers are passed using a QVariant which cont ains
//! a map of data from the json file. //! a map of data from the json file.
//! @ingroup meteorShowers //! @ingroup meteorShowers
class MeteorShower : public StelObject class MeteorShower : public StelObject
{ {
public: public:
static const QString METEORSHOWER_TYPE;
//! @enum Meteor Shower status. //! @enum Meteor Shower status.
enum Status { enum Status {
INVALID, // not initialized properly INVALID, // not initialized properly
UNDEFINED, // it's loaded but with 'activity' undefin ed UNDEFINED, // it's loaded but with 'activity' undefin ed
INACTIVE, // inactive radiant INACTIVE, // inactive radiant
ACTIVE_CONFIRMED, // active radiant - confirmed data ACTIVE_CONFIRMED, // active radiant - confirmed data
ACTIVE_GENERIC // active radiant - generic data ACTIVE_GENERIC // active radiant - generic data
}; };
//! @struct Activity //! @struct Activity
skipping to change at line 108 skipping to change at line 110
QDate getPeak() { return m_activity.peak; } QDate getPeak() { return m_activity.peak; }
//! Gets the current ZHR //! Gets the current ZHR
//! @return ZHR //! @return ZHR
int getZHR() { return m_activity.zhr; } int getZHR() { return m_activity.zhr; }
// //
// Methods defined in StelObject class // Methods defined in StelObject class
// //
virtual QString getInfoString(const StelCore* core, const InfoString Group& flags) const; virtual QString getInfoString(const StelCore* core, const InfoString Group& flags) const;
//! Return a map like StelObject, but with a few extra tags: //! Return a map like StelObject, but with a few extra tags:
// TODO: Describe the fields! // TODO: Describe the fields!
//! - status //! - status
//! - id //! - id
//! - type (translated string "meteor shower") //! - type (translated string "meteor shower")
//! - speed (km/s) //! - speed (km/s)
//! - pop-idx (population index) //! - pop-idx (population index)
//! - parent //! - parent
//! - zhr-max (information string) //! - zhr-max (information string)
virtual QVariantMap getInfoMap(const StelCore *core) const; virtual QVariantMap getInfoMap(const StelCore *core) const;
virtual QString getType(void) const { return "MeteorShower"; } virtual QString getType(void) const { return METEORSHOWER_TYPE; }
virtual QString getID(void) const { return m_showerID; }
virtual QString getEnglishName(void) const { return m_designation.tr immed(); } virtual QString getEnglishName(void) const { return m_designation.tr immed(); }
virtual QString getNameI18n(void) const { return q_(m_designation.tr immed()); } virtual QString getNameI18n(void) const { return q_(m_designation.tr immed()); }
virtual Vec3d getJ2000EquatorialPos(const StelCore*) const { return m_position; } virtual Vec3d getJ2000EquatorialPos(const StelCore*) const { return m_position; }
virtual float getSelectPriority(const StelCore*) const { return -4.0 ; } virtual float getSelectPriority(const StelCore*) const { return -4.0 ; }
virtual Vec3f getInfoColor(void) const; virtual Vec3f getInfoColor(void) const;
virtual double getAngularSize(const StelCore*) const { return 0.001; } virtual double getAngularSize(const StelCore*) const { return 0.001; }
private: private:
MeteorShowersMgr* m_mgr; //! MeteorShowersMgr instance MeteorShowersMgr* m_mgr; //! MeteorShowersMgr instance
Status m_status; //! Meteor shower status Status m_status; //! Meteor shower status
skipping to change at line 161 skipping to change at line 165
//! Draws the radiant //! Draws the radiant
void drawRadiant(StelCore* core); void drawRadiant(StelCore* core);
//! Draws all active meteors //! Draws all active meteors
void drawMeteors(StelCore* core); void drawMeteors(StelCore* core);
//! Calculates the ZHR using normal distribution //! Calculates the ZHR using normal distribution
//! @param current julian day //! @param current julian day
int calculateZHR(const double& currentJD); int calculateZHR(const double& currentJD);
//! Gets the solar longitude for a specified date //! Gets the mean solar longitude for a specified date (approximate formula)
//! @param date QDate //! @param date QDate
//! @return solar longitude in degree //! @return solar longitude in degree
static QString getSolarLongitude(QDate date); static QString getSolarLongitude(QDate date);
}; };
#endif /*_METEORSHOWER_HPP_*/ #endif /*_METEORSHOWER_HPP_*/
 End of changes. 4 change blocks. 
2 lines changed or deleted 6 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/