SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 50 skipping to change at line 50
typedef QSharedPointer<Planet> PlanetP; typedef QSharedPointer<Planet> PlanetP;
//! @class SolarSystem //! @class SolarSystem
//! This StelObjectModule derivative is used to model SolarSystem bodies. //! This StelObjectModule derivative is used to model SolarSystem bodies.
//! This includes the Major Planets, Minor Planets and Comets. //! This includes the Major Planets, Minor Planets and Comets.
class SolarSystem : public StelObjectModule class SolarSystem : public StelObjectModule
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool labelsDisplayed Q_PROPERTY(bool labelsDisplayed
READ getFlagLabels READ getFlagLabels
WRITE setFlagLabels) WRITE setFlagLabels)
Q_PROPERTY(bool orbitsDisplayed Q_PROPERTY(bool orbitsDisplayed
READ getFlagOrbits READ getFlagOrbits
WRITE setFlagOrbits) WRITE setFlagOrbits)
Q_PROPERTY(bool trailsDisplayed Q_PROPERTY(bool trailsDisplayed
READ getFlagTrails READ getFlagTrails
WRITE setFlagTrails) WRITE setFlagTrails)
Q_PROPERTY(bool planetsDisplayed
READ getFlagPlanets
WRITE setFlagPlanets)
public: public:
SolarSystem(); SolarSystem();
virtual ~SolarSystem(); virtual ~SolarSystem();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
//! Initialize the SolarSystem. //! Initialize the SolarSystem.
//! Includes: //! Includes:
//! - loading planetary body orbital and model data from data/ssyste m.ini //! - loading planetary body orbital and model data from data/ssyste m.ini
skipping to change at line 264 skipping to change at line 267
//! Get phase angle for Solar system bodies from scripts //! Get phase angle for Solar system bodies from scripts
//! @param planetName the case in-sensistive English planet name. //! @param planetName the case in-sensistive English planet name.
//! @return a phase angle (in radians) //! @return a phase angle (in radians)
double getPhaseAngleForPlanet(QString planetName) const; double getPhaseAngleForPlanet(QString planetName) const;
//! Get phase for Solar system bodies from scripts //! Get phase for Solar system bodies from scripts
//! @param planetName the case in-sensistive English planet name. //! @param planetName the case in-sensistive English planet name.
//! @return a phase //! @return a phase
float getPhaseForPlanet(QString planetName) const; float getPhaseForPlanet(QString planetName) const;
//! Set the algorithm for computation of apparent magnitudes for pla
nets in case observer on the Earth.
//! Possible values:
//! * Planesas (algorithm provided by Pere Planesas (Observatorio As
tronomico Nacional))
//! * Mueller (G. Mueller, based on visual observations 1877-91. [Ex
pl.Suppl.1961])
//! * Harris (Astronomical Almanac 1984 and later. These give V (ins
trumental) magnitudes)
//! Details:
//! J. Meeus "Astronomical Algorithms" (2nd ed., with corrections as
of August 10, 2009) p.283-286.
//! O. Montenbruck, T. Pfleger "Astronomy on the Personal Computer"
(4th ed.) p.143-145.
//! Daniel L. Harris "Photometry and Colorimetry of Planets and Sate
llites" http://adsabs.harvard.edu/abs/1961plsa.book..272H
//! Hint: Default option in config.ini: astro/apparent_magnitude_alg
orithm = Harris
//! @param algorithm the case in-sensitive algorithm name
//! @note: The structure of algorithms is almost identical, just the
numbers are different! You should activate
//! Mueller's algorithm for simulate the eye's impression. (Esp. Ven
us!)
void setApparentMagnitudeAlgorithmOnEarth(QString algorithm);
//! Get the algorithm used for computation of apparent magnitudes fo
r planets in case observer on the Earth
QString getApparentMagnitudeAlgorithmOnEarth() const;
//! Set flag which enable use native names for planets or not.
void setFlagNativeNames(bool b);
//! Get the current value of the flag which enables showing native n
ames for planets or not.
bool getFlagNativeNames(void) const;
//! Set flag which enable use translated names for planets or not.
void setFlagTranslatedNames(bool b);
//! Get the current value of the flag which enables showing translat
ed names for planets or not.
bool getFlagTranslatedNames(void) const;
//! Set flag which enabled the showing of isolated trails for select
ed objects only or not
void setFlagIsolatedTrails(bool b);
//! Get the current value of the flag which enables showing of isola
ted trails for selected objects only or not.
bool getFlagIsolatedTrails(void) const;
public: public:
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Other public methods // Other public methods
//! Get a pointer to a Planet object. //! Get a pointer to a Planet object.
//! @param planetEnglishName the English name of the desired planet. //! @param planetEnglishName the English name of the desired planet.
//! @return The matching planet pointer if exists or NULL. //! @return The matching planet pointer if exists or NULL.
PlanetP searchByEnglishName(QString planetEnglishName) const; PlanetP searchByEnglishName(QString planetEnglishName) const;
//! Get the Planet object pointer for the Sun. //! Get the Planet object pointer for the Sun.
PlanetP getSun() const {return sun;} PlanetP getSun() const {return sun;}
skipping to change at line 319 skipping to change at line 355
//! \deprecated Used in LandscapeMgr::update(), but commented out. //! \deprecated Used in LandscapeMgr::update(), but commented out.
const QList<PlanetP>& getAllPlanets() const {return systemPlanets;} const QList<PlanetP>& getAllPlanets() const {return systemPlanets;}
private slots: private slots:
//! Called when a new object is selected. //! Called when a new object is selected.
void selectedObjectChange(StelModule::StelModuleSelectAction action) ; void selectedObjectChange(StelModule::StelModuleSelectAction action) ;
//! Load a color scheme //! Load a color scheme
void setStelStyle(const QString& section); void setStelStyle(const QString& section);
//! Called when the sky culture is updated.
//! Loads native names of planets for a given sky culture.
//! @param skyCultureDir the name of the directory containing the sk
y culture to use.
void updateSkyCulture(const QString& skyCultureDir);
private: private:
//! Search for SolarSystem objects which are close to the position g iven //! Search for SolarSystem objects which are close to the position g iven
//! in earth equatorial position. //! in earth equatorial position.
//! @param v A position in earth equatorial position. //! @param v A position in earth equatorial position.
//! @param core the StelCore object. //! @param core the StelCore object.
//! @return a pointer to a StelObject if found, else NULL //! @return a pointer to a StelObject if found, else NULL
StelObjectP search(Vec3d v, const StelCore* core) const; StelObjectP search(Vec3d v, const StelCore* core) const;
//! Compute the transformation matrix for every elements of the sola r system. //! Compute the transformation matrix for every elements of the sola r system.
//! observerPos is needed for light travel time computation. //! observerPos is needed for light travel time computation.
skipping to change at line 382 skipping to change at line 423
// Master settings // Master settings
bool flagOrbits; bool flagOrbits;
bool flagLightTravelTime; bool flagLightTravelTime;
//! The selection pointer texture. //! The selection pointer texture.
StelTextureSP texPointer; StelTextureSP texPointer;
bool flagShow; bool flagShow;
bool flagMarker; bool flagMarker;
bool flagNativeNames;
bool flagTranslatedNames;
bool flagIsolatedTrails;
class TrailGroup* allTrails; class TrailGroup* allTrails;
LinearFader trailFader; LinearFader trailFader;
Vec3f trailColor; Vec3f trailColor;
Vec3f pointerColor; Vec3f pointerColor;
QHash<QString, QString> planetNativeNamesMap;
//////////////////////////////////////////////////////////////////// ////////////// //////////////////////////////////////////////////////////////////// //////////////
// DEPRECATED // DEPRECATED
//////////////////////////////////////////////////////////////////// ////////////// //////////////////////////////////////////////////////////////////// //////////////
QList<Orbit*> orbits; // Pointers on created elliptical or bits QList<Orbit*> orbits; // Pointers on created elliptical or bits
}; };
#endif // _SOLARSYSTEM_HPP_ #endif // _SOLARSYSTEM_HPP_
 End of changes. 7 change blocks. 
6 lines changed or deleted 68 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/