SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 44 skipping to change at line 44
class StelTranslator; class StelTranslator;
class StelObject; class StelObject;
class StelCore; class StelCore;
class StelProjector; class StelProjector;
class StelNavigator; class StelNavigator;
class QSettings; class QSettings;
typedef QSharedPointer<Planet> PlanetP; typedef QSharedPointer<Planet> PlanetP;
//! @class SolarSystem //! @class SolarSystem
//! This StelObjectModule derivative is used to model SolarSystem boies. //! 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
public: public:
SolarSystem(); SolarSystem();
virtual ~SolarSystem(); virtual ~SolarSystem();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
skipping to change at line 73 skipping to change at line 73
//! Draw SolarSystem objects (planets). //! Draw SolarSystem objects (planets).
//! @param core The StelCore object. //! @param core The StelCore object.
//! @return The maximum squared distance in pixels that any SolarSys tem object //! @return The maximum squared distance in pixels that any SolarSys tem object
//! has travelled since the last update. //! has travelled since the last update.
virtual void draw(StelCore *core); virtual void draw(StelCore *core);
//! Update time-varying components. //! Update time-varying components.
//! This includes planet motion trails. //! This includes planet motion trails.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Translate names.
virtual void updateI18n();
//! Called when a new object is selected.
virtual void selectedObjectChangeCallBack(StelModuleSelectAction act
ion=StelModule::ReplaceSelection);
//! Load a color scheme
virtual void setStelStyle(const QString& section);
//! Used to determine what order to draw the various StelModules. //! Used to determine what order to draw the various StelModules.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Search for SolarSystem objects in some area around a point. //! Search for SolarSystem objects in some area around a point.
//! @param v A vector representing a point in the sky. //! @param v A vector representing a point in the sky.
//! @param limitFov The radius of the circle around the point v whic h //! @param limitFov The radius of the circle around the point v whic h
//! defines the size of the area to search. //! defines the size of the area to search.
//! @param core the core object //! @param core the core object
//! @return A STL vector of SpelObjectP (pointers) containing all So larSystem //! @return A STL vector of StelObjectP (pointers) containing all So larSystem
//! objects found in the specified area. This vector is not sorted b y distance //! objects found in the specified area. This vector is not sorted b y distance
//! from v. //! from v.
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;
//! Search for a SolarSystem object based on the localised name. //! Search for a SolarSystem object based on the localised name.
//! @param nameI18n the case in-sensistive translated planet name. //! @param nameI18n the case in-sensistive translated planet name.
//! @return a StelObjectP for the object if found, else NULL. //! @return a StelObjectP for the object if found, else NULL.
virtual StelObjectP searchByNameI18n(const QString& nameI18n) const; virtual StelObjectP searchByNameI18n(const QString& nameI18n) const;
//! Search for a SolarSystem object based on the English name. //! Search for a SolarSystem object based on the English name.
skipping to change at line 186 skipping to change at line 177
//! Set flag which determines if Earth's moon is scaled or not. //! Set flag which determines if Earth's moon is scaled or not.
void setFlagMoonScale(bool b); void setFlagMoonScale(bool b);
//! Get the current value of the flag which determines if Earth's mo on is scaled or not. //! Get the current value of the flag which determines if Earth's mo on is scaled or not.
bool getFlagMoonScale(void) const {return flagMoonScale;} bool getFlagMoonScale(void) const {return flagMoonScale;}
//! Set the display scaling factor for Earth's moon. //! Set the display scaling factor for Earth's moon.
void setMoonScale(float f); void setMoonScale(float f);
//! Get the display scaling factor for Earth's oon. //! Get the display scaling factor for Earth's oon.
float getMoonScale(void) const {return moonScale;} float getMoonScale(void) const {return moonScale;}
//! Translate names. (public so that SolarSystemEditor can call it).
void updateI18n();
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 209 skipping to change at line 203
//! Get the Planet object pointer for Earth's moon. //! Get the Planet object pointer for Earth's moon.
PlanetP getMoon() const {return moon;} PlanetP getMoon() const {return moon;}
//! Determine if a lunar eclipse is close at hand? //! Determine if a lunar eclipse is close at hand?
bool nearLunarEclipse(); bool nearLunarEclipse();
//! Get the list of all the planet english names //! Get the list of all the planet english names
QStringList getAllPlanetEnglishNames() const; QStringList getAllPlanetEnglishNames() const;
//! Get the list of all the planet localized names
QStringList getAllPlanetLocalizedNames() const;
//! Reload the planets //! Reload the planets
void reloadPlanets(); void reloadPlanets();
//////////////////////////////////////////////////////////////////// /////////////////// //////////////////////////////////////////////////////////////////// ///////////////////
// DEPRECATED // DEPRECATED
//////////////////////////////////////////////////////////////////// /////////////////// //////////////////////////////////////////////////////////////////// ///////////////////
//! Get a hash of locale and ssystem.ini names for use with the TUI. //! Get a hash of locale and ssystem.ini names for use with the TUI.
//! @return A newline delimited hash of localized:standard planet na mes. //! @return A newline delimited hash of localized:standard planet na mes.
//! Planet translated name is PARENT : NAME //! Planet translated name is PARENT : NAME
//! \deprecated ??? //! \deprecated ???
skipping to change at line 232 skipping to change at line 229
//! @param observerPos Position of the observer in heliocentric ecli ptic frame (Required for light travel time computation). //! @param observerPos Position of the observer in heliocentric ecli ptic frame (Required for light travel time computation).
//! @param date the date in JDay //! @param date the date in JDay
//! \deprecated ??? In the "deprecated" section, but used in SolarSy stem::init() //! \deprecated ??? In the "deprecated" section, but used in SolarSy stem::init()
//! and StelNavigator::updateTime() //! and StelNavigator::updateTime()
void computePositions(double date, const Vec3d& observerPos = Vec3d( 0.)); void computePositions(double date, const Vec3d& observerPos = Vec3d( 0.));
//! Get the list of all the bodies of the solar system. //! Get the list of all the bodies of the solar system.
//! \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:
//! Called when a new object is selected.
void selectedObjectChange(StelModule::StelModuleSelectAction action)
;
//! Load a color scheme
void setStelStyle(const QString& section);
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.
 End of changes. 6 change blocks. 
12 lines changed or deleted 16 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/