StelApp.hpp   StelApp.hpp 
skipping to change at line 47 skipping to change at line 47
class QNetworkReply; class QNetworkReply;
class QTimer; class QTimer;
class StelLocationMgr; class StelLocationMgr;
class StelSkyLayerMgr; class StelSkyLayerMgr;
class StelAudioMgr; class StelAudioMgr;
class StelVideoMgr; class StelVideoMgr;
class StelGuiBase; class StelGuiBase;
class StelMainScriptAPIProxy; class StelMainScriptAPIProxy;
class StelScriptMgr; class StelScriptMgr;
class StelActionMgr; class StelActionMgr;
class StelPropertyMgr;
class StelProgressController; class StelProgressController;
//! @class StelApp //! @class StelApp
//! Singleton main Stellarium application class. //! Singleton main Stellarium application class.
//! This is the central class of Stellarium. Only one singleton instance o f //! This is the central class of Stellarium. Only one singleton instance o f
//! this class is created and can be accessed from anywhere else. This cla ss //! this class is created and can be accessed from anywhere else. This cla ss
//! is the access point to several "Manager" class which provide applicatio n-wide //! is the access point to several "Manager" class which provide applicatio n-wide
//! services for managment of font, textures, localization, sky culture, an d in //! services for managment of font, textures, localization, sky culture, an d in
//! theory all other services used by the other part of the program. //! theory all other services used by the other part of the program.
//! //!
skipping to change at line 126 skipping to change at line 127
StelObjectMgr& getStelObjectMgr() {return *stelObjectMgr;} StelObjectMgr& getStelObjectMgr() {return *stelObjectMgr;}
StelSkyLayerMgr& getSkyImageMgr() {return *skyImageMgr;} StelSkyLayerMgr& getSkyImageMgr() {return *skyImageMgr;}
//! Get the audio manager //! Get the audio manager
StelAudioMgr* getStelAudioMgr() {return audioMgr;} StelAudioMgr* getStelAudioMgr() {return audioMgr;}
//! Get the actions manager to use for managing and editing actions //! Get the actions manager to use for managing and editing actions
StelActionMgr* getStelActionManager() {return actionMgr;} StelActionMgr* getStelActionManager() {return actionMgr;}
//! Return the property manager
StelPropertyMgr* getStelPropertyManager() {return propMgr;}
//! Get the video manager //! Get the video manager
StelVideoMgr* getStelVideoMgr() {return videoMgr;} StelVideoMgr* getStelVideoMgr() {return videoMgr;}
//! Get the core of the program. //! Get the core of the program.
//! It is the one which provide the projection, navigation and tone converter. //! It is the one which provide the projection, navigation and tone converter.
//! @return the StelCore instance of the program //! @return the StelCore instance of the program
StelCore* getCore() {return core;} StelCore* getCore() {return core;}
//! Get the common instance of QNetworkAccessManager used in stellar ium //! Get the common instance of QNetworkAccessManager used in stellar ium
QNetworkAccessManager* getNetworkAccessManager() {return networkAcce ssManager;} QNetworkAccessManager* getNetworkAccessManager() {return networkAcce ssManager;}
//! Update translations, font for GUI and sky everywhere in the prog ram. //! Update translations, font for GUI and sky everywhere in the prog ram.
void updateI18n(); void updateI18n();
//! Update and reload sky culture informations everywhere in the pro
gram.
void updateSkyCulture();
//! Return the main configuration options //! Return the main configuration options
QSettings* getSettings() {return confSettings;} QSettings* getSettings() {return confSettings;}
//! Return the currently used style //! Return the currently used style
QString getCurrentStelStyle() {return "color";} QString getCurrentStelStyle() {return "color";}
//! Update all object according to the deltaTime in seconds. //! Update all object according to the deltaTime in seconds.
void update(double deltaTime); void update(double deltaTime);
//! Draw all registered StelModule in the order defined by the order lists. //! Draw all registered StelModule in the order defined by the order lists.
skipping to change at line 217 skipping to change at line 218
//! Set flag for activating night vision mode. //! Set flag for activating night vision mode.
void setVisionModeNight(bool); void setVisionModeNight(bool);
//! Get flag for activating night vision mode. //! Get flag for activating night vision mode.
bool getVisionModeNight() const {return flagNightVision;} bool getVisionModeNight() const {return flagNightVision;}
//! Set flag for showing decimal degree in various places. //! Set flag for showing decimal degree in various places.
void setFlagShowDecimalDegrees(bool b); void setFlagShowDecimalDegrees(bool b);
//! Get flag for showing decimal degree in various places. //! Get flag for showing decimal degree in various places.
bool getFlagShowDecimalDegrees() const {return flagShowDecimalDegree s;} bool getFlagShowDecimalDegrees() const {return flagShowDecimalDegree s;}
//! Set flag for using calculation of azimuth from south towards wes //! Set flag for using calculation of azimuth from south towards wes
t (as in old astronomical literature) t (instead north towards east)
bool getFlagOldAzimuthUsage() const { return flagUseAzimuthFromSouth bool getFlagSouthAzimuthUsage() const { return flagUseAzimuthFromSou
; } th; }
//! Get flag for using calculation of azimuth from south towards wes //! Get flag for using calculation of azimuth from south towards wes
t (as in old astronomical literature) t (instead north towards east)
void setFlagOldAzimuthUsage(bool use) { flagUseAzimuthFromSouth=use; void setFlagSouthAzimuthUsage(bool use) { flagUseAzimuthFromSouth=us
} e; }
//! Set flag for using calculation of azimuth from south towards wes
t (as in older astronomical literature)
//! @deprecated Use getFlagSouthAzimuthUsage() instead.
bool getFlagOldAzimuthUsage() const { return getFlagSouthAzimuthUsag
e(); }
//! Get flag for using calculation of azimuth from south towards wes
t (as in older astronomical literature)
//! @deprecated Use setFlagSouthAzimuthUsage() instead.
void setFlagOldAzimuthUsage(bool use) { setFlagSouthAzimuthUsage(use
); }
//! Get the current number of frame per second. //! Get the current number of frame per second.
//! @return the FPS averaged on the last second //! @return the FPS averaged on the last second
float getFps() const {return fps;} float getFps() const {return fps;}
//! Return the time since when stellarium is running in second. //! Return the time since when stellarium is running in second.
static double getTotalRunTime(); static double getTotalRunTime();
//! Return the scaled time for animated objects
static double getAnimationTime();
//! Report that a download occured. This is used for statistics purp oses. //! Report that a download occured. This is used for statistics purp oses.
//! Connect this slot to QNetworkAccessManager::finished() slot to o btain statistics at the end of the program. //! Connect this slot to QNetworkAccessManager::finished() slot to o btain statistics at the end of the program.
void reportFileDownloadFinished(QNetworkReply* reply); void reportFileDownloadFinished(QNetworkReply* reply);
//! do some cleanup and call QCoreApplication::exit(0) //! do some cleanup and call QCoreApplication::exit(0)
void quit(); void quit();
signals: signals:
void visionNightModeChanged(bool); void visionNightModeChanged(bool);
void colorSchemeChanged(const QString&); void colorSchemeChanged(const QString&);
void languageChanged(); void languageChanged();
void skyCultureChanged(const QString&);
//! Called just after a progress bar is added. //! Called just after a progress bar is added.
void progressBarAdded(const StelProgressController*); void progressBarAdded(const StelProgressController*);
//! Called just before a progress bar is removed. //! Called just before a progress bar is removed.
void progressBarRemoved(const StelProgressController*); void progressBarRemoved(const StelProgressController*);
//! Called just before we exit Qt mainloop. //! Called just before we exit Qt mainloop.
void aboutToQuit(); void aboutToQuit();
private: private:
skipping to change at line 282 skipping to change at line 292
// Locale manager for the application // Locale manager for the application
StelLocaleMgr* localeMgr; StelLocaleMgr* localeMgr;
// Sky cultures manager for the application // Sky cultures manager for the application
StelSkyCultureMgr* skyCultureMgr; StelSkyCultureMgr* skyCultureMgr;
//Actions manager fot the application. Will replace shortcutMgr. //Actions manager fot the application. Will replace shortcutMgr.
StelActionMgr* actionMgr; StelActionMgr* actionMgr;
//Property manager for the application
StelPropertyMgr* propMgr;
// Textures manager for the application // Textures manager for the application
StelTextureMgr* textureMgr; StelTextureMgr* textureMgr;
// Manager for all the StelObjects of the program // Manager for all the StelObjects of the program
StelObjectMgr* stelObjectMgr; StelObjectMgr* stelObjectMgr;
// Manager for the list of observer locations on planets // Manager for the list of observer locations on planets
StelLocationMgr* planetLocationMgr; StelLocationMgr* planetLocationMgr;
// Main network manager used for the program // Main network manager used for the program
skipping to change at line 341 skipping to change at line 354
//! Define whether we are in night vision mode //! Define whether we are in night vision mode
bool flagNightVision; bool flagNightVision;
QSettings* confSettings; QSettings* confSettings;
// Define whether the StelApp instance has completed initialization // Define whether the StelApp instance has completed initialization
bool initialized; bool initialized;
static qint64 startMSecs; static qint64 startMSecs;
static float animationScale;
// Temporary variables used to store the last gl window resize // Temporary variables used to store the last gl window resize
// if the core was not yet initialized // if the core was not yet initialized
int saveProjW; int saveProjW;
int saveProjH; int saveProjH;
//! Store the number of downloaded files for statistics. //! Store the number of downloaded files for statistics.
int nbDownloadedFiles; int nbDownloadedFiles;
//! Store the summed size of all downloaded files in bytes. //! Store the summed size of all downloaded files in bytes.
qint64 totalDownloadedSize; qint64 totalDownloadedSize;
 End of changes. 8 change blocks. 
13 lines changed or deleted 30 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/