StarMgr.hpp   StarMgr.hpp 
skipping to change at line 91 skipping to change at line 91
//! - Lets various display flags from the ini parser object //! - Lets various display flags from the ini parser object
virtual void init(); virtual void init();
//! Draw the stars and the star selection indicator if necessary. //! Draw the stars and the star selection indicator if necessary.
virtual void draw(StelCore* core); //! Draw all the stars virtual void draw(StelCore* core); //! Draw all the stars
//! 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.
virtual void updateI18n();
//! Called when the sky culture is updated.
//! 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.
virtual void updateSkyCulture(const QString& skyCultureDir);
//! Load a color scheme
virtual void setStelStyle(const QString& section);
//! 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 list containing the stars located inside the limFov cir cle around position v //! Return a list containing the stars located inside the limFov cir cle 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
skipping to change at line 185 skipping to change at line 174
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(QVariantMap m); bool checkAndLoadCatalog(QVariantMap m);
private slots:
void setStelStyle(const QString& section);
//! Translate text.
void updateI18n();
//! Called when the sky culture is updated.
//! 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.
void updateSkyCulture(const QString& skyCultureDir);
private: private:
void setCheckFlag(const QString& catalogId, bool b); void setCheckFlag(const QString& catalogId, bool b);
void copyDefaultConfigFile(); void copyDefaultConfigFile();
//! 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 209 skipping to change at line 208
void loadSciNames(const QString& sciNameFile); void loadSciNames(const QString& sciNameFile);
//! 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 StelNavigator * nav); void drawPointer(StelPainter& sPainter, const StelCore* core);
LinearFader labelsFader; LinearFader labelsFader;
LinearFader starsFader; LinearFader starsFader;
bool flagStarName; bool flagStarName;
float labelsAmount; float labelsAmount;
bool gravityLabel; bool gravityLabel;
int maxGeodesicGridLevel; int maxGeodesicGridLevel;
int lastMaxSearchLevel; int lastMaxSearchLevel;
 End of changes. 3 change blocks. 
14 lines changed or deleted 13 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/