LandscapeMgr.hpp   LandscapeMgr.hpp 
skipping to change at line 60 skipping to change at line 60
WRITE setFlagCardinalsPoints WRITE setFlagCardinalsPoints
NOTIFY cardinalsPointsDisplayedChanged) NOTIFY cardinalsPointsDisplayedChanged)
Q_PROPERTY(bool fogDisplayed Q_PROPERTY(bool fogDisplayed
READ getFlagFog READ getFlagFog
WRITE setFlagFog WRITE setFlagFog
NOTIFY fogDisplayedChanged) NOTIFY fogDisplayedChanged)
Q_PROPERTY(bool landscapeDisplayed Q_PROPERTY(bool landscapeDisplayed
READ getFlagLandscape READ getFlagLandscape
WRITE setFlagLandscape WRITE setFlagLandscape
NOTIFY landscapeDisplayedChanged) NOTIFY landscapeDisplayedChanged)
Q_PROPERTY(bool illuminationDisplayed
READ getFlagIllumination
WRITE setFlagIllumination
NOTIFY illuminationDisplayedChanged)
Q_PROPERTY(bool databaseUsage Q_PROPERTY(bool databaseUsage
READ getFlagUseLightPollutionFromDatabase READ getFlagUseLightPollutionFromDatabase
WRITE setFlagUseLightPollutionFromDatabase WRITE setFlagUseLightPollutionFromDatabase
NOTIFY lightPollutionUsageChanged) NOTIFY lightPollutionUsageChanged)
public: public:
LandscapeMgr(); LandscapeMgr();
virtual ~LandscapeMgr(); virtual ~LandscapeMgr();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
skipping to change at line 94 skipping to change at line 98
//! and moon. //! and moon.
//! - updates adaptation luminescence based on visible bright object s. //! - updates adaptation luminescence based on visible bright object s.
virtual void update(double deltaTime); virtual void update(double deltaTime);
//! Get the order in which this module will draw its objects relativ e to other modules. //! Get the order in which this module will draw its objects relativ e to other modules.
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Method specific to the landscape manager // Method specific to the landscape manager
//! Return the global landscape luminance [0..1], for being used e.g for setting eye adaptation. //! Return the global landscape luminance [0..1], for being used e.g for setting eye adaptation.
//! GZ 2014-01-03: THIS IS MISLEADING. Returns 1 if atmosphere drawi ng is on and no eclipse underway, 0 if atmosphere is switched off. //! It returns 1 if atmosphere drawing is on and no eclipse underway , 0 if atmosphere is switched off.
//! The actual brightness is of no concern here. You may use getAtmo sphereAverageLuminance() for this. //! The actual brightness is of no concern here. You may use getAtmo sphereAverageLuminance() for this.
float getLuminance() const; float getLuminance() const;
//! return average luminance [cd/m^2] of atmosphere. Around 10 at su nset, 6400 in daylight, >0 in dark night. //! return average luminance [cd/m^2] of atmosphere. Around 10 at su nset, 6400 in daylight, >0 in dark night.
float getAtmosphereAverageLuminance() const; float getAtmosphereAverageLuminance() const;
//! Load a landscape based on a hash of parameters mirroring the lan dscape.ini //! Load a landscape based on a hash of parameters mirroring the lan dscape.ini
//! file and make it the current landscape. //! file and make it the current landscape.
bool loadLandscape(QMap<QString, QString>& param); bool loadLandscape(QMap<QString, QString>& param);
//! Create a new landscape from the files which describe it. //! Create a new landscape from the files which describe it.
skipping to change at line 174 skipping to change at line 178
//! Set flag for displaying Landscape. //! Set flag for displaying Landscape.
void setFlagLandscape(const bool displayed); void setFlagLandscape(const bool displayed);
//! Get whether the landscape is currently visible. If true, object below landscape must be rendered. //! Get whether the landscape is currently visible. If true, object below landscape must be rendered.
bool getIsLandscapeFullyVisible() const; bool getIsLandscapeFullyVisible() const;
//! Get flag for displaying Fog. //! Get flag for displaying Fog.
bool getFlagFog() const; bool getFlagFog() const;
//! Set flag for displaying Fog. //! Set flag for displaying Fog.
void setFlagFog(const bool displayed); void setFlagFog(const bool displayed);
//! Get flag for displaying illumination layer
bool getFlagIllumination() const;
//! Set flag for displaying illumination layer
void setFlagIllumination(const bool on);
//! Return the value of the flag determining if a change of landscap e will update the observer location. //! Return the value of the flag determining if a change of landscap e will update the observer location.
bool getFlagLandscapeSetsLocation() const {return flagLandscapeSetsL ocation;} bool getFlagLandscapeSetsLocation() const {return flagLandscapeSetsL ocation;}
//! Set the value of the flag determining if a change of landscape w ill update the observer location. //! Set the value of the flag determining if a change of landscape w ill update the observer location.
void setFlagLandscapeSetsLocation(bool b) {flagLandscapeSetsLocation =b;} void setFlagLandscapeSetsLocation(bool b) {flagLandscapeSetsLocation =b;}
//! Return the value of the flag determining if a minimal brightness should be used to keep landscape visible. //! Return the value of the flag determining if a minimal brightness should be used to keep landscape visible.
bool getFlagLandscapeUseMinimalBrightness() const {return flagLandsc apeUseMinimalBrightness; } bool getFlagLandscapeUseMinimalBrightness() const {return flagLandsc apeUseMinimalBrightness; }
//! Set the value of the flag determining if a minimal brightness sh ould be used to keep landscape visible. //! Set the value of the flag determining if a minimal brightness sh ould be used to keep landscape visible.
void setFlagLandscapeUseMinimalBrightness(bool b) {flagLandscapeUseM inimalBrightness=b; } void setFlagLandscapeUseMinimalBrightness(bool b) {flagLandscapeUseM inimalBrightness=b; }
//! Return the value of the flag determining if the minimal brightne ss should be taken from landscape.ini //! Return the value of the flag determining if the minimal brightne ss should be taken from landscape.ini
bool getFlagLandscapeSetsMinimalBrightness() const {return flagLands capeSetsMinimalBrightness;} bool getFlagLandscapeSetsMinimalBrightness() const {return flagLands capeSetsMinimalBrightness;}
//! Sets the value of the flag determining if the minimal brightness should be taken from landscape.ini //! Sets the value of the flag determining if the minimal brightness should be taken from landscape.ini
void setFlagLandscapeSetsMinimalBrightness(bool b) {flagLandscapeSet sMinimalBrightness=b;} void setFlagLandscapeSetsMinimalBrightness(bool b) {flagLandscapeSet sMinimalBrightness=b;}
//! Return the minimal brightness value of the landscape //! Return the minimal brightness value of the landscape
float getDefaultMinimalBrightness() const {return defaultMinimalBrig htness;} double getDefaultMinimalBrightness() const {return defaultMinimalBri ghtness;}
//! Set the minimal brightness value of the landscape. //! Set the minimal brightness value of the landscape.
void setDefaultMinimalBrightness(const float b) {defaultMinimalBrigh tness=b;} void setDefaultMinimalBrightness(const double b) {defaultMinimalBrig htness=b;}
//! Sets the value of the flag usage light pollution (and bortle ind ex) from locations database. //! Sets the value of the flag usage light pollution (and bortle ind ex) from locations database.
void setFlagUseLightPollutionFromDatabase(const bool usage); void setFlagUseLightPollutionFromDatabase(const bool usage);
//! Return the value of flag usage light pollution (and bortle index ) from locations database. //! Return the value of flag usage light pollution (and bortle index ) from locations database.
bool getFlagUseLightPollutionFromDatabase() const; bool getFlagUseLightPollutionFromDatabase() const;
//! Get flag for displaying Cardinals Points. //! Get flag for displaying Cardinals Points.
bool getFlagCardinalsPoints() const; bool getFlagCardinalsPoints() const;
//! Set flag for displaying Cardinals Points. //! Set flag for displaying Cardinals Points.
void setFlagCardinalsPoints(const bool displayed); void setFlagCardinalsPoints(const bool displayed);
skipping to change at line 319 skipping to change at line 327
//! Get flag for auto-enable of atmospheres for planets. //! Get flag for auto-enable of atmospheres for planets.
bool getFlagAtmosphereAutoEnable() const; bool getFlagAtmosphereAutoEnable() const;
//! Set flag for auto-enable atmosphere for planets with atmospheres in location window //! Set flag for auto-enable atmosphere for planets with atmospheres in location window
void setFlagAtmosphereAutoEnable(bool b); void setFlagAtmosphereAutoEnable(bool b);
signals: signals:
void atmosphereDisplayedChanged(const bool displayed); void atmosphereDisplayedChanged(const bool displayed);
void cardinalsPointsDisplayedChanged(const bool displayed); void cardinalsPointsDisplayedChanged(const bool displayed);
void fogDisplayedChanged(const bool displayed); void fogDisplayedChanged(const bool displayed);
void landscapeDisplayedChanged(const bool displayed); void landscapeDisplayedChanged(const bool displayed);
void illuminationDisplayedChanged(const bool displayed);
void lightPollutionUsageChanged(const bool usage); void lightPollutionUsageChanged(const bool usage);
//! Emitted when a landscape has been installed or un-installed. //! Emitted when a landscape has been installed or un-installed.
//! For example, it is used to update the list of landscapes in //! For example, it is used to update the list of landscapes in
//! the Sky and viewing options window (the ViewDialog class) //! the Sky and viewing options window (the ViewDialog class)
void landscapesChanged(); void landscapesChanged();
void lightPollutionChanged(); void lightPollutionChanged();
//! Emitted when installLandscapeFromArchive() can't read from, writ e to or //! Emitted when installLandscapeFromArchive() can't read from, writ e to or
 End of changes. 6 change blocks. 
3 lines changed or deleted 12 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/