AsterismMgr.hpp   AsterismMgr.hpp 
skipping to change at line 57 skipping to change at line 57
WRITE setFontSize WRITE setFontSize
NOTIFY fontSizeChanged) NOTIFY fontSizeChanged)
Q_PROPERTY(Vec3f linesColor Q_PROPERTY(Vec3f linesColor
READ getLinesColor READ getLinesColor
WRITE setLinesColor WRITE setLinesColor
NOTIFY linesColorChanged) NOTIFY linesColorChanged)
Q_PROPERTY(bool linesDisplayed Q_PROPERTY(bool linesDisplayed
READ getFlagLines READ getFlagLines
WRITE setFlagLines WRITE setFlagLines
NOTIFY linesDisplayedChanged) NOTIFY linesDisplayedChanged)
Q_PROPERTY(Vec3f rayHelpersColor
READ getRayHelpersColor
WRITE setRayHelpersColor
NOTIFY rayHelpersColorChanged)
Q_PROPERTY(bool rayHelpersDisplayed
READ getFlagRayHelpers
WRITE setFlagRayHelpers
NOTIFY rayHelpersDisplayedChanged)
Q_PROPERTY(Vec3f namesColor Q_PROPERTY(Vec3f namesColor
READ getLabelsColor READ getLabelsColor
WRITE setLabelsColor WRITE setLabelsColor
NOTIFY namesColorChanged) NOTIFY namesColorChanged)
Q_PROPERTY(bool namesDisplayed Q_PROPERTY(bool namesDisplayed
READ getFlagLabels READ getFlagLabels
WRITE setFlagLabels WRITE setFlagLabels
NOTIFY namesDisplayedChanged) NOTIFY namesDisplayedChanged)
Q_PROPERTY(float asterismLineThickness Q_PROPERTY(int asterismLineThickness
READ getAsterismLineThickness READ getAsterismLineThickness
WRITE setAsterismLineThickness WRITE setAsterismLineThickness
NOTIFY asterismLineThicknessChanged) NOTIFY asterismLineThicknessChanged)
Q_PROPERTY(int rayHelperThickness
READ getRayHelperThickness
WRITE setRayHelperThickness
NOTIFY rayHelperThicknessChanged)
public: public:
//! Constructor //! Constructor
AsterismMgr(StarMgr *stars); AsterismMgr(StarMgr *stars);
//! Destructor //! Destructor
virtual ~AsterismMgr(); virtual ~AsterismMgr();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the AsterismMgr. //! Initialize the AsterismMgr.
skipping to change at line 136 skipping to change at line 148
//! @endcode //! @endcode
void setLinesColor(const Vec3f& color); void setLinesColor(const Vec3f& color);
//! Get line color //! Get line color
Vec3f getLinesColor() const; Vec3f getLinesColor() const;
//! Set whether asterism lines will be displayed //! Set whether asterism lines will be displayed
void setFlagLines(const bool displayed); void setFlagLines(const bool displayed);
//! Get whether asterism lines are displayed //! Get whether asterism lines are displayed
bool getFlagLines(void) const; bool getFlagLines(void) const;
//! Define ray helper color
//! @param color The color of ray helpers
//! @code
//! // example of usage in scripts
//! AsterismMgr.setRayHelpersColor(Vec3f(1.0,0.0,0.0));
//! @endcode
void setRayHelpersColor(const Vec3f& color);
//! Get ray helper color
Vec3f getRayHelpersColor() const;
//! Set whether ray helpers will be displayed
void setFlagRayHelpers(const bool displayed);
//! Get whether ray helpers are displayed
bool getFlagRayHelpers(void) const;
//! Set label color for names //! Set label color for names
//! @param color The color of labels //! @param color The color of labels
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! AsterismMgr.setLabelsColor(Vec3f(1.0,0.0,0.0)); //! AsterismMgr.setLabelsColor(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
void setLabelsColor(const Vec3f& color); void setLabelsColor(const Vec3f& color);
//! Get label color for names //! Get label color for names
Vec3f getLabelsColor() const; Vec3f getLabelsColor() const;
skipping to change at line 158 skipping to change at line 185
//! Set whether asterism names are displayed //! Set whether asterism names are displayed
bool getFlagLabels(void) const; bool getFlagLabels(void) const;
//! Set the font size used for asterism names display //! Set the font size used for asterism names display
void setFontSize(const float newFontSize); void setFontSize(const float newFontSize);
//! Get the font size used for asterism names display //! Get the font size used for asterism names display
float getFontSize() const; float getFontSize() const;
//! Set the thickness of lines of the asterisms //! Set the thickness of lines of the asterisms
//! @param thickness of line in pixels //! @param thickness of line in pixels
void setAsterismLineThickness(const float thickness); void setAsterismLineThickness(const int thickness);
//! Get the thickness of lines of the asterisms //! Get the thickness of lines of the asterisms
float getAsterismLineThickness() const { return asterismLineThicknes int getAsterismLineThickness() const { return asterismLineThickness;
s; } }
//! Set the thickness of ray helpers of the asterisms
//! @param thickness of ray helper in pixels
void setRayHelperThickness(const int thickness);
//! Get the thickness of ray helper of the asterisms
int getRayHelperThickness() const { return rayHelperThickness; }
signals: signals:
void fontSizeChanged(const float newSize) const; void fontSizeChanged(const float newSize) const;
void linesColorChanged(const Vec3f & color) const; void linesColorChanged(const Vec3f & color) const;
void linesDisplayedChanged(const bool displayed) const; void linesDisplayedChanged(const bool displayed) const;
void namesColorChanged(const Vec3f & color) const; void namesColorChanged(const Vec3f & color) const;
void namesDisplayedChanged(const bool displayed) const; void namesDisplayedChanged(const bool displayed) const;
void asterismLineThicknessChanged(float thickness) const; void asterismLineThicknessChanged(int thickness) const;
void rayHelpersColorChanged(const Vec3f & color) const;
void rayHelpersDisplayedChanged(const bool displayed) const;
void rayHelperThicknessChanged(int thickness) const;
private slots: private slots:
//! Loads new asterism data and art if the SkyCulture has changed. //! Loads new asterism data and art if the SkyCulture has changed.
//! @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);
//! Update i18n names from English names according to current //! Update i18n names from English names according to current
//! locale, and update font for locale. //! locale, and update font for locale.
//! The translation is done using gettext with translated strings de fined //! The translation is done using gettext with translated strings de fined
//! in translations.h //! in translations.h
skipping to change at line 195 skipping to change at line 231
//! @note The abbreviation must occur in the lines file loaded first in @name loadLines()! //! @note The abbreviation must occur in the lines file loaded first in @name loadLines()!
void loadNames(const QString& namesFile); void loadNames(const QString& namesFile);
//! Load asterism line shapes from data files. //! Load asterism line shapes from data files.
//! @param fileName The name of the asterism data file //! @param fileName The name of the asterism data file
//! @note The abbreviation used in @param filename is required for c ross-identifying translatable names in @name loadNames(): //! @note The abbreviation used in @param filename is required for c ross-identifying translatable names in @name loadNames():
void loadLines(const QString& fileName); void loadLines(const QString& fileName);
//! Draw the asterism lines at the epoch given by the StelCore. //! Draw the asterism lines at the epoch given by the StelCore.
void drawLines(StelPainter& sPainter, const StelCore* core) const; void drawLines(StelPainter& sPainter, const StelCore* core) const;
//! Draw the ray helpers at the epoch given by the StelCore.
void drawRayHelpers(StelPainter& sPainter, const StelCore* core) con
st;
//! Draw the asterism name labels. //! Draw the asterism name labels.
void drawNames(StelPainter& sPainter) const; void drawNames(StelPainter& sPainter) const;
Asterism* isStarIn(const StelObject *s) const; Asterism* isStarIn(const StelObject *s) const;
Asterism* findFromAbbreviation(const QString& abbreviation) const; Asterism* findFromAbbreviation(const QString& abbreviation) const;
//Constellation* isStarIn(const StelObject *s) const; //Constellation* isStarIn(const StelObject *s) const;
//Constellation* findFromAbbreviation(const QString& abbreviation) c onst; //Constellation* findFromAbbreviation(const QString& abbreviation) c onst;
std::vector<Asterism*> asterisms; std::vector<Asterism*> asterisms;
QFont asterFont; QFont asterFont;
StarMgr* hipStarMgr; StarMgr* hipStarMgr;
QString lastLoadedSkyCulture; // Store the last loaded sky culture directory name QString lastLoadedSkyCulture; // Store the last loaded sky culture directory name
QString currentSkyCultureID; QString currentSkyCultureID;
bool linesDisplayed; bool linesDisplayed;
bool rayHelpersDisplayed;
bool namesDisplayed; bool namesDisplayed;
bool hasAsterism; bool hasAsterism;
// Store the thickness of lines of the asterisms // Store the thickness of lines of the asterisms
float asterismLineThickness; int asterismLineThickness;
int rayHelperThickness;
}; };
#endif // _ASTERISMMGR_HPP_ #endif // _ASTERISMMGR_HPP_
 End of changes. 10 change blocks. 
6 lines changed or deleted 47 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/