StelApp.hpp   StelApp.hpp 
skipping to change at line 87 skipping to change at line 87
virtual ~StelApp(); virtual ~StelApp();
//! Initialize core and all the modules. //! Initialize core and all the modules.
void init(QSettings* conf); void init(QSettings* conf);
//! Deinitialize core and all the modules. //! Deinitialize core and all the modules.
void deinit(); void deinit();
//! Load and initialize external modules (plugins) //! Load and initialize external modules (plugins)
void initPlugIns(); void initPlugIns();
//! Registers all loaded StelModules with the ScriptMgr, and queues
starting of the startup script.
void initScriptMgr();
//! Get the StelApp singleton instance. //! Get the StelApp singleton instance.
//! @return the StelApp singleton instance //! @return the StelApp singleton instance
static StelApp& getInstance() {Q_ASSERT(singleton); return *singleto n;} static StelApp& getInstance() {Q_ASSERT(singleton); return *singleto n;}
//! Get the module manager to use for accessing any module loaded in the application. //! Get the module manager to use for accessing any module loaded in the application.
//! @return the module manager. //! @return the module manager.
StelModuleMgr& getModuleMgr() {return *moduleMgr;} StelModuleMgr& getModuleMgr() {return *moduleMgr;}
//! Get the locale manager to use for i18n & date/time localization. //! Get the locale manager to use for i18n & date/time localization.
//! @return the font manager to use for loading fonts. //! @return the font manager to use for loading fonts.
skipping to change at line 214 skipping to change at line 217
//! 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
t (as in old astronomical literature)
bool getFlagOldAzimuthUsage() const { return flagUseAzimuthFromSouth
; }
//! Get flag for using calculation of azimuth from south towards wes
t (as in old astronomical literature)
void setFlagOldAzimuthUsage(bool use) { flagUseAzimuthFromSouth=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();
//! 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);
skipping to change at line 253 skipping to change at line 261
void handleClick(class QMouseEvent* event); void handleClick(class QMouseEvent* event);
//! Handle mouse wheel. //! Handle mouse wheel.
void handleWheel(class QWheelEvent* event); void handleWheel(class QWheelEvent* event);
//! Handle mouse move. //! Handle mouse move.
void handleMove(float x, float y, Qt::MouseButtons b); void handleMove(float x, float y, Qt::MouseButtons b);
//! Handle key press and release. //! Handle key press and release.
void handleKeys(class QKeyEvent* event); void handleKeys(class QKeyEvent* event);
//! Handle pinch on multi touch devices. //! Handle pinch on multi touch devices.
void handlePinch(qreal scale, bool started); void handlePinch(qreal scale, bool started);
void initScriptMgr(QSettings* conf);
void prepareRenderBuffer(); void prepareRenderBuffer();
void applyRenderBuffer(); void applyRenderBuffer();
// The StelApp singleton // The StelApp singleton
static StelApp* singleton; static StelApp* singleton;
// The associated StelCore instance // The associated StelCore instance
StelCore* core; StelCore* core;
// Module manager for the application // Module manager for the application
skipping to change at line 289 skipping to change at line 295
// 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
QNetworkAccessManager* networkAccessManager; QNetworkAccessManager* networkAccessManager;
//! Get proxy settings from config file... if not set use http_proxy env var //! Get proxy settings from config file... if not set use http_proxy env var
void setupHttpProxy(); void setupNetworkProxy();
// The audio manager. Must execute in the main thread. // The audio manager. Must execute in the main thread.
StelAudioMgr* audioMgr; StelAudioMgr* audioMgr;
// The video manager. Must execute in the main thread. // The video manager. Must execute in the main thread.
StelVideoMgr* videoMgr; StelVideoMgr* videoMgr;
StelSkyLayerMgr* skyImageMgr; StelSkyLayerMgr* skyImageMgr;
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
skipping to change at line 361 skipping to change at line 367
QList<StelProgressController*> progressControllers; QList<StelProgressController*> progressControllers;
int baseFontSize; int baseFontSize;
// Framebuffer object used for viewport effects. // Framebuffer object used for viewport effects.
QOpenGLFramebufferObject* renderBuffer; QOpenGLFramebufferObject* renderBuffer;
StelViewportEffect* viewportEffect; StelViewportEffect* viewportEffect;
bool flagShowDecimalDegrees; bool flagShowDecimalDegrees;
// flag to indicate we want calculate azimuth from south towards wes
t (as in old astronomical literature)
bool flagUseAzimuthFromSouth;
}; };
#endif // _STELAPP_HPP_ #endif // _STELAPP_HPP_
 End of changes. 5 change blocks. 
3 lines changed or deleted 18 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/