StelObject.hpp   StelObject.hpp 
skipping to change at line 38 skipping to change at line 38
class StelCore; class StelCore;
//! The base abstract class for sky objects used in Stellarium like Stars, Planets, Constellations etc... //! The base abstract class for sky objects used in Stellarium like Stars, Planets, Constellations etc...
//! Normally you should use StelObjectP instead of StelObject* which have b y default the same behaviour, //! Normally you should use StelObjectP instead of StelObject* which have b y default the same behaviour,
//! but which can be added reference counting if needed. //! but which can be added reference counting if needed.
//! @sa StelObjectP //! @sa StelObjectP
class StelObject : public StelRegionObject class StelObject : public StelRegionObject
{ {
public: public:
//! @enum InfoStringGroup used as named bitfield flags as specifiers to //! @enum InfoStringGroupFlags used as named bitfield flags as speci fiers to
//! filter results of getInfoString. The precise definition of these should //! filter results of getInfoString. The precise definition of these should
//! be documented in the getInfoString documentation for the derived classes //! be documented in the getInfoString documentation for the derived classes
//! for all specifiers which are defined in that derivative. //! for all specifiers which are defined in that derivative.
//! Use InfoStringGroup instead. //! Use InfoStringGroup instead.
enum InfoStringGroupFlags enum InfoStringGroupFlags
{ {
Name = 0x00000001, //!< An object's name Name = 0x00000001, //!< An object's name
CatalogNumber = 0x00000002, //!< Catalog numbers CatalogNumber = 0x00000002, //!< Catalog numbers
Magnitude = 0x00000004, //!< Magnitude related data Magnitude = 0x00000004, //!< Magnitude related data
RaDecJ2000 = 0x00000008, //!< The equatorial position (J2 000 ref) RaDecJ2000 = 0x00000008, //!< The equatorial position (J2 000 ref)
RaDecOfDate = 0x00000010, //!< The equatorial position (of date) RaDecOfDate = 0x00000010, //!< The equatorial position (of date)
AltAzi = 0x00000020, //!< The position (Altitude/Azim uth) AltAzi = 0x00000020, //!< The position (Altitude/Azim uth)
Distance = 0x00000040, //!< Info about an object's dist ance Distance = 0x00000040, //!< Info about an object's dist ance
Size = 0x00000080, //!< Info about an object's size Size = 0x00000080, //!< Info about an object's size
Extra1 = 0x00000100, //!< Derived class-specific extr a fields Extra1 = 0x00000100, //!< Derived class-specific extr a fields
Extra2 = 0x00000200, //!< Derived class-specific extr a fields Extra2 = 0x00000200, //!< Derived class-specific extr a fields
Extra3 = 0x00000400, //!< Derived class-specific extr a fields Extra3 = 0x00000400, //!< Derived class-specific extr a fields
PlainText = 0x00000800, //!< Strip HTML tags from output PlainText = 0x00000800, //!< Strip HTML tags from output
HourAngle = 0x00001000, //!< The hour angle + DE (of da te) HourAngle = 0x00001000, //!< The hour angle + DE (of da te)
AbsoluteMagnitude = 0x00002000 //!< The absolute magnitude AbsoluteMagnitude = 0x00002000, //!< The absolute magnitude
GalCoordJ2000 = 0x00004000 //!< The galactic position (
J2000 ref)
}; };
typedef QFlags<InfoStringGroupFlags> InfoStringGroup; typedef QFlags<InfoStringGroupFlags> InfoStringGroup;
Q_FLAGS(InfoStringGroup) Q_FLAGS(InfoStringGroup)
//! A pre-defined set of specifiers for the getInfoString flags argu ment to getInfoString //! A pre-defined set of specifiers for the getInfoString flags argu ment to getInfoString
static const InfoStringGroupFlags AllInfo = (InfoStringGroupFlags)(N ame|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Ext ra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude); static const InfoStringGroupFlags AllInfo = (InfoStringGroupFlags)(N ame|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Ext ra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude|GalCoordJ2000);
//! A pre-defined set of specifiers for the getInfoString flags argu ment to getInfoString //! A pre-defined set of specifiers for the getInfoString flags argu ment to getInfoString
static const InfoStringGroupFlags ShortInfo = (InfoStringGroupFlags) (Name|CatalogNumber|Magnitude|RaDecJ2000); static const InfoStringGroupFlags ShortInfo = (InfoStringGroupFlags) (Name|CatalogNumber|Magnitude|RaDecJ2000);
virtual ~StelObject() {} virtual ~StelObject() {}
//! Default implementation of the getRegion method. //! Default implementation of the getRegion method.
//! Return the spatial region of the object. //! Return the spatial region of the object.
virtual SphericalRegionP getRegion() const {return SphericalRegionP( new SphericalPoint(getJ2000EquatorialPos(NULL)));} virtual SphericalRegionP getRegion() const {return SphericalRegionP( new SphericalPoint(getJ2000EquatorialPos(NULL)));}
//! Write I18n information about the object in QString. //! Write I18n information about the object in QString.
skipping to change at line 99 skipping to change at line 100
virtual QString getNameI18n() const = 0; virtual QString getNameI18n() const = 0;
//! Get observer-centered equatorial coordinates at equinox J2000 //! Get observer-centered equatorial coordinates at equinox J2000
virtual Vec3d getJ2000EquatorialPos(const StelCore* core) const = 0; virtual Vec3d getJ2000EquatorialPos(const StelCore* core) const = 0;
//! Get observer-centered equatorial coordinate at the current equin ox //! Get observer-centered equatorial coordinate at the current equin ox
//! The frame has it's Z axis at the planet's current rotation axis //! The frame has it's Z axis at the planet's current rotation axis
//! At time 2000-01-01 this frame is almost the same as J2000, but O NLY if the observer is on earth //! At time 2000-01-01 this frame is almost the same as J2000, but O NLY if the observer is on earth
Vec3d getEquinoxEquatorialPos(const StelCore* core) const; Vec3d getEquinoxEquatorialPos(const StelCore* core) const;
//! Get observer-centered galactic coordinates at equinox J2000
Vec3d getJ2000GalacticPos(const StelCore* core) const;
//! Get observer-centered hour angle + declination (at current equin ox) //! Get observer-centered hour angle + declination (at current equin ox)
//! It is the geometric position, i.e. without taking refraction eff ect into account. //! It is the geometric position, i.e. without taking refraction eff ect into account.
//! The frame has its Z axis at the planet's current rotation axis //! The frame has its Z axis at the planet's current rotation axis
Vec3d getSideralPosGeometric(const StelCore* core) const; Vec3d getSideralPosGeometric(const StelCore* core) const;
//! Get observer-centered hour angle + declination (at current equin ox) //! Get observer-centered hour angle + declination (at current equin ox)
//! It is the apparent position, i.e. taking the refraction effect i nto account. //! It is the apparent position, i.e. taking the refraction effect i nto account.
//! The frame has its Z axis at the planet's current rotation axis //! The frame has its Z axis at the planet's current rotation axis
Vec3d getSideralPosApparent(const StelCore* core) const; Vec3d getSideralPosApparent(const StelCore* core) const;
 End of changes. 4 change blocks. 
3 lines changed or deleted 8 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/