SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 833 skipping to change at line 833
void solarSystemDataReloaded(); void solarSystemDataReloaded();
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 Q_NULLPTR. //! @return The matching planet pointer if exists or Q_NULLPTR.
PlanetP searchByEnglishName(QString planetEnglishName) const; PlanetP searchByEnglishName(QString planetEnglishName) const;
PlanetP searchMinorPlanetByEnglishName(QString planetEnglishName) co
nst;
//! 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;}
//! Get the Planet object pointer for the Earth. //! Get the Planet object pointer for the Earth.
PlanetP getEarth() 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() 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 //! Get the list of all the planet localized names
QStringList getAllPlanetLocalizedNames() const; QStringList getAllPlanetLocalizedNames() const;
//! Get the list of all the minor planet common english names
QStringList getAllMinorPlanetCommonEnglishNames() const;
//! Reload the planets //! Reload the planets
void reloadPlanets(); void reloadPlanets();
//! New 0.16: delete a planet from the solar system. Writes a warnin g to log if this is not a minor object. //! New 0.16: delete a planet from the solar system. Writes a warnin g to log if this is not a minor object.
bool removePlanet(QString name); bool removeMinorPlanet(QString name);
//! Determines relative amount of sun visible from the observer's po sition. //! Determines relative amount of sun visible from the observer's po sition.
double getEclipseFactor(const StelCore *core) const; double getEclipseFactor(const StelCore *core) const;
//! Compute the position and transform matrix for every element of t he solar system. //! Compute the position and transform matrix for every element of t he solar system.
//! @param observerPos Position of the observer in heliocentric ecli ptic frame (Required for light travel time computation).
//! @param dateJDE the Julian Day in JDE (Ephemeris Time or equivale nt) //! @param dateJDE the Julian Day in JDE (Ephemeris Time or equivale nt)
void computePositions(double dateJDE, const Vec3d& observerPos = Vec //! @param observerPlanet planet of the observer (Required for light
3d(0.)); travel time or aberration computation).
void computePositions(double dateJDE, PlanetP observerPlanet);
//! Get the list of all the bodies of the solar system. //! Get the list of all the bodies of the solar system.
const QList<PlanetP>& getAllPlanets() const {return systemPlanets;} const QList<PlanetP>& getAllPlanets() const {return systemPlanets;}
//! Get the list of all the bodies of the solar system.
const QList<PlanetP>& getAllMinorBodies() const {return systemMinorB
odies;}
//! Get the list of all minor bodies names. //! Get the list of all minor bodies names.
const QStringList getMinorBodiesList() const { return minorBodies; } const QStringList getMinorBodiesList() const { return minorBodies; }
//! Get lighttime corrected solar position (essential to draw the su
n during solar eclipse and compute things like eclipse factor etc, until we
get aberration working.)
const Vec3d getLightTimeSunPosition() const { return lightTimeSunPos
ition; }
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) ;
//! Called when the sky culture is updated. //! Called when the sky culture is updated.
//! Loads native names of planets for a given sky culture. //! Loads native names of planets for a given sky culture.
//! @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);
//! Called following StelMainView::reloadShadersRequested //! Called following StelMainView::reloadShadersRequested
skipping to change at line 920 skipping to change at line 930
//! This function attempts to load every possible instance of the //! This function attempts to load every possible instance of the
//! Solar System configuration files in the file paths, falling back if a //! Solar System configuration files in the file paths, falling back if a
//! given path can't be loaded. //! given path can't be loaded.
void loadPlanets(); void loadPlanets();
//! Load planet data from the given file //! Load planet data from the given file
bool loadPlanets(const QString& filePath); bool loadPlanets(const QString& filePath);
void recreateTrails(); void recreateTrails();
//! Calculate a color of Solar system bodies
//! @param bV value of B-V color index
unsigned char BvToColorIndex(float bV);
//! Set flag who enable display a permanent orbits for objects or no t //! Set flag who enable display a permanent orbits for objects or no t
void setFlagPermanentOrbits(bool b); void setFlagPermanentOrbits(bool b);
//! Used to count how many planets actually need shadow information //! Used to count how many planets actually need shadow information
int shadowPlanetCount; int shadowPlanetCount;
PlanetP sun; PlanetP sun;
PlanetP moon; PlanetP moon;
PlanetP earth; PlanetP earth;
//! Set selected planets by englishName. //! Set selected planets by englishName.
skipping to change at line 953 skipping to change at line 967
bool flagMinorBodyScale; bool flagMinorBodyScale;
double minorBodyScale; double minorBodyScale;
QFont planetNameFont; QFont planetNameFont;
//! The amount of planets labels (between 0 and 10). //! The amount of planets labels (between 0 and 10).
double labelsAmount; double labelsAmount;
//! List of all the bodies of the solar system. //! List of all the bodies of the solar system.
QList<PlanetP> systemPlanets; QList<PlanetP> systemPlanets;
//! List of all the minor bodies of the solar system.
QList<PlanetP> systemMinorBodies;
// Master settings // Master settings
bool flagOrbits; bool flagOrbits;
bool flagLightTravelTime; bool flagLightTravelTime;
bool flagUseObjModels; bool flagUseObjModels;
bool flagShowObjSelfShadows; bool flagShowObjSelfShadows;
//! The selection pointer texture. //! The selection pointer texture.
StelTextureSP texPointer; StelTextureSP texPointer;
StelTextureSP texCircle; // The symbolic circle t exture StelTextureSP texCircle; // The symbolic circle t exture
skipping to change at line 985 skipping to change at line 1001
class TrailGroup* allTrails; class TrailGroup* allTrails;
StelGui* gui; StelGui* gui;
QSettings* conf; QSettings* conf;
LinearFader trailFader; LinearFader trailFader;
Vec3f trailColor; Vec3f trailColor;
Vec3f pointerColor; Vec3f pointerColor;
QHash<QString, QString> planetNativeNamesMap; QHash<QString, QString> planetNativeNamesMap;
QStringList minorBodies; QStringList minorBodies;
Vec3d lightTimeSunPosition; // when observing a
solar eclipse, we need solar position 8 minutes ago.
// Direct shift caus
ed problems (LP:#1699648), circumvented with this construction.
// 0.16pre observation GZ: this list contains pointers to all orbit objects, // 0.16pre observation GZ: this list contains pointers to all orbit objects,
// while the planets don't own their orbit objects. // while the planets don't own their orbit objects.
// Would it not be better to hand over the orbit object ownership to the Planet object? // Would it not be better to hand over the orbit object ownership to the Planet object?
// This list could then be removed. // This list could then be removed.
// In case this was originally intended to provide some fast access for time-dependent computation with the same JD, // In case this was originally intended to provide some fast access for time-dependent computation with the same JD,
// note that we must also always compensate to light time travel, so likely each computation has to be done twice, // note that we must also always compensate to light time travel, so likely each computation has to be done twice,
// with current JDE and JDE-lightTime(distance). // with current JDE and JDE-lightTime(distance).
QList<Orbit*> orbits; // Pointers on created elliptical or bits. 0.16pre: WHY DO WE NEED THIS??? QList<Orbit*> orbits; // Pointers on created elliptical or bits. 0.16pre: WHY DO WE NEED THIS???
}; };
 End of changes. 10 change blocks. 
4 lines changed or deleted 29 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/