StarMgr.hpp   StarMgr.hpp 
skipping to change at line 65 skipping to change at line 65
} varstar; } varstar;
typedef struct typedef struct
{ {
QString designation; //! WDS designation QString designation; //! WDS designation
int observation; //! Date of last satisfactory observation, y r int observation; //! Date of last satisfactory observation, y r
float positionAngle; //! Position Angle at date of last satisfact ory observation, deg float positionAngle; //! Position Angle at date of last satisfact ory observation, deg
float separation; //! Separation at date of last satisfactory observation, arcsec float separation; //! Separation at date of last satisfactory observation, arcsec
} wds; } wds;
typedef QMap<StelObjectP, float> StelACStarData;
//! @class StarMgr //! @class StarMgr
//! Stores the star catalogue data. //! Stores the star catalogue data.
//! Used to render the stars themselves, as well as determine the color tab le //! Used to render the stars themselves, as well as determine the color tab le
//! and render the labels of those stars with names for a given SkyCulture. //! and render the labels of those stars with names for a given SkyCulture.
//! //!
//! The celestial sphere is split into zones, which correspond to the //! The celestial sphere is split into zones, which correspond to the
//! triangular faces of a geodesic sphere. The number of zones (faces) //! triangular faces of a geodesic sphere. The number of zones (faces)
//! depends on the level of sub-division of this sphere. The lowest //! depends on the level of sub-division of this sphere. The lowest
//! level, 0, is an icosahedron (20 faces), subsequent levels, L, //! level, 0, is an icosahedron (20 faces), subsequent levels, L,
//! of sub-division give the number of zones, n as: //! of sub-division give the number of zones, n as:
skipping to change at line 115 skipping to change at line 117
StarMgr(void); StarMgr(void);
~StarMgr(void); ~StarMgr(void);
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the StarMgr. //! Initialize the StarMgr.
//! - Loads the star catalogue data into memory //! - Loads the star catalogue data into memory
//! - Sets up the star color table //! - Sets up the star color table
//! - Loads the star texture //! - Loads the star texture
//! - Loads the star font (for labels on named stars) //! - Loads the star font (for labels on named stars)
//! - Loads the texture of the sar selection indicator //! - Loads the texture of the star selection indicator
//! - Lets various display flags from the ini parser object //! - Sets 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); virtual void draw(StelCore* core);
//! 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));}
//! 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 Q_NULLPT R
//! @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 HIP 1234) or sc i 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 Q_NULLPTR
//! @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;
virtual StelObjectP searchByID(const QString &id) const;
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object English name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object English 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
//! @param useStartOfWords the autofill mode for returned objects na mes //! @param useStartOfWords the autofill mode for returned objects na mes
//! @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
virtual QStringList listMatchingObjects(const QString& objPrefix, in t maxNbItem=5, bool useStartOfWords=false, bool inEnglish=false) const; virtual QStringList listMatchingObjects(const QString& objPrefix, in t maxNbItem=5, bool useStartOfWords=false, bool inEnglish=false) const;
//! @note Loading stars with the common names only. //! @note Loading stars with the common names only.
virtual QStringList listAllObjects(bool inEnglish) const; virtual QStringList listAllObjects(bool inEnglish) const;
virtual QStringList listAllObjectsByType(const QString& objType, boo l inEnglish) const; virtual QStringList listAllObjectsByType(const QString& objType, boo l inEnglish) const;
virtual QString getName() const { return "Stars"; } virtual QString getName() const { return "Stars"; }
virtual QString getStelObjectType() const;
public slots: public slots:
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods callable from script and GUI // Methods callable from script and GUI
//! Set the color used to label bright stars. //! Set the color used to label bright stars.
//! @param c The color of the bright stars labels //! @param c The color of the bright stars labels
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! StarMgr.setLabelColor(Vec3f(1.0,0.0,0.0)); //! StarMgr.setLabelColor(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
skipping to change at line 334 skipping to change at line 339
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. //! Get the list of all Hipparcos stars.
const QList<StelObjectP>& getHipparcosStars() const { return hipparc osStars; } const QList<StelObjectP>& getHipparcosStars() const { return hipparc osStars; }
const QList<QMap<StelObjectP, float>>& getHipparcosHighPMStars() con
st { return hipStarsHighPM; }
const QList<QMap<StelObjectP, float>>& getHipparcosDoubleStars() con
st { return doubleHipStars; }
const QList<QMap<StelObjectP, float>>& getHipparcosVariableStars() c
onst { return variableHipStars; }
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:
void starLabelsDisplayedChanged(const bool displayed); void starLabelsDisplayedChanged(const bool displayed);
void starsDisplayedChanged(const bool displayed); void starsDisplayedChanged(const bool displayed);
void labelsAmountChanged(float a); void labelsAmountChanged(float a);
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.
//! @note Stellarium doesn't support sky cultures made prior version 0.10.6 now! //! @note Stellarium doesn't support sky cultures made prior version 0.10.6 now!
int loadCommonNames(const QString& commonNameFile); int loadCommonNames(const QString& commonNameFile);
skipping to change at line 388 skipping to change at line 395
//! 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);
void populateHipparcosLists();
void populateStarsDesignations();
//! List of all Hipparcos stars. //! List of all Hipparcos stars.
QList<StelObjectP> hipparcosStars; QList<StelObjectP> hipparcosStars;
QList<QMap<StelObjectP, float>> doubleHipStars, variableHipStars, hi pStarsHighPM;
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;
 End of changes. 10 change blocks. 
5 lines changed or deleted 19 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/