StelObject.hpp   StelObject.hpp 
skipping to change at line 87 skipping to change at line 87
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|SiderealTime); 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(Q_NULLPTR)));}
//! Default implementation of the getPointInRegion method. //! Default implementation of the getPointInRegion method.
//! Return the J2000 Equatorial Position of the object. //! Return the J2000 Equatorial Position of the object.
virtual Vec3d getPointInRegion() const {return getJ2000EquatorialPos (NULL);} virtual Vec3d getPointInRegion() const {return getJ2000EquatorialPos (Q_NULLPTR);}
//! 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. //! 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. //! Derived objects can add their own special information tags.
//! @param core the current StelCore //! @param core the current StelCore
//! @return a map of object data. Keys: //! @return a map of object data. Keys:
//! - above-horizon : true, if celestial body is above horizon
//! - altitude : apparent altitude angle in decimal degrees //! - altitude : apparent altitude angle in decimal degrees
//! - azimuth : apparent azimuth angle in decimal degrees //! - azimuth : apparent azimuth angle in decimal degrees
//! - altitude-geometric : geometric altitude angle in decimal degre es //! - altitude-geometric : geometric altitude angle in decimal degre es
//! - azimuth-geometric : geometric azimuth angle in decimal degrees //! - azimuth-geometric : geometric azimuth angle in decimal degrees
//! - ra : right ascension angle (current date frame) in decimal deg rees //! - ra : right ascension angle (current date frame) in decimal deg rees
//! - dec : declination angle (current date frame) in decimal degree s //! - dec : declination angle (current date frame) in decimal degree s
//! - raJ2000 : right ascension angle (J2000 frame) in decimal degre es //! - raJ2000 : right ascension angle (J2000 frame) in decimal degre es
//! - decJ2000 : declination angle (J2000 frame) in decimal degrees //! - decJ2000 : declination angle (J2000 frame) in decimal degrees
//! - glong : galactic longitude in decimal degrees //! - glong : galactic longitude in decimal degrees
//! - glat : galactic latitude in decimal degrees //! - glat : galactic latitude in decimal degrees
skipping to change at line 134 skipping to change at line 135
//! - size-dd : angular size in decimal degrees //! - size-dd : angular size in decimal degrees
//! - size-deg : angular size in decimal degrees (formatted string) //! - size-deg : angular size in decimal degrees (formatted string)
//! - size-dms : angular size in DMS format //! - size-dms : angular size in DMS format
//! - name : english name of the object //! - name : english name of the object
//! - localized-name : localized name //! - localized-name : localized name
virtual QVariantMap getInfoMap(const StelCore *core) const; 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;
//! Returns a unique identifier for this object.
//! The ID should be unique for all objects of the same type,
//! but may freely conflict with IDs of other types, so getType() mu
st also be tested.
//!
//! With this it should be possible to at least identify the same ob
ject
//! in a different instance of Stellarium running the same version,
but
//! it would even be better if the ID provides some degree of forwar
d-compatibility.
//! For some object types (e.g. planets) this may simply return getE
nglishName(),
//! but better candidates may be official designations or at least (
stable) internal IDs.
//!
//! An object may have multiple IDs (different catalog numbers, etc)
. StelObjectMgr::searchByID()
//! should search through all ID variants, but this method only retu
rns one of them.
virtual QString getID() 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
skipping to change at line 183 skipping to change at line 198
//! 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 its 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 its 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;
//! Checking position an object above mathematical horizon for curre
nt location.
//! @return true if object an above mathematical horizon
bool isAboveHorizon(const StelCore* core) const;
//! Checking position an object above real horizon for current locat
ion.
//! @return true if object an above real horizon (uses test for land
scapes)
bool isAboveRealHorizon(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
//! As for magnitudes, the lower is the higher priority //! As for magnitudes, the lower is the higher priority
virtual float getSelectPriority(const StelCore*) const; virtual float getSelectPriority(const StelCore*) const;
 End of changes. 5 change blocks. 
2 lines changed or deleted 36 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/