SolarSystem.hpp   SolarSystem.hpp 
skipping to change at line 70 skipping to change at line 70
WRITE setFlagTrails WRITE setFlagTrails
NOTIFY trailsDisplayedChanged) NOTIFY trailsDisplayedChanged)
Q_PROPERTY(bool flagHints // was bool hintsDisplayed. This is a "for warding property" only, without own variable. Q_PROPERTY(bool flagHints // was bool hintsDisplayed. This is a "for warding property" only, without own variable.
READ getFlagHints READ getFlagHints
WRITE setFlagHints WRITE setFlagHints
NOTIFY flagHintsChanged) NOTIFY flagHintsChanged)
Q_PROPERTY(bool flagPointer // was bool pointersDisplayed Q_PROPERTY(bool flagPointer // was bool pointersDisplayed
READ getFlagPointer READ getFlagPointer
WRITE setFlagPointer WRITE setFlagPointer
NOTIFY flagPointerChanged) NOTIFY flagPointerChanged)
Q_PROPERTY(bool flagNativeNames // was bool nativeNamesDisplayed Q_PROPERTY(bool flagNativePlanetNames // was bool nativeNamesDisplay
READ getFlagNativeNames ed
WRITE setFlagNativeNames READ getFlagNativePlanetNames
NOTIFY flagNativeNamesChanged) WRITE setFlagNativePlanetNames
NOTIFY flagNativePlanetNamesChanged)
Q_PROPERTY(bool flagTranslatedNames Q_PROPERTY(bool flagTranslatedNames
READ getFlagTranslatedNames READ getFlagTranslatedNames
WRITE setFlagTranslatedNames WRITE setFlagTranslatedNames
NOTIFY flagTranslatedNamesChanged) NOTIFY flagTranslatedNamesChanged)
//StelProperties //StelProperties
Q_PROPERTY(bool planetsDisplayed Q_PROPERTY(bool planetsDisplayed
READ getFlagPlanets READ getFlagPlanets
WRITE setFlagPlanets WRITE setFlagPlanets
NOTIFY flagPlanetsDisplayedChanged NOTIFY flagPlanetsDisplayedChanged
skipping to change at line 198 skipping to change at line 198
Q_PROPERTY(Vec3f oortCloudObjectsOrbitsColor Q_PROPERTY(Vec3f oortCloudObjectsOrbitsColor
READ getOortCloudObjectsOrbitsColor READ getOortCloudObjectsOrbitsColor
WRITE setOortCloudObjectsOrbitsColor WRITE setOortCloudObjectsOrbitsColor
NOTIFY oortCloudObjectsOrbitsColorChanged NOTIFY oortCloudObjectsOrbitsColorChanged
) )
Q_PROPERTY(Vec3f cometsOrbitsColor Q_PROPERTY(Vec3f cometsOrbitsColor
READ getCometsOrbitsColor READ getCometsOrbitsColor
WRITE setCometsOrbitsColor WRITE setCometsOrbitsColor
NOTIFY cometsOrbitsColorChanged NOTIFY cometsOrbitsColorChanged
) )
Q_PROPERTY(Vec3f sednoidsOrbitsColor
READ getSednoidsOrbitsColor
WRITE setSednoidsOrbitsColor
NOTIFY sednoidsOrbitsColorChanged
)
Q_PROPERTY(Vec3f mercuryOrbitColor Q_PROPERTY(Vec3f mercuryOrbitColor
READ getMercuryOrbitColor READ getMercuryOrbitColor
WRITE setMercuryOrbitColor WRITE setMercuryOrbitColor
NOTIFY mercuryOrbitColorChanged NOTIFY mercuryOrbitColorChanged
) )
Q_PROPERTY(Vec3f venusOrbitColor Q_PROPERTY(Vec3f venusOrbitColor
READ getVenusOrbitColor READ getVenusOrbitColor
WRITE setVenusOrbitColor WRITE setVenusOrbitColor
NOTIFY venusOrbitColorChanged NOTIFY venusOrbitColorChanged
) )
skipping to change at line 473 skipping to change at line 478
//! @param c The color of the comet orbit lines (R,G,B) //! @param c The color of the comet orbit lines (R,G,B)
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! SolarSystem.setCometsOrbitsColor(Vec3f(1.0,0.0,0.0)); //! SolarSystem.setCometsOrbitsColor(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
void setCometsOrbitsColor(const Vec3f& c); void setCometsOrbitsColor(const Vec3f& c);
//! Get the current color used to draw comet orbit lines. //! Get the current color used to draw comet orbit lines.
//! @return current color //! @return current color
Vec3f getCometsOrbitsColor(void) const; Vec3f getCometsOrbitsColor(void) const;
//! Set the color used to draw sednoid orbit lines.
//! @param c The color of the sednoid orbit lines (R,G,B)
//! @code
//! // example of usage in scripts
//! SolarSystem.setSednoidsOrbitsColor(Vec3f(1.0,0.0,0.0));
//! @endcode
void setSednoidsOrbitsColor(const Vec3f& c);
//! Get the current color used to draw sednoid orbit lines.
//! @return current color
Vec3f getSednoidsOrbitsColor(void) const;
//! Set the color used to draw Mercury orbit line. //! Set the color used to draw Mercury orbit line.
//! @param c The color of Mercury orbit line (R,G,B) //! @param c The color of Mercury orbit line (R,G,B)
//! @code //! @code
//! // example of usage in scripts //! // example of usage in scripts
//! SolarSystem.setMercuryOrbitColor(Vec3f(1.0,0.0,0.0)); //! SolarSystem.setMercuryOrbitColor(Vec3f(1.0,0.0,0.0));
//! @endcode //! @endcode
void setMercuryOrbitColor(const Vec3f& c); void setMercuryOrbitColor(const Vec3f& c);
//! Get the current color used to draw Mercury orbit line. //! Get the current color used to draw Mercury orbit line.
//! @return current color //! @return current color
Vec3f getMercuryOrbitColor(void) const; Vec3f getMercuryOrbitColor(void) const;
skipping to change at line 647 skipping to change at line 663
//! @param algorithm the case in-sensitive algorithm name //! @param algorithm the case in-sensitive algorithm name
//! @note: The structure of algorithms is almost identical, just the numbers are different! You should activate //! @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!) //! Mueller's algorithm for simulate the eye's impression. (Esp. Ven us!)
void setApparentMagnitudeAlgorithmOnEarth(QString algorithm); void setApparentMagnitudeAlgorithmOnEarth(QString algorithm);
//! Get the algorithm used for computation of apparent magnitudes fo r planets in case observer on the Earth //! Get the algorithm used for computation of apparent magnitudes fo r planets in case observer on the Earth
//! @see setApparentMagnitudeAlgorithmOnEarth() //! @see setApparentMagnitudeAlgorithmOnEarth()
QString getApparentMagnitudeAlgorithmOnEarth() const; QString getApparentMagnitudeAlgorithmOnEarth() const;
//! Set flag which enable use native names for planets or not. //! Set flag which enable use native names for planets or not.
void setFlagNativeNames(bool b); void setFlagNativePlanetNames(bool b);
//! Get the current value of the flag which enables showing native n ames for planets or not. //! Get the current value of the flag which enables showing native n ames for planets or not.
bool getFlagNativeNames(void) const; bool getFlagNativePlanetNames(void) const;
//! Set flag which enable use translated names for planets or not. //! Set flag which enable use translated names for planets or not.
void setFlagTranslatedNames(bool b); void setFlagTranslatedNames(bool b);
//! Get the current value of the flag which enables showing translat ed names for planets or not. //! Get the current value of the flag which enables showing translat ed names for planets or not.
bool getFlagTranslatedNames(void) const; bool getFlagTranslatedNames(void) const;
//! Set flag which enabled the showing of isolated trails for select ed objects only or not //! Set flag which enabled the showing of isolated trails for select ed objects only or not
void setFlagIsolatedTrails(bool b); void setFlagIsolatedTrails(bool b);
//! Get the current value of the flag which enables showing of isola ted trails for selected objects only or not. //! Get the current value of the flag which enables showing of isola ted trails for selected objects only or not.
bool getFlagIsolatedTrails(void) const; bool getFlagIsolatedTrails(void) const;
skipping to change at line 706 skipping to change at line 722
//! Get list of objects by type //! Get list of objects by type
//! @param objType object type //! @param objType object type
QStringList getObjectsList(QString objType="all") const; QStringList getObjectsList(QString objType="all") const;
signals: signals:
void labelsDisplayedChanged(bool b); void labelsDisplayedChanged(bool b);
void flagOrbitsChanged(bool b); void flagOrbitsChanged(bool b);
void flagHintsChanged(bool b); void flagHintsChanged(bool b);
void trailsDisplayedChanged(bool b); void trailsDisplayedChanged(bool b);
void flagPointerChanged(bool b); void flagPointerChanged(bool b);
void flagNativeNamesChanged(bool b); void flagNativePlanetNamesChanged(bool b);
void flagTranslatedNamesChanged(bool b); void flagTranslatedNamesChanged(bool b);
void flagPlanetsDisplayedChanged(bool b); void flagPlanetsDisplayedChanged(bool b);
void flagIsolatedOrbitsChanged(bool b); void flagIsolatedOrbitsChanged(bool b);
void flagIsolatedTrailsChanged(bool b); void flagIsolatedTrailsChanged(bool b);
void flagLightTravelTimeChanged(bool b); void flagLightTravelTimeChanged(bool b);
void flagMoonScaleChanged(bool b); void flagMoonScaleChanged(bool b);
void moonScaleChanged(double f); void moonScaleChanged(double f);
void labelsAmountChanged(double f); void labelsAmountChanged(double f);
void ephemerisMarkersChanged(bool b); void ephemerisMarkersChanged(bool b);
void ephemerisDatesChanged(bool b); void ephemerisDatesChanged(bool b);
skipping to change at line 732 skipping to change at line 748
void orbitsColorChanged(const Vec3f & color) const; void orbitsColorChanged(const Vec3f & color) const;
void majorPlanetsOrbitsColorChanged(const Vec3f & color) const; void majorPlanetsOrbitsColorChanged(const Vec3f & color) const;
void minorPlanetsOrbitsColorChanged(const Vec3f & color) const; void minorPlanetsOrbitsColorChanged(const Vec3f & color) const;
void dwarfPlanetsOrbitsColorChanged(const Vec3f & color) const; void dwarfPlanetsOrbitsColorChanged(const Vec3f & color) const;
void moonsOrbitsColorChanged(const Vec3f & color) const; void moonsOrbitsColorChanged(const Vec3f & color) const;
void cubewanosOrbitsColorChanged(const Vec3f & color) const; void cubewanosOrbitsColorChanged(const Vec3f & color) const;
void plutinosOrbitsColorChanged(const Vec3f & color) const; void plutinosOrbitsColorChanged(const Vec3f & color) const;
void scatteredDiskObjectsOrbitsColorChanged(const Vec3f & color) con st; void scatteredDiskObjectsOrbitsColorChanged(const Vec3f & color) con st;
void oortCloudObjectsOrbitsColorChanged(const Vec3f & color) const; void oortCloudObjectsOrbitsColorChanged(const Vec3f & color) const;
void cometsOrbitsColorChanged(const Vec3f & color) const; void cometsOrbitsColorChanged(const Vec3f & color) const;
void sednoidsOrbitsColorChanged(const Vec3f & color) const;
void mercuryOrbitColorChanged(const Vec3f & color) const; void mercuryOrbitColorChanged(const Vec3f & color) const;
void venusOrbitColorChanged(const Vec3f & color) const; void venusOrbitColorChanged(const Vec3f & color) const;
void earthOrbitColorChanged(const Vec3f & color) const; void earthOrbitColorChanged(const Vec3f & color) const;
void marsOrbitColorChanged(const Vec3f & color) const; void marsOrbitColorChanged(const Vec3f & color) const;
void jupiterOrbitColorChanged(const Vec3f & color) const; void jupiterOrbitColorChanged(const Vec3f & color) const;
void saturnOrbitColorChanged(const Vec3f & color) const; void saturnOrbitColorChanged(const Vec3f & color) const;
void uranusOrbitColorChanged(const Vec3f & color) const; void uranusOrbitColorChanged(const Vec3f & color) const;
void neptuneOrbitColorChanged(const Vec3f & color) const; void neptuneOrbitColorChanged(const Vec3f & color) const;
void orbitColorStyleChanged(QString style) const; void orbitColorStyleChanged(QString style) const;
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 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 865 skipping to change at line 884
// Master settings // Master settings
bool flagOrbits; bool flagOrbits;
bool flagLightTravelTime; bool flagLightTravelTime;
//! 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
bool flagShow; bool flagShow;
bool flagPointer; // show red cross select ion pointer? bool flagPointer; // show red cross select ion pointer?
bool flagNativeNames; // show native names? bool flagNativePlanetNames; // show native names for planets?
bool flagTranslatedNames; // show translated names ? bool flagTranslatedNames; // show translated names ?
bool flagIsolatedTrails; bool flagIsolatedTrails;
bool flagIsolatedOrbits; bool flagIsolatedOrbits;
bool ephemerisMarkersDisplayed; bool ephemerisMarkersDisplayed;
bool ephemerisDatesDisplayed; bool ephemerisDatesDisplayed;
class TrailGroup* allTrails; class TrailGroup* allTrails;
StelGui* gui; StelGui* gui;
QSettings* conf; QSettings* conf;
LinearFader trailFader; LinearFader trailFader;
 End of changes. 9 change blocks. 
8 lines changed or deleted 28 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/