GridLinesMgr.hpp   GridLinesMgr.hpp 
skipping to change at line 72 skipping to change at line 72
NOTIFY equatorJ2000GridColorChanged) NOTIFY equatorJ2000GridColorChanged)
Q_PROPERTY(bool eclipticJ2000GridDisplayed Q_PROPERTY(bool eclipticJ2000GridDisplayed
READ getFlagEclipticJ2000Grid READ getFlagEclipticJ2000Grid
WRITE setFlagEclipticJ2000Grid WRITE setFlagEclipticJ2000Grid
NOTIFY eclipticJ2000GridDisplayedChanged) NOTIFY eclipticJ2000GridDisplayedChanged)
Q_PROPERTY(Vec3f eclipticJ2000GridColor Q_PROPERTY(Vec3f eclipticJ2000GridColor
READ getColorEclipticJ2000Grid READ getColorEclipticJ2000Grid
WRITE setColorEclipticJ2000Grid WRITE setColorEclipticJ2000Grid
NOTIFY eclipticJ2000GridColorChanged) NOTIFY eclipticJ2000GridColorChanged)
// NEW
Q_PROPERTY(bool eclipticGridDisplayed Q_PROPERTY(bool eclipticGridDisplayed
READ getFlagEclipticGrid READ getFlagEclipticGrid
WRITE setFlagEclipticGrid WRITE setFlagEclipticGrid
NOTIFY eclipticGridDisplayedChanged) NOTIFY eclipticGridDisplayedChanged)
Q_PROPERTY(Vec3f eclipticGridColor Q_PROPERTY(Vec3f eclipticGridColor
READ getColorEclipticGrid READ getColorEclipticGrid
WRITE setColorEclipticGrid WRITE setColorEclipticGrid
NOTIFY eclipticGridColorChanged) NOTIFY eclipticGridColorChanged)
Q_PROPERTY(bool galacticGridDisplayed Q_PROPERTY(bool galacticGridDisplayed
skipping to change at line 174 skipping to change at line 174
Q_PROPERTY(bool galacticEquatorLineDisplayed Q_PROPERTY(bool galacticEquatorLineDisplayed
READ getFlagGalacticEquatorLine READ getFlagGalacticEquatorLine
WRITE setFlagGalacticEquatorLine WRITE setFlagGalacticEquatorLine
NOTIFY galacticEquatorLineDisplayedChanged) NOTIFY galacticEquatorLineDisplayedChanged)
Q_PROPERTY(Vec3f galacticEquatorLineColor Q_PROPERTY(Vec3f galacticEquatorLineColor
READ getColorGalacticEquatorLine READ getColorGalacticEquatorLine
WRITE setColorGalacticEquatorLine WRITE setColorGalacticEquatorLine
NOTIFY galacticEquatorLineColorChanged) NOTIFY galacticEquatorLineColorChanged)
Q_PROPERTY(bool primeVerticalLineDisplayed
READ getFlagPrimeVerticalLine
WRITE setFlagPrimeVerticalLine
NOTIFY primeVerticalLineDisplayedChanged)
Q_PROPERTY(Vec3f primeVerticalLineColor
READ getColorPrimeVerticalLine
WRITE setColorPrimeVerticalLine
NOTIFY primeVerticalLineColorChanged)
Q_PROPERTY(bool colureLinesDisplayed
READ getFlagColureLines
WRITE setFlagColureLines
NOTIFY colureLinesDisplayedChanged)
Q_PROPERTY(Vec3f colureLinesColor
READ getColorColureLines
WRITE setColorColureLines
NOTIFY colureLinesColorChanged)
Q_PROPERTY(bool circumpolarCirclesDisplayed
READ getFlagCircumpolarCircles
WRITE setFlagCircumpolarCircles
NOTIFY circumpolarCirclesDisplayedChanged)
Q_PROPERTY(Vec3f circumpolarCirclesColor
READ getColorCircumpolarCircles
WRITE setColorCircumpolarCircles
NOTIFY circumpolarCirclesColorChanged)
public: public:
GridLinesMgr(); GridLinesMgr();
virtual ~GridLinesMgr(); virtual ~GridLinesMgr();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the GridLinesMgr. This process checks the values in t he //! Initialize the GridLinesMgr. This process checks the values in t he
//! application settings, and according to the settings there //! application settings, and according to the settings there
//! sets the visibility of the Equatorial Grids, Ecliptical Grids, A zimuthal Grid, Meridian Line, //! sets the visibility of the Equatorial Grids, Ecliptical Grids, A zimuthal Grid, Meridian Line,
//! Equator Line and Ecliptic Lines. //! Equator Line and Ecliptic Lines.
virtual void init(); virtual void init();
//! Get the module ID, returns "GridLinesMgr". //! Get the module ID, returns "GridLinesMgr".
virtual QString getModuleID() const {return "GridLinesMgr";} virtual QString getModuleID() const {return "GridLinesMgr";}
//! Draw the grids and great circle lines. //! Draw the grids and great circle lines.
//! Draws the Equatorial Grids, Ecliptical Grids, Azimuthal Grid, Me ridian Line, Equator Line, //! Draws the Equatorial Grids, Ecliptical Grids, Azimuthal Grid, Me ridian Line, Equator Line,
//! Ecliptic Lines, Precession Circles, and Conjunction-Opposition L ine according to the //! Ecliptic Lines, Precession Circles, Conjunction-Opposition Line, east-west vertical and colures according to the
//! various flags which control their visibility. //! various flags which control their visibility.
virtual void draw(StelCore* core); virtual void draw(StelCore* core);
//! Update time-dependent features. //! Update time-dependent features.
//! Used to control fading when turning on and off the grid lines an d great circles. //! Used to control fading when turning on and off the grid lines an d great circles.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Used to determine the order in which the various modules are dra wn. //! Used to determine the order in which the various modules are dra wn.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
skipping to change at line 420 skipping to change at line 447
bool getFlagGalacticPlaneLine(void) const { return getFlagGalacticEq uatorLine(); } bool getFlagGalacticPlaneLine(void) const { return getFlagGalacticEq uatorLine(); }
//! Get the current color of the Galactic Equator Line. //! Get the current color of the Galactic Equator Line.
Vec3f getColorGalacticEquatorLine(void) const; Vec3f getColorGalacticEquatorLine(void) const;
//! Set the color of the Galactic Equator Line. //! Set the color of the Galactic Equator Line.
//! @param newColor The color of galactic equator line //! @param newColor The color of galactic equator line
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! GridLinesMgr.setColorGalacticEquatorLine(Vec3f(1.0,0.0,0.0)); //! GridLinesMgr.setColorGalacticEquatorLine(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
void setColorGalacticEquatorLine(const Vec3f& newColor); void setColorGalacticEquatorLine(const Vec3f& newColor);
//! Setter for displaying the Prime Vertical Line.
void setFlagPrimeVerticalLine(const bool displayed);
//! Accessor for displaying Prime Vertical Line.
bool getFlagPrimeVerticalLine(void) const;
//! Get the current color of the Prime Vertical Line.
Vec3f getColorPrimeVerticalLine(void) const;
//! Set the color of the Prime Vertical Line.
//! @param newColor The color of the Prime Vertical line
//! @code
//! // example of usage in scripts
//! GridLinesMgr.setColorPrimeVerticalLine(Vec3f(1.0,0.0,0.0));
//! @endcode
void setColorPrimeVerticalLine(const Vec3f& newColor);
//! Setter for displaying the Colure Lines.
void setFlagColureLines(const bool displayed);
//! Accessor for displaying the Colure Lines.
bool getFlagColureLines(void) const;
//! Get the current color of the Colure Lines.
Vec3f getColorColureLines(void) const;
//! Set the color of the Colure Lines.
//! @param newColor The color of the Colure lines
//! @code
//! // example of usage in scripts
//! GridLinesMgr.setColorColureLines(Vec3f(1.0,0.0,0.0));
//! @endcode
void setColorColureLines(const Vec3f& newColor);
//! Setter for displaying circumpolar circles.
void setFlagCircumpolarCircles(const bool displayed);
//! Accessor for displaying circumpolar circles.
bool getFlagCircumpolarCircles(void) const;
//! Get the current color of the circumpolar circles.
Vec3f getColorCircumpolarCircles(void) const;
//! Set the color of the circumpolar circles.
//! @param newColor The color of circumpolar circles
//! @code
//! // example of usage in scripts
//! GridLinesMgr.setColorCircumpolarCircles(Vec3f(1.0,0.0,0.0));
//! @endcode
void setColorCircumpolarCircles(const Vec3f& newColor);
signals: signals:
void azimuthalGridDisplayedChanged(const bool) const; void azimuthalGridDisplayedChanged(const bool) const;
void azimuthalGridColorChanged(const Vec3f & newColor) const; void azimuthalGridColorChanged(const Vec3f & newColor) const;
void equatorGridDisplayedChanged(const bool displayed) const; void equatorGridDisplayedChanged(const bool displayed) const;
void equatorGridColorChanged(const Vec3f & newColor) const; void equatorGridColorChanged(const Vec3f & newColor) const;
void equatorJ2000GridDisplayedChanged(const bool displayed) const; void equatorJ2000GridDisplayedChanged(const bool displayed) const;
void equatorJ2000GridColorChanged(const Vec3f & newColor) const; void equatorJ2000GridColorChanged(const Vec3f & newColor) const;
void eclipticGridDisplayedChanged(const bool displayed) const; void eclipticGridDisplayedChanged(const bool displayed) const;
void eclipticGridColorChanged(const Vec3f & newColor) const; void eclipticGridColorChanged(const Vec3f & newColor) const;
void eclipticJ2000GridDisplayedChanged(const bool displayed) const; void eclipticJ2000GridDisplayedChanged(const bool displayed) const;
skipping to change at line 451 skipping to change at line 521
void precessionCirclesDisplayedChanged(const bool displayed) const; void precessionCirclesDisplayedChanged(const bool displayed) const;
void precessionCirclesColorChanged(const Vec3f & newColor) const; void precessionCirclesColorChanged(const Vec3f & newColor) const;
void meridianLineDisplayedChanged(const bool displayed) const; void meridianLineDisplayedChanged(const bool displayed) const;
void meridianLineColorChanged(const Vec3f & newColor) const; void meridianLineColorChanged(const Vec3f & newColor) const;
void longitudeLineDisplayedChanged(const bool displayed) const; void longitudeLineDisplayedChanged(const bool displayed) const;
void longitudeLineColorChanged(const Vec3f & newColor) const; void longitudeLineColorChanged(const Vec3f & newColor) const;
void horizonLineDisplayedChanged(const bool displayed) const; void horizonLineDisplayedChanged(const bool displayed) const;
void horizonLineColorChanged(const Vec3f & newColor) const; void horizonLineColorChanged(const Vec3f & newColor) const;
void galacticEquatorLineDisplayedChanged(const bool displayed) const ; void galacticEquatorLineDisplayedChanged(const bool displayed) const ;
void galacticEquatorLineColorChanged(const Vec3f & newColor) const; void galacticEquatorLineColorChanged(const Vec3f & newColor) const;
void primeVerticalLineDisplayedChanged(const bool displayed) const;
void primeVerticalLineColorChanged(const Vec3f & newColor) const;
void colureLinesDisplayedChanged(const bool displayed) const;
void colureLinesColorChanged(const Vec3f & newColor) const;
void circumpolarCirclesDisplayedChanged(const bool displayed) const;
void circumpolarCirclesColorChanged(const Vec3f & newColor) const;
private slots: private slots:
//! Sets the colors of: grids and great circles, Equatorial Grid, Az
imuthal Grid,
//! Meridian Line, Equator Line and Ecliptic Line.
void setStelStyle(const QString& section);
//! Re-translate the labels of the great circles. //! Re-translate the labels of the great circles.
//! Contains only calls to SkyLine::updateLabel(). //! Contains only calls to SkyLine::updateLabel().
void updateLineLabels(); void updateLineLabels();
private: private:
SkyGrid * equGrid; // Equatorial grid SkyGrid * equGrid; // Equatorial grid
SkyGrid * equJ2000Grid; // Equatorial J2000 grid SkyGrid * equJ2000Grid; // Equatorial J2000 grid
SkyGrid * galacticGrid; // Galactic grid SkyGrid * galacticGrid; // Galactic grid
SkyGrid * eclGrid; // Ecliptic of Date grid SkyGrid * eclGrid; // Ecliptic of Date grid
SkyGrid * eclJ2000Grid; // Ecliptic J2000 grid SkyGrid * eclJ2000Grid; // Ecliptic J2000 grid
skipping to change at line 477 skipping to change at line 550
SkyLine * equatorLine; // Celestial Equator line SkyLine * equatorLine; // Celestial Equator line
SkyLine * equatorJ2000Line; // Celestial Equator of J2000 line SkyLine * equatorJ2000Line; // Celestial Equator of J2000 line
SkyLine * eclipticLine; // Ecliptic line SkyLine * eclipticLine; // Ecliptic line
SkyLine * eclipticJ2000Line; // Ecliptic line of J2000 SkyLine * eclipticJ2000Line; // Ecliptic line of J2000
SkyLine * precessionCircleN; // Northern precession circle SkyLine * precessionCircleN; // Northern precession circle
SkyLine * precessionCircleS; // Southern precession circle SkyLine * precessionCircleS; // Southern precession circle
SkyLine * meridianLine; // Meridian line SkyLine * meridianLine; // Meridian line
SkyLine * longitudeLine; // Opposition/conjunction longitude line SkyLine * longitudeLine; // Opposition/conjunction longitude line
SkyLine * horizonLine; // Horizon line SkyLine * horizonLine; // Horizon line
SkyLine * galacticEquatorLine; // line depicting the Galactic equat or as defined by the IAU definition of Galactic coordinates (System II, 195 8) SkyLine * galacticEquatorLine; // line depicting the Galactic equat or as defined by the IAU definition of Galactic coordinates (System II, 195 8)
SkyLine * primeVerticalLine; // Prime Vertical line
SkyLine * colureLine_1; // First Colure line (0/12h)
SkyLine * colureLine_2; // Second Colure line (6/18h)
SkyLine * circumpolarCircleN; // Northern circumpolar circle
SkyLine * circumpolarCircleS; // Southern circumpolar circle
}; };
#endif // _GRIDLINESMGR_HPP_ #endif // _GRIDLINESMGR_HPP_
 End of changes. 7 change blocks. 
6 lines changed or deleted 83 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/