Supernovae.hpp   Supernovae.hpp 
skipping to change at line 25 skipping to change at line 25
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _SUPERNOVAE_HPP_ #ifndef _SUPERNOVAE_HPP_
#define _SUPERNOVAE_HPP_ #define _SUPERNOVAE_HPP_
#include "StelObjectModule.hpp" #include "StelObjectModule.hpp"
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelFader.hpp" #include "StelFader.hpp"
#include "StelTextureTypes.hpp"
#include "Supernova.hpp" #include "Supernova.hpp"
#include <QFont> #include <QFont>
#include <QVariantMap> #include <QVariantMap>
#include <QDateTime> #include <QDateTime>
#include <QList> #include <QList>
#include <QSharedPointer> #include <QSharedPointer>
#include <QHash> #include <QHash>
class QNetworkAccessManager; class QNetworkAccessManager;
class QNetworkReply; class QNetworkReply;
class QProgressBar;
class QSettings; class QSettings;
class QTimer; class QTimer;
class SupernovaeDialog; class SupernovaeDialog;
class StelPainter;
typedef QSharedPointer<Supernova> SupernovaP; typedef QSharedPointer<Supernova> SupernovaP;
/*! @mainpage notitle /*! @mainpage notitle
@section overview Plugin Overview @section overview Plugin Overview
The %Supernovae plugin displays the positions some historical The %Supernovae plugin displays the positions some historical
supernovae brighter than 10 visual magnitude. supernovae brighter than 10 visual magnitude.
@section sncat Supernovae Catalog @section sncat Supernovae Catalog
The supernovae catalog is stored on the disk in [JSON](http://www.json.org/ ) The supernovae catalog is stored on the disk in [JSON](http://www.json.org/ )
skipping to change at line 83 skipping to change at line 85
}; };
Supernovae(); Supernovae();
virtual ~Supernovae(); virtual ~Supernovae();
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in the StelModule class // Methods defined in the StelModule class
virtual void init(); virtual void init();
virtual void deinit(); virtual void deinit();
virtual void update(double) {;} virtual void update(double) {;}
virtual void draw(StelCore* core, class StelRenderer* renderer); virtual void draw(StelCore* core);
virtual void drawPointer(StelCore* core, class StelRenderer* rendere virtual void drawPointer(StelCore* core, StelPainter& painter);
r, StelProjectorP projector);
virtual double getCallOrder(StelModuleActionName actionName) const; virtual double getCallOrder(StelModuleActionName actionName) const;
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Methods defined in StelObjectManager class // Methods defined in StelObjectManager class
//! Used to get a list of objects which are near to some position. //! Used to get a list of objects which are near to some position.
//! @param v a vector representing the position in th sky around whi ch to search for nebulae. //! @param v a vector representing the position in th sky around whi ch to search for nebulae.
//! @param limitFov the field of view around the position v in which to search for satellites. //! @param limitFov the field of view around the position v in which to search for satellites.
//! @param core the StelCore to use for computations. //! @param core the StelCore to use for computations.
//! @return an list containing the satellites located inside the lim itFov circle around position v. //! @return an list containing the satellites located inside the lim itFov circle around position v.
virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const; virtual QList<StelObjectP> searchAround(const Vec3d& v, double limit Fov, const StelCore* core) const;
skipping to change at line 164 skipping to change at line 166
//! Get the current updateState //! Get the current updateState
UpdateState getUpdateState(void) {return updateState;} UpdateState getUpdateState(void) {return updateState;}
//! Get list of supernovae //! Get list of supernovae
QString getSupernovaeList(); QString getSupernovaeList();
//! Get lower limit of brightness for displayed supernovae //! Get lower limit of brightness for displayed supernovae
float getLowerLimitBrightness(); float getLowerLimitBrightness();
//! Get count of supernovae from catalog
int getCountSupernovae(void) {return SNCount;}
signals: signals:
//! @param state the new update state. //! @param state the new update state.
void updateStateChanged(Supernovae::UpdateState state); void updateStateChanged(Supernovae::UpdateState state);
//! Emitted after a JSON update has run. //! Emitted after a JSON update has run.
void jsonUpdateComplete(void); void jsonUpdateComplete(void);
public slots: public slots:
// FIXME: Add functions for scripting support // FIXME: Add functions for scripting support
skipping to change at line 216 skipping to change at line 221
bool checkJsonFileFormat(void); bool checkJsonFileFormat(void);
//! Parse JSON file and load supernovaes to map //! Parse JSON file and load supernovaes to map
QVariantMap loadSNeMap(QString path=QString()); QVariantMap loadSNeMap(QString path=QString());
//! Set items for list of struct from data map //! Set items for list of struct from data map
void setSNeMap(const QVariantMap& map); void setSNeMap(const QVariantMap& map);
QString sneJsonPath; QString sneJsonPath;
class StelTextureNew* texPointer; int SNCount;
StelTextureSP texPointer;
QList<SupernovaP> snstar; QList<SupernovaP> snstar;
QHash<QString, double> snlist; QHash<QString, double> snlist;
// variables and functions for the updater // variables and functions for the updater
UpdateState updateState; UpdateState updateState;
QNetworkAccessManager* downloadMgr; QNetworkAccessManager* downloadMgr;
QString updateUrl; QString updateUrl;
QProgressBar* progressBar; class StelProgressController* progressBar;
QTimer* updateTimer; QTimer* updateTimer;
QTimer* messageTimer; QTimer* messageTimer;
QList<int> messageIDs; QList<int> messageIDs;
bool updatesEnabled; bool updatesEnabled;
QDateTime lastUpdate; QDateTime lastUpdate;
int updateFrequencyDays; int updateFrequencyDays;
QSettings* conf; QSettings* conf;
// GUI // GUI
skipping to change at line 246 skipping to change at line 253
private slots: private slots:
//! Check to see if an update is required. This is called periodica lly by a timer //! Check to see if an update is required. This is called periodica lly by a timer
//! if the last update was longer than updateFrequencyHours ago then the update is //! if the last update was longer than updateFrequencyHours ago then the update is
//! done. //! done.
void checkForUpdate(void); void checkForUpdate(void);
void updateDownloadComplete(QNetworkReply* reply); void updateDownloadComplete(QNetworkReply* reply);
}; };
#include "fixx11h.h"
#include <QObject> #include <QObject>
#include "StelPluginInterface.hpp" #include "StelPluginInterface.hpp"
//! This class is used by Qt to manage a plug-in interface //! This class is used by Qt to manage a plug-in interface
class SupernovaeStelPluginInterface : public QObject, public StelPluginInte rface class SupernovaeStelPluginInterface : public QObject, public StelPluginInte rface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "stellarium.StelGuiPluginInterface/1.0")
Q_INTERFACES(StelPluginInterface) Q_INTERFACES(StelPluginInterface)
public: public:
virtual StelModule* getStelModule() const; virtual StelModule* getStelModule() const;
virtual StelPluginInfo getPluginInfo() const; virtual StelPluginInfo getPluginInfo() const;
}; };
#endif /*_SUPERNOVAE_HPP_*/ #endif /*_SUPERNOVAE_HPP_*/
 End of changes. 9 change blocks. 
7 lines changed or deleted 13 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/