SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 33 skipping to change at line 33
#if defined(sun) #if defined(sun)
#undef sun #undef sun
#endif #endif
#include <QFont> #include <QFont>
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
#include "Planet.hpp" #include "Planet.hpp"
class Orbit; class Orbit;
class StelLoadingBar;
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
skipping to change at line 80 skipping to change at line 79
//! This includes planet motion trails. //! This includes planet motion trails.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Translate names. //! Translate names.
virtual void updateI18n(); virtual void updateI18n();
//! Called when a new object is selected. //! Called when a new object is selected.
virtual void selectedObjectChangeCallBack(StelModuleSelectAction act ion=StelModule::ReplaceSelection); virtual void selectedObjectChangeCallBack(StelModuleSelectAction act ion=StelModule::ReplaceSelection);
//! Load a color scheme //! Load a color scheme
virtual void setStelStyle(const StelStyle& style); 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.
skipping to change at line 171 skipping to change at line 170
//! Set the color used to draw planet labels. //! Set the color used to draw planet labels.
void setLabelsColor(const Vec3f& c); void setLabelsColor(const Vec3f& c);
//! Get the current color used to draw planet labels. //! Get the current color used to draw planet labels.
const Vec3f& getLabelsColor(void) const; const Vec3f& getLabelsColor(void) const;
//! Set the color used to draw planet orbit lines. //! Set the color used to draw planet orbit lines.
void setOrbitsColor(const Vec3f& c); void setOrbitsColor(const Vec3f& c);
//! Get the current color used to draw planet orbit lines. //! Get the current color used to draw planet orbit lines.
Vec3f getOrbitsColor(void) const; Vec3f getOrbitsColor(void) const;
//! Set the color used to draw planet trails. //! Set the color used to draw planet trails lines.
void setTrailsColor(const Vec3f& c); void setTrailsColor(const Vec3f& c) {trailColor=c;}
//! Get the current color used to draw planet trails. //! Get the current color used to draw planet trails lines.
Vec3f getTrailsColor(void) const; Vec3f getTrailsColor() const {return trailColor;}
//! 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;}
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(void) const {return sun;} PlanetP getSun() const {return sun;}
//! Get the Planet object pointer for the Earth. //! Get the Planet object pointer for the Earth.
PlanetP getEarth(void) const {return earth;} PlanetP getEarth() const {return earth;}
//! Get the Planet object pointer for Earth's moon. //! Get the Planet object pointer for Earth's moon.
PlanetP getMoon(void) 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;
//////////////////////////////////////////////////////////////////// /////////////////// //////////////////////////////////////////////////////////////////// ///////////////////
// DEPRECATED // DEPRECATED
//////////////////////////////////////////////////////////////////// /////////////////// //////////////////////////////////////////////////////////////////// ///////////////////
skipping to change at line 233 skipping to change at line 232
const QList<PlanetP>& getAllPlanets() const {return systemPlanets;} const QList<PlanetP>& getAllPlanets() const {return systemPlanets;}
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;
//! Update the planet motion trails.
// void updateTrails(const StelNavigator* nav);
//! Start/stop accumulating new trail data (clear old data).
void startTrails(bool b);
//! 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.
void computeTransMatrices(double date, const Vec3d& observerPos = Ve c3d(0.)); void computeTransMatrices(double date, const Vec3d& observerPos = Ve c3d(0.));
//! Draw a nice animated pointer around the object. //! Draw a nice animated pointer around the object.
void drawPointer(const StelCore* core); void drawPointer(const StelCore* core);
//! Load planet data from a file. //! Load planet data from a file.
void loadPlanets(); void loadPlanets();
void recreateTrails();
PlanetP sun; PlanetP sun;
PlanetP moon; PlanetP moon;
PlanetP earth; PlanetP earth;
//! Set selected planets by englishName. //! Set selected planets by englishName.
//! @param englishName The planet name or "" to select no planet //! @param englishName The planet name or "" to select no planet
void setSelected(const QString& englishName); void setSelected(const QString& englishName);
//! Set selected object from its pointer. //! Set selected object from its pointer.
void setSelected(PlanetP obj); void setSelected(PlanetP obj);
//! Get selected object's pointer. //! Get selected object's pointer.
skipping to change at line 284 skipping to change at line 279
// 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;
class TrailGroup* allTrails;
LinearFader trailFader;
Vec3f trailColor;
//////////////////////////////////////////////////////////////////// ////////////// //////////////////////////////////////////////////////////////////// //////////////
// DEPRECATED // DEPRECATED
//////////////////////////////////////////////////////////////////// ////////////// //////////////////////////////////////////////////////////////////// //////////////
PlanetP lastHomePlanet; // for tracking home planet changes for t rails
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. 10 change blocks. 
16 lines changed or deleted 14 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/