StelObject.hpp   StelObject.hpp 
skipping to change at line 66 skipping to change at line 66
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
SupergalacticCoord = 0x00001000, //!< The supergalactic position SupergalacticCoord = 0x00001000, //!< The supergalactic position
ObjectType = 0x00002000, //!< The type of the o bject (star, planet, etc.) ObjectType = 0x00002000, //!< The type of the o bject (star, planet, etc.)
EclipticCoordJ2000 = 0x00004000, //!< The ecliptic posi tion (J2000.0 ref) [+ XYZ of VSOP87A (used mainly for debugging, not public )] EclipticCoordJ2000 = 0x00004000, //!< The ecliptic posi tion (J2000.0 ref) [+ XYZ of VSOP87A (used mainly for debugging, not public )]
EclipticCoordOfDate = 0x00008000, //!< The ecliptic posi tion (of date) EclipticCoordOfDate = 0x00008000, //!< The ecliptic posi tion (of date)
IAUConstellation = 0x00010000, //!< Three-letter cons tellation code (And, Boo, Cas, ...) IAUConstellation = 0x00010000, //!< Three-letter cons tellation code (And, Boo, Cas, ...)
NoFont = 0x00020000, SiderealTime = 0x00020000, //!< Mean and Apparent
PlainText = 0x00040000, //!< Strip HTML tags Sidereal Time
from output NoFont = 0x00040000,
PlainText = 0x00080000, //!< 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)
}; };
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 bsoluteMagnitude|GalacticCoord|SupergalacticCoord|ObjectType|EclipticCoordJ 2000| A bsoluteMagnitude|GalacticCoord|SupergalacticCoord|ObjectType|EclipticCoordJ 2000|
E clipticCoordOfDate|IAUConstellation); E clipticCoordOfDate|IAUConstellation|SiderealTime);
//! 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 100 skipping to change at line 101
virtual Vec3d getPointInRegion() const {return getJ2000EquatorialPos (NULL);} virtual Vec3d getPointInRegion() const {return getJ2000EquatorialPos (NULL);}
//! Write I18n information about the object in QString. //! Write I18n information about the object in QString.
//! @param core the StelCore object to use //! @param core the StelCore object to use
//! @param flags a set of InfoStringGroup flags which are used to //! @param flags a set of InfoStringGroup flags which are used to
//! filter the return value - including specified types of informati on //! filter the return value - including specified types of informati on
//! and altering the output format. //! and altering the output format.
//! @return an HTML string containing information about the StelObje ct. //! @return an HTML string containing information about the StelObje ct.
virtual QString getInfoString(const StelCore *core, const InfoString Group& flags=StelObject::AllInfo) const = 0; virtual QString getInfoString(const StelCore *core, const InfoString Group& flags=StelObject::AllInfo) const = 0;
//! Return a key/value map with data about an object's position, mag
nitude and so on. Useful in a context like scripting.
//! Derived objects can add their own special information tags.
//! @param core the current StelCore
//! @return a map of object data. Keys:
//! - altitude : apparent altitude angle in decimal degrees
//! - azimuth : apparent azimuth angle in decimal degrees
//! - altitude-geometric : geometric altitude angle in decimal degre
es
//! - azimuth-geometric : geometric azimuth angle in decimal degrees
//! - ra : right ascension angle (current date frame) in decimal deg
rees
//! - dec : declination angle (current date frame) in decimal degree
s
//! - raJ2000 : right ascension angle (J2000 frame) in decimal degre
es
//! - decJ2000 : declination angle (J2000 frame) in decimal degrees
//! - glong : galactic longitude in decimal degrees
//! - glat : galactic latitude in decimal degrees
//! - sglong : supergalactic longitude in decimal degrees
//! - sglat : supergalactic latitude in decimal degrees
//! - elong : ecliptic longitude in decimal degrees (on Earth only!)
//! - elat : ecliptic latitude in decimal degrees (on Earth only!)
//! - elongJ2000 : ecliptic longitude (Earth's J2000 frame) in decim
al degrees
//! - elatJ2000 : ecliptic latitude (Earth's J2000 frame) in decimal
degrees
//! - vmag : visual magnitude
//! - vmage : visual magnitude (after atmospheric extinction)
//! - size: angular size in radians
//! - size-dd : angular size in decimal degrees
//! - size-deg : angular size in decimal degrees (formatted string)
//! - size-dms : angular size in DMS format
//! - name : english name of the object
//! - localized-name : localized name
virtual QVariantMap getInfoMap(const StelCore *core) const;
//! Return object's type. It should be the name of the class. //! Return object's type. It should be the name of the class.
virtual QString getType() const = 0; virtual QString getType() const = 0;
//! Return object's name in english //! Return object's name in english
virtual QString getEnglishName() const = 0; virtual QString getEnglishName() const = 0;
//! Return translated object's name //! Return translated object's name
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 its 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;
//! Like getEquinoxEquatorialPos(core), but always adds refraction c
orrection to the position.
Vec3d getEquinoxEquatorialPosApparent(const StelCore* core) const;
//! Like getEquinoxEquatorialPos(core), but adds refraction correcti
on to the position if atmosphere is active.
Vec3d getEquinoxEquatorialPosAuto(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 //! Get observer-centered supergalactic coordinates
Vec3d getSupergalacticPos(const StelCore* core) const; 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;
//! Get observer-centered alt/az position //! Get observer-centered alt/az position
//! 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 it's Z axis at the zenith //! The frame has its Z axis at the zenith
Vec3d getAltAzPosGeometric(const StelCore* core) const; Vec3d getAltAzPosGeometric(const StelCore* core) const;
//! Get observer-centered alt/az position //! Get observer-centered alt/az position
//! 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 it's Z axis at the zenith //! The frame has its Z axis at the zenith
Vec3d getAltAzPosApparent(const StelCore* core) const; Vec3d getAltAzPosApparent(const StelCore* core) const;
//! Get observer-centered alt/az position //! Get observer-centered alt/az position
//! It is the automatic position, i.e. taking the refraction effect into account if atmosphere is on. //! It is the automatic position, i.e. taking the refraction effect into account if atmosphere is on.
//! The frame has it's Z axis at the zenith //! The frame has its Z axis at the zenith
Vec3d getAltAzPosAuto(const StelCore* core) const; Vec3d getAltAzPosAuto(const StelCore* core) const;
//! Return object's apparent V magnitude as seen from observer, with out including extinction. //! Return object's apparent V magnitude as seen from observer, with out including extinction.
virtual float getVMagnitude(const StelCore* core) const; virtual float getVMagnitude(const StelCore* core) const;
//! Return object's apparent V magnitude as seen from observer inclu ding extinction. //! Return object's apparent V magnitude as seen from observer inclu ding extinction.
//! Extinction obviously only if atmosphere=on. //! Extinction obviously only if atmosphere=on.
float getVMagnitudeWithExtinction(const StelCore* core) const; float getVMagnitudeWithExtinction(const StelCore* core) const;
//! Return a priority value which is used to discriminate objects by priority //! Return a priority value which is used to discriminate objects by priority
 End of changes. 8 change blocks. 
8 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/