StarMgr.hpp   StarMgr.hpp 
skipping to change at line 97 skipping to change at line 97
//! Update any time-dependent features. //! Update any time-dependent features.
//! Includes fading in and out stars and labels when they are turned on and off. //! Includes fading in and out stars and labels when they are turned on and off.
virtual void update(double deltaTime) {labelsFader.update((int)(delt aTime*1000)); starsFader.update((int)(deltaTime*1000));} virtual void update(double deltaTime) {labelsFader.update((int)(delt aTime*1000)); starsFader.update((int)(deltaTime*1000));}
//! Translate text. //! Translate text.
virtual void updateI18n(); virtual 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.
virtual void updateSkyCulture(); //! @param skyCultureDir the name of the directory containing the sk
y culture to use.
virtual void updateSkyCulture(const QString& skyCultureDir);
//! Load a color scheme //! Load a color scheme
virtual void setStelStyle(const StelStyle& style); virtual void setStelStyle(const StelStyle& style);
//! Used to determine the order in which the various StelModules are drawn. //! Used to determine the order in which the various StelModules are drawn.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Return a stl vector containing the stars located inside the limF ov circle around position v //! Return a stl vector containing the stars located inside the limF ov circle around position v
virtual QList<StelObjectP > searchAround(const Vec3d& v, double limi tFov, const StelCore* core) const; virtual QList<StelObjectP > searchAround(const Vec3d& v, double limi tFov, const StelCore* core) const;
//! Return the matching Stars object's pointer if exists or NULL //! Return the matching Stars object's pointer if exists or NULL
//! @param nameI18n The case in-sensistive star common name or HP //! @param nameI18n The case in-sensistive star common name or HP
//! catalog name (format can be HP1234 or HP 1234) or sci name //! catalog name (format can be HP1234 or HP 1234 or HIP 1234) or sc i name
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Return the matching star if exists or NULL //! Return the matching star if exists or NULL
//! @param name The case in-sensistive standard program planet name //! @param name The case in-sensistive standard program planet name
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name.
//! @param objPrefix the case insensitive first letters of the searc hed object //! @param objPrefix the case insensitive first letters of the searc hed object
//! @param maxNbItem the maximum number of returned object names //! @param maxNbItem the maximum number of returned object names
//! @return a list of matching object name by order of relevance, or an empty list if nothing match //! @return a list of matching object name by order of relevance, or an empty list if nothing match
skipping to change at line 163 skipping to change at line 164
//! Show scientific or catalog names on stars without common names. //! Show scientific or catalog names on stars without common names.
static void setFlagSciNames(bool f) {flagSciNames = f;} static void setFlagSciNames(bool f) {flagSciNames = f;}
static bool getFlagSciNames(void) {return flagSciNames;} static bool getFlagSciNames(void) {return flagSciNames;}
QSettings* getStarSettings(void) {return starSettings;} QSettings* getStarSettings(void) {return starSettings;}
public: public:
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Other methods // Other methods
//! Search for the nearest star to some position. //! Search by Hipparcos catalogue number.
//! @param Pos the 3d vector representing the direction to search. //! @param hip the Hipparcos catalogue number of the star which is r
//! @return the nearest star from the specified position, or an equired.
//! empty StelObjectP if none were found close by.
StelObjectP search(Vec3d Pos) const;
//! Search for a star by catalogue number (including catalogue prefi
x).
//! @param id the catalogue identifier for the required star.
//! @return the requested StelObjectP or an empty objecy if the requ
ested
//! one was not found.
StelObjectP search(const QString& id) const;
//! Search bu Hipparcos catalogue number.
//! @param num the Hipparcos catalogue number of the star which is r
equired.
//! @return the requested StelObjectP or an empty objecy if the requ ested //! @return the requested StelObjectP or an empty objecy if the requ ested
//! one was not found. //! one was not found.
StelObjectP searchHP(int num) const; StelObjectP searchHP(int hip) const;
//! Get the (translated) common name for a star with a specified //! Get the (translated) common name for a star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
static QString getCommonName(int hip); static QString getCommonName(int hip);
//! Get the (translated) scientific name for a star with a specified //! Get the (translated) scientific name for a star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
static QString getSciName(int hip); static QString getSciName(int hip);
static double getCurrentJDay(void) {return currentJDay;}
static QString convertToSpectralType(int index); static QString convertToSpectralType(int index);
static QString convertToComponentIds(int index); static QString convertToComponentIds(int index);
private: private:
//! Loads common names for stars from a file. //! Loads common names for stars from a file.
//! Called when the SkyCulture is updated. //! Called when the SkyCulture is updated.
//! @param the path to a file containing the common names for bright stars. //! @param the path to a file containing the common names for bright stars.
int loadCommonNames(const QString& commonNameFile); int loadCommonNames(const QString& commonNameFile);
skipping to change at line 254 skipping to change at line 241
BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars
static std::map<int, QString> commonNamesMap; static std::map<int, QString> commonNamesMap;
static std::map<int, QString> commonNamesMapI18n; static std::map<int, QString> commonNamesMapI18n;
static std::map<QString, int> commonNamesIndex; static std::map<QString, int> commonNamesIndex;
static std::map<QString, int> commonNamesIndexI18n; static std::map<QString, int> commonNamesIndexI18n;
static std::map<int, QString> sciNamesMapI18n; static std::map<int, QString> sciNamesMapI18n;
static std::map<QString, int> sciNamesIndexI18n; static std::map<QString, int> sciNamesIndexI18n;
static double currentJDay;
double fontSize; double fontSize;
StelFont *starFont; StelFont *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
QSettings* starSettings; QSettings* starSettings;
class StelObjectMgr* objectMgr;
}; };
#endif // _STARMGR_HPP_ #endif // _STARMGR_HPP_
 End of changes. 7 change blocks. 
24 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/