ConstellationMgr.hpp   ConstellationMgr.hpp 
skipping to change at line 66 skipping to change at line 66
//! Reads from the configuration parser object and updates the loadi ng bar //! Reads from the configuration parser object and updates the loadi ng bar
//! as constellation objects are loaded for the required sky culture . //! as constellation objects are loaded for the required sky culture .
virtual void init(); virtual void init();
//! Draw constellation lines, art, names and boundaries. //! Draw constellation lines, art, names and boundaries.
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
//! Updates time-varying state for each Constellation. //! Updates time-varying state for each Constellation.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Update i18n names from English names according to current
//! locale, and update font for locale.
//! The translation is done using gettext with translated strings de
fined
//! in translations.h
virtual void updateI18n();
//! Loads new constellation data and art if the SkyCulture has chang
ed.
//! @param skyCultureDir the name of the directory containing the sk
y culture to use.
virtual void updateSkyCulture(const QString& skyCultureDir);
//! Limit the number of constellations to draw based on selected sta
rs.
//! The selected objects changed, check if some stars are selected a
nd display the
//! matching constellations if isolateSelected mode is activated.
//! @param action define whether to add to, replace, or remove from
the existing selection
virtual void selectedObjectChangeCallBack(StelModuleSelectAction act
ion = StelModule::ReplaceSelection);
//! Load a color scheme
virtual void setStelStyle(const QString& section);
//! Return the value defining the order of call for the given action //! Return the value defining the order of call for the given action
//! @param actionName the name of the action for which we want the c all order //! @param actionName the name of the action for which we want the c all order
//! @return the value defining the order. The closer to 0 the earlie r the module's action will be called //! @return the value defining the order. The closer to 0 the earlie r the module's action will be called
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const; virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const;
//! Return the matching constellation object's pointer if exists or NULL //! Return the matching constellation object's pointer if exists or NULL
skipping to change at line 166 skipping to change at line 147
//! Set label color for names //! Set label color for names
void setLabelsColor(const Vec3f& c); void setLabelsColor(const Vec3f& c);
//! Get label color for names //! Get label color for names
Vec3f getLabelsColor() const; Vec3f getLabelsColor() const;
//! Set the font size used for constellation names display //! Set the font size used for constellation names display
void setFontSize(float newFontSize); void setFontSize(float newFontSize);
//! Get the font size used for constellation names display //! Get the font size used for constellation names display
float getFontSize() const; float getFontSize() const;
private slots:
//! Limit the number of constellations to draw based on selected sta
rs.
//! The selected objects changed, check if some stars are selected a
nd display the
//! matching constellations if isolateSelected mode is activated.
//! @param action define whether to add to, replace, or remove from
the existing selection
void selectedObjectChange(StelModule::StelModuleSelectAction action)
;
//! Load a color scheme
void setStelStyle(const QString& section);
//! Loads new constellation data and art if the SkyCulture has chang
ed.
//! @param skyCultureDir the name of the directory containing the sk
y culture to use.
void updateSkyCulture(const QString& skyCultureDir);
//! Update i18n names from English names according to current
//! locale, and update font for locale.
//! The translation is done using gettext with translated strings de
fined
//! in translations.h
void updateI18n();
private: private:
//! Read constellation names from the given file. //! Read constellation names from the given file.
//! @param namesFile Name of the file containing the constellation n ames in english //! @param namesFile Name of the file containing the constellation n ames in english
void loadNames(const QString& namesFile); void loadNames(const QString& namesFile);
//! Load constellation line shapes, art textures and boundaries shap es from data files. //! Load constellation line shapes, art textures and boundaries shap es from data files.
//! @param fileName The name of the constellation data file //! @param fileName The name of the constellation data file
//! @param artFileName The name of the constellation art data file //! @param artFileName The name of the constellation art data file
//! @param cultureName A string ID of the current skyculture //! @param cultureName A string ID of the current skyculture
void loadLinesAndArt(const QString& fileName, const QString& artfile Name, const QString& cultureName); void loadLinesAndArt(const QString& fileName, const QString& artfile Name, const QString& cultureName);
skipping to change at line 192 skipping to change at line 193
//! data items: //! data items:
//! - The number of vertexes which make up in the boundary (integer ). //! - The number of vertexes which make up in the boundary (integer ).
//! - For each vertex, two floating point numbers describing the ra and dec //! - For each vertex, two floating point numbers describing the ra and dec
//! of the vertex. //! of the vertex.
//! - The number of constellations which this boundary separates (a lways 2). //! - The number of constellations which this boundary separates (a lways 2).
//! - Two constellation abbreviations representing the constellatio ns which //! - Two constellation abbreviations representing the constellatio ns which
//! the boundary separates. //! the boundary separates.
//! @param conCatFile the path to the file which contains the conste llation boundary data. //! @param conCatFile the path to the file which contains the conste llation boundary data.
bool loadBoundaries(const QString& conCatFile); bool loadBoundaries(const QString& conCatFile);
//! Draw the constellation lines at the epoch given by the StelNavig ator. //! Draw the constellation lines at the epoch given by the StelNavig ator.
void drawLines(StelPainter& sPainter, const StelNavigator* nav) cons t; void drawLines(StelPainter& sPainter, const StelCore* core) const;
//! Draw the constellation art. //! Draw the constellation art.
void drawArt(StelPainter& sPainter) const; void drawArt(StelPainter& sPainter) const;
//! Draw the constellation name labels. //! Draw the constellation name labels.
void drawNames(StelPainter& sPainter) const; void drawNames(StelPainter& sPainter) const;
//! Draw the constellation boundaries. //! Draw the constellation boundaries.
void drawBoundaries(StelPainter& sPainter) const; void drawBoundaries(StelPainter& sPainter) const;
//! Handle single and multi-constellation selections. //! Handle single and multi-constellation selections.
void setSelectedConst(Constellation* c); void setSelectedConst(Constellation* c);
//! Handle unselecting a single constellation. //! Handle unselecting a single constellation.
void unsetSelectedConst(Constellation* c); void unsetSelectedConst(Constellation* c);
 End of changes. 3 change blocks. 
27 lines changed or deleted 28 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/