Constellation.hpp   Constellation.hpp 
skipping to change at line 54 skipping to change at line 54
//! nativeName, and translatable englishName (translation goes into nameI18 ), //! nativeName, and translatable englishName (translation goes into nameI18 ),
//! boundary shape from file constellations_boundaries.dat and an (optional ) artistic pictorial representation. //! boundary shape from file constellations_boundaries.dat and an (optional ) artistic pictorial representation.
//! GZ NEW: The nativeName should be accessible in a GUI option, so that e. g. original names as written in a //! GZ NEW: The nativeName should be accessible in a GUI option, so that e. g. original names as written in a
//! concrete book where a skyculture has been taken from can be assured eve n when translation is available. //! concrete book where a skyculture has been taken from can be assured eve n when translation is available.
//! TODO: There should be a distinction between constellations and asterism s, which are "inofficial" figures within a sky culture. //! TODO: There should be a distinction between constellations and asterism s, which are "inofficial" figures within a sky culture.
//! For example, Western sky culture has a "Big Dipper", "Coathanger", etc. These would be nice to see, but in different style. //! For example, Western sky culture has a "Big Dipper", "Coathanger", etc. These would be nice to see, but in different style.
class Constellation : public StelObject class Constellation : public StelObject
{ {
friend class ConstellationMgr; friend class ConstellationMgr;
private: private:
static const QString CONSTELLATION_TYPE;
Constellation(); Constellation();
~Constellation(); ~Constellation();
// StelObject method to override // StelObject method to override
//! Get a string with data about the Constellation. //! Get a string with data about the Constellation.
//! Constellations support the following InfoStringGroup flags: //! Constellations support the following InfoStringGroup flags:
//! - Name //! - Name
//! @param core the StelCore object //! @param core the StelCore object
//! @param flags a set of InfoStringGroup items to include in the re turn value. //! @param flags a set of InfoStringGroup items to include in the re turn value.
//! @return a QString a description of the constellation. //! @return a QString a description of the constellation.
virtual QString getInfoString(const StelCore*, const InfoStringGroup & flags) const; virtual QString getInfoString(const StelCore*, const InfoStringGroup & flags) const;
//! Get the module/object type string. //! Get the module/object type string.
//! @return "Constellation" //! @return "Constellation"
virtual QString getType() const {return "Constellation";} virtual QString getType() const {return CONSTELLATION_TYPE;}
virtual QString getID() const { return abbreviation; }
//! observer centered J2000 coordinates. //! observer centered J2000 coordinates.
virtual Vec3d getJ2000EquatorialPos(const StelCore*) const {return X YZname;} virtual Vec3d getJ2000EquatorialPos(const StelCore*) const {return X YZname;}
virtual double getAngularSize(const StelCore*) const {Q_ASSERT(0); r eturn 0;} // TODO virtual double getAngularSize(const StelCore*) const {Q_ASSERT(0); r eturn 0.;} // TODO
//! @param record string containing the following whitespace //! @param record string containing the following whitespace
//! separated fields: abbreviation - a three character abbreviation //! separated fields: abbreviation - a three character abbreviation
//! for the constellation, a number of lines (pairs), and a list of Hipparcos //! for the constellation, a number of lines (pairs), and a list of Hipparcos
//! catalogue numbers which, when connected pairwise, form the lines of the //! catalogue numbers which, when connected pairwise, form the lines of the
//! constellation. //! constellation.
//! @param starMgr a pointer to the StarManager object. //! @param starMgr a pointer to the StarManager object.
//! @return false if can't parse record, else true. //! @return false if can't parse record, else true.
bool read(const QString& record, StarMgr *starMgr); bool read(const QString& record, StarMgr *starMgr);
skipping to change at line 95 skipping to change at line 97
void drawName(StelPainter& sPainter, ConstellationMgr::Constellation DisplayStyle style) const; void drawName(StelPainter& sPainter, ConstellationMgr::Constellation DisplayStyle style) const;
//! Draw the constellation art //! Draw the constellation art
void drawArt(StelPainter& sPainter) const; void drawArt(StelPainter& sPainter) const;
//! Draw the constellation boundary //! Draw the constellation boundary
void drawBoundaryOptim(StelPainter& sPainter) const; void drawBoundaryOptim(StelPainter& sPainter) const;
//! Test if a star is part of a Constellation. //! Test if a star is part of a Constellation.
//! This member tests to see if a star is one of those which make up //! This member tests to see if a star is one of those which make up
//! the lines of a Constellation. //! the lines of a Constellation.
//! @return a pointer to the constellation which the star is a part of, //! @return a pointer to the constellation which the star is a part of,
//! or NULL if the star is not part of a constellation //! or Q_NULLPTR if the star is not part of a constellation
const Constellation* isStarIn(const StelObject*) const; const Constellation* isStarIn(const StelObject*) const;
//! Get the brightest star in a Constellation. //! Get the brightest star in a Constellation.
//! Checks all stars which make up the constellation lines, and retu rns //! Checks all stars which make up the constellation lines, and retu rns
//! a pointer to the one with the brightest apparent magnitude. //! a pointer to the one with the brightest apparent magnitude.
//! @return a pointer to the brightest star //! @return a pointer to the brightest star
StelObjectP getBrightestStarInConstellation(void) const; StelObjectP getBrightestStarInConstellation(void) const;
//! Get the translated name for the Constellation. //! Get the translated name for the Constellation.
QString getNameI18n() const {return nameI18;} QString getNameI18n() const {return nameI18;}
skipping to change at line 159 skipping to change at line 161
//! Name in english (column 3 in constellation_names.eng.fab) //! Name in english (column 3 in constellation_names.eng.fab)
QString englishName; QString englishName;
//! Name in native language (column 2 in constellation_names.eng.fab ). //! Name in native language (column 2 in constellation_names.eng.fab ).
//! According to practice as of V0.13.1, this may be an empty string . //! According to practice as of V0.13.1, this may be an empty string .
//! If empty, will be filled with englishName. //! If empty, will be filled with englishName.
QString nativeName; QString nativeName;
//! Abbreviation (of the latin name for western constellations) //! Abbreviation (of the latin name for western constellations)
//! For non-western, a skyculture designer must invent it. (usually 2-5 letters) //! For non-western, a skyculture designer must invent it. (usually 2-5 letters)
//! This MUST be filled and be unique within a sky culture. //! This MUST be filled and be unique within a sky culture.
QString abbreviation; QString abbreviation;
QString context;
//! Direction vector pointing on constellation name drawing position //! Direction vector pointing on constellation name drawing position
Vec3d XYZname; Vec3d XYZname;
Vec3d XYname; Vec3d XYname;
//! Number of segments in the lines //! Number of segments in the lines
unsigned int numberOfSegments; unsigned int numberOfSegments;
//! Month of start visibility of constellation (seasonal rules) //! Month [1..12] of start visibility of constellation (seasonal rul es)
int beginSeason; int beginSeason;
//! Month of end visibility of constellation (seasonal rules) //! Month [1..12] of end visibility of constellation (seasonal rules )
int endSeason; int endSeason;
//! List of stars forming the segments //! List of stars forming the segments
StelObjectP* asterism; StelObjectP* constellation;
StelTextureSP artTexture; StelTextureSP artTexture;
StelVertexArray artPolygon; StelVertexArray artPolygon;
SphericalCap boundingCap; SphericalCap boundingCap;
//! Define whether art, lines, names and boundary must be drawn //! Define whether art, lines, names and boundary must be drawn
LinearFader artFader, lineFader, nameFader, boundaryFader; LinearFader artFader, lineFader, nameFader, boundaryFader;
std::vector<std::vector<Vec3f> *> isolatedBoundarySegments; std::vector<std::vector<Vec3f> *> isolatedBoundarySegments;
std::vector<std::vector<Vec3f> *> sharedBoundarySegments; std::vector<std::vector<Vec3f> *> sharedBoundarySegments;
 End of changes. 8 change blocks. 
6 lines changed or deleted 9 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/