ConstellationMgr.hpp   ConstellationMgr.hpp 
skipping to change at line 37 skipping to change at line 37
#include <QFont> #include <QFont>
#include "StelObjectType.hpp" #include "StelObjectType.hpp"
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelProjectorType.hpp" #include "StelProjectorType.hpp"
class StelToneReproducer; class StelToneReproducer;
class StarMgr; class StarMgr;
class Constellation; class Constellation;
class StelProjector; class StelProjector;
class StelPainter;
//! @class ConstellationMgr //! @class ConstellationMgr
//! Display and manage the constellations. //! Display and manage the constellations.
//! It can display constellations lines, names, art textures and boundaries . //! It can display constellations lines, names, art textures and boundaries .
//! It also supports several different sky cultures. //! It also supports several different sky cultures.
class ConstellationMgr : public StelObjectModule class ConstellationMgr : public StelObjectModule
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool artDisplayed Q_PROPERTY(bool artDisplayed
READ getFlagArt READ getFlagArt
skipping to change at line 105 skipping to change at line 104
virtual ~ConstellationMgr(); virtual ~ConstellationMgr();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the ConstellationMgr. //! Initialize the ConstellationMgr.
//! 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, class StelRenderer* renderer);
//! Updates time-varying state for each Constellation. //! Updates time-varying state for each Constellation.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! 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;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
skipping to change at line 132 skipping to change at line 131
//! Return the matching constellation if exists or NULL //! Return the matching constellation if exists or NULL
//! @param name The case in-sensistive standard program name (three letter abbreviation) //! @param name The case in-sensistive standard program name (three letter abbreviation)
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 vector of matching object name by order of relevance, or an empty vector if nothing match //! @return a vector of matching object name by order of relevance, or an empty vector if nothing match
virtual QStringList listMatchingObjectsI18n(const QString& objPrefix , int maxNbItem=5) const; virtual QStringList listMatchingObjectsI18n(const QString& objPrefix , int maxNbItem=5) const;
virtual QStringList listAllObjects(bool inEnglish) const;
virtual QString getName() const { return "Constellations"; }
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Properties setters and getters // Properties setters and getters
public slots: public slots:
//! Set whether constellation art will be displayed //! Set whether constellation art will be displayed
void setFlagArt(const bool displayed); void setFlagArt(const bool displayed);
//! Get whether constellation art is displayed //! Get whether constellation art is displayed
bool getFlagArt(void) const; bool getFlagArt(void) const;
//! Set constellation art fade duration in second //! Set constellation art fade duration in second
skipping to change at line 250 skipping to change at line 251
//! 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 StelCore . //! Draw the constellation lines at the epoch given by the StelCore .
void drawLines(StelPainter& sPainter, const StelCore* core) const; void drawLines(class StelRenderer* renderer, StelProjectorP projecto r, const StelCore* core) const;
//! Draw the constellation art. //! Draw the constellation art.
void drawArt(StelPainter& sPainter) const; //!
//! @param renderer Renderer to draw with.
//! @param projector Projector to project vertices to viewport.
void drawArt(class StelRenderer* renderer, StelProjectorP projector)
const;
//! Draw the constellation name labels. //! Draw the constellation name labels.
void drawNames(StelPainter& sPainter) const; //!
//! @param renderer Renderer to draw with.
//! @param projector Projector to project vertices to viewport.
//! @param font Font to draw the names with.
void drawNames(class StelRenderer* renderer, StelProjectorP projecto
r, QFont& font) const;
//! Draw the constellation boundaries. //! Draw the constellation boundaries.
void drawBoundaries(StelPainter& sPainter) const; //!
//! @param renderer Renderer to draw with.
//! @param projector Projector to project vertices to viewport.
void drawBoundaries(StelRenderer* renderer, StelProjectorP projector
) 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);
//! Define which constellation is selected from its abbreviation. //! Define which constellation is selected from its abbreviation.
void setSelected(const QString& abbreviation); void setSelected(const QString& abbreviation);
//! Define which constellation is selected and return brightest star . //! Define which constellation is selected and return brightest star .
StelObjectP setSelectedStar(const QString& abbreviation); StelObjectP setSelectedStar(const QString& abbreviation);
//! Define which constellation is selected from a star number. //! Define which constellation is selected from a star number.
void setSelected(const StelObject* s) {if (!s) setSelectedConst(NULL ); else setSelectedConst(isStarIn(s));} void setSelected(const StelObject* s) {if (!s) setSelectedConst(NULL ); else setSelectedConst(isStarIn(s));}
 End of changes. 7 change blocks. 
6 lines changed or deleted 20 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/