StarMgr.hpp   StarMgr.hpp 
skipping to change at line 41 skipping to change at line 41
class StelProjector; class StelProjector;
class QSettings; class QSettings;
namespace BigStarCatalogExtension { namespace BigStarCatalogExtension {
class ZoneArray; class ZoneArray;
struct HipIndexStruct; struct HipIndexStruct;
} }
static const int RCMAG_TABLE_SIZE = 4096; static const int RCMAG_TABLE_SIZE = 4096;
typedef struct
{
QString designation; //! GCVS designation
QString vtype; //! Type of variability
float maxmag; //! Magnitude at maximum brightness
int mflag; //! Magnitude flag code
float min1mag; //! First minimum magnitude or amplitude
float min2mag; //! Second minimum magnitude or amplitude
QString photosys; //! The photometric system for magnitudes
double epoch; //! Epoch for maximum light (Julian days)
double period; //! Period of the variable star (days)
int Mm; //! Rising time or duration of eclipse (%)
QString stype; //! Spectral type
} varstar;
//! @class StarMgr //! @class StarMgr
//! Stores the star catalogue data. //! Stores the star catalogue data.
//! Used to render the stars themselves, as well as determine the color tab le //! Used to render the stars themselves, as well as determine the color tab le
//! and render the labels of those stars with names for a given SkyCulture. //! and render the labels of those stars with names for a given SkyCulture.
//! //!
//! The celestial sphere is split into zones, which correspond to the //! The celestial sphere is split into zones, which correspond to the
//! triangular faces of a geodesic sphere. The number of zones (faces) //! triangular faces of a geodesic sphere. The number of zones (faces)
//! depends on the level of sub-division of this sphere. The lowest //! depends on the level of sub-division of this sphere. The lowest
//! level, 0, is an icosahedron (20 faces), subsequent levels, L, //! level, 0, is an icosahedron (20 faces), subsequent levels, L,
//! of sub-division give the number of zones, n as: //! of sub-division give the number of zones, n as:
skipping to change at line 171 skipping to change at line 186
StelObjectP searchHP(int hip) const; StelObjectP searchHP(int hip) const;
//! Get the (translated) common name for a star with a specified //! Get the (translated) common name for a star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
static QString getCommonName(int hip); static QString getCommonName(int hip);
//! Get the (translated) scientific name for a star with a specified //! Get the (translated) scientific name for a star with a specified
//! Hipparcos catalogue number. //! Hipparcos catalogue number.
static QString getSciName(int hip); static QString getSciName(int hip);
//! Get the (translated) additional scientific name for a star with
a
//! specified Hipparcos catalogue number.
static QString getSciAdditionalName(int hip);
//! Get the (translated) scientific name for a variable star with a
specified
//! Hipparcos catalogue number.
static QString getGCVSName(int hip);
//! Get the type of variability for a variable star with a specified
//! Hipparcos catalogue number.
static QString getGCVSVariabilityType(int hip);
//! Get the magnitude at maximum brightness for a variable star with
a specified
//! Hipparcos catalogue number.
static float getGCVSMaxMagnitude(int hip);
//! Get the magnitude flag code for a variable star with a specified
//! Hipparcos catalogue number.
static int getGCVSMagnitudeFlag(int hip);
//! Get the minimum magnitude or amplitude for a variable star with
a specified
//! Hipparcos catalogue number.
static float getGCVSMinMagnitude(int hip, bool firstMinimumFlag=true
);
//! Get the photometric system for a variable star with a specified
//! Hipparcos catalogue number.
static QString getGCVSPhotometricSystem(int hip);
//! Get Epoch for maximum light for a variable star with a specified
//! Hipparcos catalogue number.
static double getGCVSEpoch(int hip);
//! Get the period for a variable star with a specified
//! Hipparcos catalogue number.
static double getGCVSPeriod(int hip);
//! Get the rising time or duration of eclipse for a variable star w
ith a
//! specified Hipparcos catalogue number.
static int getGCVSMM(int hip);
static QString convertToSpectralType(int index); static QString convertToSpectralType(int index);
static QString convertToComponentIds(int index); static QString convertToComponentIds(int index);
QVariantList getCatalogsDescription() const {return catalogsDescript ion;} QVariantList getCatalogsDescription() const {return catalogsDescript ion;}
//! Try to load the given catalog, even if it is marched as unchecke d. //! Try to load the given catalog, even if it is marched as unchecke d.
//! Mark it as checked if checksum is correct. //! Mark it as checked if checksum is correct.
//! @return false in case of failure. //! @return false in case of failure.
bool checkAndLoadCatalog(QVariantMap m); bool checkAndLoadCatalog(QVariantMap m);
skipping to change at line 207 skipping to change at line 262
//! Loads common names for stars from a file. //! Loads common names for stars from a file.
//! Called when the SkyCulture is updated. //! Called when the SkyCulture is updated.
//! @param the path to a file containing the common names for bright stars. //! @param the path to a file containing the common names for bright stars.
int loadCommonNames(const QString& commonNameFile); int loadCommonNames(const QString& commonNameFile);
//! Loads scientific names for stars from a file. //! Loads scientific names for stars from a file.
//! Called when the SkyCulture is updated. //! Called when the SkyCulture is updated.
//! @param the path to a file containing the scientific names for br ight stars. //! @param the path to a file containing the scientific names for br ight stars.
void loadSciNames(const QString& sciNameFile); void loadSciNames(const QString& sciNameFile);
//! Loads GCVS from a file.
//! @param the path to a file containing the GCVS.
void loadGCVS(const QString& GCVSFile);
//! Gets the maximum search level. //! Gets the maximum search level.
// TODO: add a non-lame description - what is the purpose of the max search level? // TODO: add a non-lame description - what is the purpose of the max search level?
int getMaxSearchLevel() const; int getMaxSearchLevel() const;
//! Load all the stars from the files. //! Load all the stars from the files.
void loadData(QVariantMap starsConfigFile); void loadData(QVariantMap starsConfigFile);
//! Draw a nice animated pointer around the object. //! Draw a nice animated pointer around the object.
void drawPointer(class StelRenderer* renderer, StelProjectorP projec tor, const StelCore* core); void drawPointer(class StelRenderer* renderer, StelProjectorP projec tor, const StelCore* core);
skipping to change at line 252 skipping to change at line 311
BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars BigStarCatalogExtension::HipIndexStruct *hipIndex; // array of hipar cos stars
static QHash<int, QString> commonNamesMap; static QHash<int, QString> commonNamesMap;
static QHash<int, QString> commonNamesMapI18n; static QHash<int, QString> commonNamesMapI18n;
static QMap<QString, int> commonNamesIndexI18n; static QMap<QString, int> commonNamesIndexI18n;
static QMap<QString, int> commonNamesIndex; static QMap<QString, int> commonNamesIndex;
static QHash<int, QString> sciNamesMapI18n; static QHash<int, QString> sciNamesMapI18n;
static QMap<QString, int> sciNamesIndexI18n; static QMap<QString, int> sciNamesIndexI18n;
static QHash<int, QString> sciAdditionalNamesMapI18n;
static QMap<QString, int> sciAdditionalNamesIndexI18n;
static QHash<int, varstar> varStarsMapI18n;
static QMap<QString, int> varStarsIndexI18n;
QFont starFont; QFont starFont;
static bool flagSciNames; static bool flagSciNames;
Vec3f labelColor; Vec3f labelColor;
class StelTextureNew* texPointer; // The selection poi nter texture class StelTextureNew* texPointer; // The selection poi nter texture
class StelObjectMgr* objectMgr; class StelObjectMgr* objectMgr;
QString starConfigFileFullPath; QString starConfigFileFullPath;
QVariantMap starSettings; QVariantMap starSettings;
 End of changes. 4 change blocks. 
0 lines changed or deleted 71 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/