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 "StelPainter.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 QProgressBar;
class QSettings; class QSettings;
class QTimer; class QTimer;
class SupernovaeDialog; class SupernovaeDialog;
class StelPainter;
typedef QSharedPointer<Supernova> SupernovaP; typedef QSharedPointer<Supernova> SupernovaP;
//! This is an example of a plug-in which can be dynamically loaded into st ellarium //! This is an example of a plug-in which can be dynamically loaded into st ellarium
class Supernovae : public StelObjectModule class Supernovae : public StelObjectModule
{ {
Q_OBJECT Q_OBJECT
public: public:
//! @enum UpdateState //! @enum UpdateState
//! Used for keeping for track of the download/update status //! Used for keeping for track of the download/update status
enum UpdateState { enum UpdateState {
skipping to change at line 69 skipping to change at line 65
}; };
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); virtual void draw(StelCore* core, class StelRenderer* renderer);
virtual void drawPointer(StelCore* core, StelPainter& painter); virtual void drawPointer(StelCore* core, class StelRenderer* rendere
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 95 skipping to change at line 91
//! Return the matching satellite if exists or NULL. //! Return the matching satellite if exists or NULL.
//! @param name The case in-sensistive standard program name //! @param name The case in-sensistive standard program name
virtual StelObjectP searchByName(const QString& name) const; virtual StelObjectP searchByName(const QString& name) const;
//! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name. //! Find and return the list of at most maxNbItem objects auto-compl eting the passed object I18n name.
//! @param objPrefix the case insensitive first letters of the searc hed object //! @param objPrefix the case insensitive first letters of the searc hed object
//! @param maxNbItem the maximum number of returned object names //! @param maxNbItem the maximum number of returned object names
//! @return a list of matching object name by order of relevance, or an empty list if nothing match //! @return a list of matching object name by order of relevance, or an empty list if nothing match
virtual QStringList listMatchingObjectsI18n(const QString& objPrefix , int maxNbItem=5) const; virtual QStringList listMatchingObjectsI18n(const QString& objPrefix , int maxNbItem=5) const;
virtual QStringList listAllObjects(bool inEnglish) const;
virtual QString getName() const { return "Historical Supernovae"; }
//! get a supernova object by identifier //! get a supernova object by identifier
SupernovaP getByID(const QString& id); SupernovaP getByID(const QString& id);
//! Implement this to tell the main Stellarium GUI that there is a G UI element to configure this //! Implement this to tell the main Stellarium GUI that there is a G UI element to configure this
//! plugin. //! plugin.
virtual bool configureGui(bool show=true); virtual bool configureGui(bool show=true);
//! Set up the plugin with default values. This means clearing out the Pulsars section in the //! Set up the plugin with default values. This means clearing out the Pulsars section in the
//! main config.ini (if one already exists), and populating it with default values. It also //! main config.ini (if one already exists), and populating it with default values. It also
skipping to change at line 184 skipping to change at line 182
int getJsonFileVersion(void); int getJsonFileVersion(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;
StelTextureSP texPointer; class StelTextureNew* 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;
QString updateFile; QString updateFile;
QProgressBar* progressBar; QProgressBar* progressBar;
QTimer* updateTimer; QTimer* updateTimer;
 End of changes. 5 change blocks. 
7 lines changed or deleted 6 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/