StarMgr.hpp   StarMgr.hpp 
skipping to change at line 237 skipping to change at line 237
//! @param hip The Hipparcos number of star //! @param hip The Hipparcos number of star
//! @return translated scientific name of double star //! @return translated scientific name of double star
static QString getWdsName(int hip); static QString getWdsName(int hip);
//! Get the (English) common name for a star with a specified //! Get the (English) common name for a star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
//! @param hip The Hipparcos number of star //! @param hip The Hipparcos number of star
//! @return common name of star (from skyculture file star_names.fab ) //! @return common name of star (from skyculture file star_names.fab )
static QString getCommonEnglishName(int hip); static QString getCommonEnglishName(int hip);
//! Get the (translated) additional names for a star with a specifie
d
//! Hipparcos catalogue number.
//! @param hip The Hipparcos number of star
//! @return translated additional names of star
static QString getAdditionalNames(int hip);
//! Get the English additional names for a star with a specified
//! Hipparcos catalogue number.
//! @param hip The Hipparcos number of star
//! @return additional names of star
static QString getAdditionalEnglishNames(int hip);
//! Get the cross-identification designations for a star with a spec ified //! Get the cross-identification designations for a star with a spec ified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
//! @param hip The Hipparcos number of star //! @param hip The Hipparcos number of star
//! @return cross-identification data //! @return cross-identification data
static QString getCrossIdentificationDesignations(int hip); static QString getCrossIdentificationDesignations(int hip);
//! Get the type of variability for a variable star with a specified //! Get the type of variability for a variable star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
//! @param hip The Hipparcos number of star //! @param hip The Hipparcos number of star
//! @return type of variability //! @return type of variability
skipping to change at line 320 skipping to change at line 332
static QString convertToSpectralType(int index); static QString convertToSpectralType(int index);
static QString convertToComponentIds(int index); static QString convertToComponentIds(int index);
QVariantList getCatalogsDescription() const {return catalogsDescript ion;} QVariantList getCatalogsDescription() const {return catalogsDescript ion;}
//! Try to load the given catalog, even if it is marched as unchecke d. //! Try to load the given catalog, even if it is marched as unchecke d.
//! Mark it as checked if checksum is correct. //! Mark it as checked if checksum is correct.
//! @return false in case of failure. //! @return false in case of failure.
bool checkAndLoadCatalog(const QVariantMap& m); bool checkAndLoadCatalog(const QVariantMap& m);
//! Get the list of all Hipparcos stars.
const QList<StelObjectP>& getHipparcosStars() const { return hipparc
osStars; }
private slots: private slots:
//! Translate text. //! Translate text.
void updateI18n(); void updateI18n();
//! Called when the sky culture is updated. //! Called when the sky culture is updated.
//! Loads common and scientific names of stars for a given sky cultu re. //! Loads common and scientific names of stars for a given sky cultu re.
//! @param skyCultureDir the name of the directory containing the sk y culture to use. //! @param skyCultureDir the name of the directory containing the sk y culture to use.
void updateSkyCulture(const QString& skyCultureDir); void updateSkyCulture(const QString& skyCultureDir);
signals: signals:
skipping to change at line 373 skipping to change at line 388
//! Gets the maximum search level. //! Gets the maximum search level.
// TODO: add a non-lame description - what is the purpose of the max search level? // TODO: add a non-lame description - what is the purpose of the max search level?
int getMaxSearchLevel() const; int getMaxSearchLevel() const;
//! Load all the stars from the files. //! Load all the stars from the files.
void loadData(QVariantMap starsConfigFile); void loadData(QVariantMap starsConfigFile);
//! Draw a nice animated pointer around the object. //! Draw a nice animated pointer around the object.
void drawPointer(StelPainter& sPainter, const StelCore* core); void drawPointer(StelPainter& sPainter, const StelCore* core);
//! List of all Hipparcos stars.
QList<StelObjectP> hipparcosStars;
LinearFader labelsFader; LinearFader labelsFader;
LinearFader starsFader; LinearFader starsFader;
bool flagStarName; bool flagStarName;
double labelsAmount; double labelsAmount;
bool gravityLabel; bool gravityLabel;
int maxGeodesicGridLevel; int maxGeodesicGridLevel;
int lastMaxSearchLevel; int lastMaxSearchLevel;
skipping to change at line 406 skipping to change at line 424
const Vec3f &c1, const Vec3f &c1,
const Vec3f &c2); const Vec3f &c2);
HipIndexStruct *hipIndex; // array of Hipparcos stars HipIndexStruct *hipIndex; // array of Hipparcos stars
static QHash<int, QString> commonNamesMap; // the original names from skyculture (star_names.fab) static QHash<int, QString> commonNamesMap; // the original names from skyculture (star_names.fab)
static QHash<int, QString> commonNamesMapI18n; // translated names static QHash<int, QString> commonNamesMapI18n; // translated names
static QMap<QString, int> commonNamesIndexI18n; static QMap<QString, int> commonNamesIndexI18n;
static QMap<QString, int> commonNamesIndex; static QMap<QString, int> commonNamesIndex;
static QHash<int, QString> additionalNamesMap; // additional names
static QHash<int, QString> additionalNamesMapI18n;
static QMap<QString, int> additionalNamesIndex;
static QMap<QString, int> additionalNamesIndexI18n;
static QHash<int, QString> sciNamesMapI18n; static QHash<int, QString> sciNamesMapI18n;
static QMap<QString, int> sciNamesIndexI18n; static QMap<QString, int> sciNamesIndexI18n;
static QHash<int, QString> sciAdditionalNamesMapI18n; static QHash<int, QString> sciAdditionalNamesMapI18n;
static QMap<QString, int> sciAdditionalNamesIndexI18n; static QMap<QString, int> sciAdditionalNamesIndexI18n;
static QHash<int, varstar> varStarsMapI18n; static QHash<int, varstar> varStarsMapI18n;
static QMap<QString, int> varStarsIndexI18n; static QMap<QString, int> varStarsIndexI18n;
static QHash<int, wds> wdsStarsMapI18n; static QHash<int, wds> wdsStarsMapI18n;
static QMap<QString, int> wdsStarsIndexI18n; static QMap<QString, int> wdsStarsIndexI18n;
static QHash<int, int> saoStarsMap; static QHash<int, int> saoStarsMap;
static QMap<int, int> saoStarsIndex; static QMap<int, int> saoStarsIndex;
static QHash<int, int> hdStarsMap; static QHash<int, int> hdStarsMap;
static QMap<int, int> hdStarsIndex; static QMap<int, int> hdStarsIndex;
static QHash<int, int> hrStarsMap;
static QMap<int, int> hrStarsIndex;
static QHash<int, QString> referenceMap;
QFont starFont; QFont starFont;
static bool flagSciNames; static bool flagSciNames;
Vec3f labelColor; Vec3f labelColor;
StelTextureSP texPointer; // The selection pointer tex ture StelTextureSP texPointer; // The selection pointer tex ture
class StelObjectMgr* objectMgr; class StelObjectMgr* objectMgr;
QString starConfigFileFullPath; QString starConfigFileFullPath;
 End of changes. 5 change blocks. 
0 lines changed or deleted 29 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/