StelObject.hpp   StelObject.hpp 
skipping to change at line 61 skipping to change at line 61
Magnitude = 0x00000004, //!< Magnitude related data Magnitude = 0x00000004, //!< Magnitude related data
RaDecJ2000 = 0x00000008, //!< The equatorial po sition (J2000 ref) RaDecJ2000 = 0x00000008, //!< The equatorial po sition (J2000 ref)
RaDecOfDate = 0x00000010, //!< The equatorial po sition (of date) RaDecOfDate = 0x00000010, //!< The equatorial po sition (of date)
AltAzi = 0x00000020, //!< The position (Alt itude/Azimuth) AltAzi = 0x00000020, //!< The position (Alt itude/Azimuth)
Distance = 0x00000040, //!< Info about an obj ect's distance Distance = 0x00000040, //!< Info about an obj ect's distance
Size = 0x00000080, //!< Info about an obj ect's size Size = 0x00000080, //!< Info about an obj ect's size
Extra = 0x00000100, //!< Derived class-spe cific extra fields Extra = 0x00000100, //!< Derived class-spe cific extra fields
HourAngle = 0x00000200, //!< The hour angle + DE (of date) HourAngle = 0x00000200, //!< The hour angle + DE (of date)
AbsoluteMagnitude = 0x00000400, //!< The absolute magn itude AbsoluteMagnitude = 0x00000400, //!< The absolute magn itude
GalacticCoord = 0x00000800, //!< The galactic posi tion GalacticCoord = 0x00000800, //!< The galactic posi tion
ObjectType = 0x00001000, //!< The type of the o SupergalacticCoord = 0x00001000, //!< The supergalactic
bject (star, planet, etc.) position
EclipticCoord = 0x00002000, //!< The ecliptic posi ObjectType = 0x00002000, //!< The type of the o
tion bject (star, planet, etc.)
EclipticCoordXYZ = 0x00004000, //!< The ecliptic posi EclipticCoordJ2000 = 0x00004000, //!< The ecliptic posi
tion, XYZ of VSOP87A (used mainly for debugging, not public) tion (J2000.0 ref) [+ XYZ of VSOP87A (used mainly for debugging, not public
NoFont = 0x00008000, )]
PlainText = 0x00010000, //!< Strip HTML tags EclipticCoordOfDate = 0x00008000, //!< The ecliptic posi
from output tion (of date)
IAUConstellation = 0x00010000, //!< Three-letter cons
tellation code (And, Boo, Cas, ...)
NoFont = 0x00020000,
PlainText = 0x00040000, //!< Strip HTML tags
from output
// TODO GZ // TODO GZ
// RaDecJ2000Planetocentric = 0x00020000, //!< The planetocent ric equatorial position (J2000 ref) [Mostly to compare with almanacs] // RaDecJ2000Planetocentric = 0x00020000, //!< The planetocent ric equatorial position (J2000 ref) [Mostly to compare with almanacs]
// RaDecOfDatePlanetocentric = 0x00040000 //!< The planetocent ric equatorial position (of date) // RaDecOfDatePlanetocentric = 0x00040000 //!< The planetocent ric equatorial position (of date)
// // and split Ecliptical into
// EclipticCoordJ2000 = 0x00002000, //!< The ecliptic posi
tion w.r.t. ecliptic of eq.J2000.0
// EclipticCoordOfDate = 0x00002000, //!< The ecliptic posi
tion w.r.t. ecliptic of eq. of date
}; };
Q_DECLARE_FLAGS(InfoStringGroup, InfoStringGroupFlags) Q_DECLARE_FLAGS(InfoStringGroup, InfoStringGroupFlags)
//! 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 ra|HourAngle| static const InfoStringGroupFlags AllInfo = (InfoStringGroupFlags)(N ame|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Ext ra|HourAngle|
A A
bsoluteMagnitude|GalacticCoord|ObjectType|EclipticCoord|EclipticCoordXYZ); bsoluteMagnitude|GalacticCoord|SupergalacticCoord|ObjectType|EclipticCoordJ
2000|
E
clipticCoordOfDate|IAUConstellation);
//! 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)));}
//! Default implementation of the getPointInRegion method. //! Default implementation of the getPointInRegion method.
skipping to change at line 120 skipping to change at line 120
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 //! Get observer-centered galactic coordinates
Vec3d getGalacticPos(const StelCore* core) const; Vec3d getGalacticPos(const StelCore* core) const;
//! Get observer-centered supergalactic coordinates
Vec3d getSupergalacticPos(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 getSiderealPosGeometric(const StelCore* core) const; Vec3d getSiderealPosGeometric(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 getSiderealPosApparent(const StelCore* core) const; Vec3d getSiderealPosApparent(const StelCore* core) const;
 End of changes. 4 change blocks. 
16 lines changed or deleted 22 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/