Nebula.hpp   Nebula.hpp 
skipping to change at line 66 skipping to change at line 66
CatLDN = 0x00000080, //!< Lynds' Catalogue of Dark Nebulae (LDN) CatLDN = 0x00000080, //!< Lynds' Catalogue of Dark Nebulae (LDN)
CatRCW = 0x00000100, //!< A catalogue of Hα-emissio n regions in the southern Milky Way (RCW) CatRCW = 0x00000100, //!< A catalogue of Hα-emissio n regions in the southern Milky Way (RCW)
CatVdB = 0x00000200, //!< Van den Bergh Catalogue o f reflection nebulae (VdB) CatVdB = 0x00000200, //!< Van den Bergh Catalogue o f reflection nebulae (VdB)
CatCr = 0x00000400, //!< Collinder Catalogue (Cr o r Col) CatCr = 0x00000400, //!< Collinder Catalogue (Cr o r Col)
CatMel = 0x00000800, //!< Melotte Catalogue of Deep Sky Objects (Mel) CatMel = 0x00000800, //!< Melotte Catalogue of Deep Sky Objects (Mel)
CatPGC = 0x00001000, //!< HYPERLEDA. I. Catalog of galaxies (PGC) CatPGC = 0x00001000, //!< HYPERLEDA. I. Catalog of galaxies (PGC)
CatUGC = 0x00002000, //!< The Uppsala General Catal ogue of Galaxies CatUGC = 0x00002000, //!< The Uppsala General Catal ogue of Galaxies
CatCed = 0x00004000, //!< Cederblad Catalog of brig ht diffuse Galactic nebulae (Ced) CatCed = 0x00004000, //!< Cederblad Catalog of brig ht diffuse Galactic nebulae (Ced)
CatArp = 0x00008000, //!< Atlas of Peculiar Galaxie s (Arp) CatArp = 0x00008000, //!< Atlas of Peculiar Galaxie s (Arp)
CatVV = 0x00010000, //!< Interacting galaxies cata logue by Vorontsov-Velyaminov (VV) CatVV = 0x00010000, //!< Interacting galaxies cata logue by Vorontsov-Velyaminov (VV)
CatPK = 0x00020000 //!< Catalogue of Galactic Pla CatPK = 0x00020000, //!< Catalogue of Galactic Pla
netary Nebulae (PK) netary Nebulae (PK)
CatPNG = 0x00040000, //!< Strasbourg-ESO Catalogue
of Galactic Planetary Nebulae (Acker+, 1992) (PN G)
CatSNRG = 0x00080000, //!< A catalogue of Galactic s
upernova remnants (Green, 2014) (SNR G)
CatACO = 0x00100000 //!< A Catalog of Rich Cluster
s of Galaxies (Abell+ 1989) (ACO)
}; };
Q_DECLARE_FLAGS(CatalogGroup, CatalogGroupFlags) Q_DECLARE_FLAGS(CatalogGroup, CatalogGroupFlags)
enum TypeGroupFlags enum TypeGroupFlags
{ {
TypeGalaxies = 0x00000001, //!< Galaxies TypeGalaxies = 0x00000001, //!< Galaxies
TypeActiveGalaxies = 0x00000002, //!< Different Active Galaxies TypeActiveGalaxies = 0x00000002, //!< Different Active Galaxies
TypeInteractingGalaxies = 0x00000004, //!< Interacting Galax ies TypeInteractingGalaxies = 0x00000004, //!< Interacting Galax ies
TypeStarClusters = 0x00000008, //!< Star Clusters TypeStarClusters = 0x00000008, //!< Star Clusters
TypeHydrogenRegions = 0x00000010, //!< Hydrogen Regions TypeHydrogenRegions = 0x00000010, //!< Hydrogen Regions
TypeBrightNebulae = 0x00000020, //!< Bright Nebulae TypeBrightNebulae = 0x00000020, //!< Bright Nebulae
TypeDarkNebulae = 0x00000040, //!< Dark Nebulae TypeDarkNebulae = 0x00000040, //!< Dark Nebulae
TypePlanetaryNebulae = 0x00000080, //!< Planetary Nebulae TypePlanetaryNebulae = 0x00000080, //!< Planetary Nebulae
TypeSupernovaRemnants = 0x00000100, //!< Supernova Remnant s TypeSupernovaRemnants = 0x00000100, //!< Supernova Remnant s
TypeOther = 0x00000200 //!< Other objects TypeGalaxyClusters = 0x00000200, //!< Galaxy Clusters
TypeOther = 0x00000400 //!< Other objects
}; };
Q_DECLARE_FLAGS(TypeGroup, TypeGroupFlags) Q_DECLARE_FLAGS(TypeGroup, TypeGroupFlags)
//! A pre-defined set of specifiers for the catalogs filter //! A pre-defined set of specifiers for the catalogs filter
static const CatalogGroupFlags AllCatalogs = (CatalogGroupFlags)(Cat static const CatalogGroupFlags AllCatalogs = (CatalogGroupFlags)(Cat
NGC|CatIC|CatM|CatC|CatB|CatSh2|CatLBN|CatLDN|CatRCW|CatVdB|CatCr|CatMel|Ca NGC|CatIC|CatM|CatC|CatB|CatSh2|CatLBN|CatLDN|CatRCW|CatVdB|CatCr|CatMel|Ca
tPGC|CatUGC|CatCed|CatArp|CatVV|CatPK); tPGC|CatUGC|CatCed|CatArp|CatVV|CatPK|CatPNG|CatSNRG|CatACO);
static const TypeGroupFlags AllTypes = (TypeGroupFlags)(TypeGalaxies static const TypeGroupFlags AllTypes = (TypeGroupFlags)(TypeGalaxies
|TypeActiveGalaxies|TypeInteractingGalaxies|TypeStarClusters|TypeHydrogenRe |TypeActiveGalaxies|TypeInteractingGalaxies|TypeStarClusters|TypeHydrogenRe
gions|TypeBrightNebulae|TypeDarkNebulae|TypePlanetaryNebulae|TypeSupernovaR gions|TypeBrightNebulae|TypeDarkNebulae|TypePlanetaryNebulae|TypeSupernovaR
emnants|TypeOther); emnants|TypeGalaxyClusters|TypeOther);
//! @enum NebulaType Nebula types //! @enum NebulaType Nebula types
enum NebulaType enum NebulaType
{ {
NebGx = 0, //!< Galaxy NebGx = 0, //!< Galaxy
NebAGx = 1, //!< Active galaxy NebAGx = 1, //!< Active galaxy
NebRGx = 2, //!< Radio galaxy NebRGx = 2, //!< Radio galaxy
NebIGx = 3, //!< Interacting galaxy NebIGx = 3, //!< Interacting galaxy
NebQSO = 4, //!< Quasar NebQSO = 4, //!< Quasar
NebCl = 5, //!< Star cluster NebCl = 5, //!< Star cluster
NebOc = 6, //!< Open star cluster NebOc = 6, //!< Open star cluster
NebGc = 7, //!< Globular star cluster, usually NebGc = 7, //!< Globular star cluster,
in the Milky Way Galaxy usually in the Milky Way Galaxy
NebSA = 8, //!< Stellar association NebSA = 8, //!< Stellar association
NebSC = 9, //!< Star cloud NebSC = 9, //!< Star cloud
NebN = 10, //!< A nebula NebN = 10, //!< A nebula
NebPn = 11, //!< Planetary nebula NebPn = 11, //!< Planetary nebula
NebDn = 12, //!< Dark Nebula NebDn = 12, //!< Dark Nebula
NebRn = 13, //!< Reflection nebula NebRn = 13, //!< Reflection nebula
NebBn = 14, //!< Bipolar nebula NebBn = 14, //!< Bipolar nebula
NebEn = 15, //!< Emission nebula NebEn = 15, //!< Emission nebula
NebCn = 16, //!< Cluster associated with nebulos NebCn = 16, //!< Cluster associated with
ity nebulosity
NebHII = 17, //!< HII Region NebHII = 17, //!< HII Region
NebSNR = 18, //!< Supernova remnant NebSNR = 18, //!< Supernova remnant
NebISM = 19, //!< Interstellar matter NebISM = 19, //!< Interstellar matter
NebEMO = 20, //!< Emission object NebEMO = 20, //!< Emission object
NebBLL = 21, //!< BL Lac object NebBLL = 21, //!< BL Lac object
NebBLA = 22, //!< Blazar NebBLA = 22, //!< Blazar
NebMolCld = 23, //!< Molecular Cloud NebMolCld = 23, //!< Molecular Cloud
NebYSO = 24, //!< Young Stellar Object NebYSO = 24, //!< Young Stellar Object
NebPossQSO = 25, //!< Possible Quasar NebPossQSO = 25, //!< Possible Quasar
NebPossPN = 26, //!< Possible Planetary Nebula NebPossPN = 26, //!< Possible Planetary Nebu
NebPPN = 27, //!< Protoplanetary Nebula la
NebStar = 28, //!< Star NebPPN = 27, //!< Protoplanetary Nebula
NebUnknown = 29 //!< Unknown type, catalog errors, " NebStar = 28, //!< Star
Unidentified Southern Objects" etc. NebSymbioticStar = 29, //!< Symbiotic Star
NebEmissionLineStar = 30, //!< Emission-line Star
NebSNC = 31, //!< Supernova Candidate
NebSNRC = 32, //!< Supernova Remnant Candi
date
NebGxCl = 33, //!< Cluster of Galaxies
NebUnknown = 34 //!< Unknown type, catalog e
rrors, "Unidentified Southern Objects" etc.
}; };
Nebula(); Nebula();
~Nebula(); ~Nebula();
//! Nebula support the following InfoStringGroup flags: //! Nebula support the following InfoStringGroup flags:
//! - Name //! - Name
//! - CatalogNumber //! - CatalogNumber
//! - Magnitude //! - Magnitude
//! - RaDec //! - RaDec
skipping to change at line 194 skipping to change at line 203
float getSurfaceArea(void) const; float getSurfaceArea(void) const;
void setProperName(QString name) { englishName = name; } void setProperName(QString name) { englishName = name; }
void addNameAlias(QString name) { englishAliases.append(name); } void addNameAlias(QString name) { englishAliases.append(name); }
void removeAllNames() { englishName=""; englishAliases.clear(); } void removeAllNames() { englishName=""; englishAliases.clear(); }
//! Get designation for DSO (with priority: M, C, NGC, IC, B, Sh2, V dB, RCW, LDN, LBN, Cr, Mel, PGC, UGC, Ced) //! Get designation for DSO (with priority: M, C, NGC, IC, B, Sh2, V dB, RCW, LDN, LBN, Cr, Mel, PGC, UGC, Ced)
//! @return a designation //! @return a designation
QString getDSODesignation() const; QString getDSODesignation() const;
bool objectInDisplayedCatalog() const;
private: private:
friend struct DrawNebulaFuncObject; friend struct DrawNebulaFuncObject;
//! Translate nebula name using the passed translator //! Translate nebula name using the passed translator
void translateName(const StelTranslator& trans) void translateName(const StelTranslator& trans)
{ {
nameI18 = trans.qtranslate(englishName); nameI18 = trans.qtranslate(englishName);
nameI18Aliases.clear(); nameI18Aliases.clear();
foreach(QString alias, englishAliases) foreach(QString alias, englishAliases)
nameI18Aliases.append(trans.qtranslate(alias)); nameI18Aliases.append(trans.qtranslate(alias));
} }
void readDSO(QDataStream& in); void readDSO(QDataStream& in);
void drawLabel(StelPainter& sPainter, float maxMagLabel) const; void drawLabel(StelPainter& sPainter, float maxMagLabel) const;
void drawHints(StelPainter& sPainter, float maxMagHints) const; void drawHints(StelPainter& sPainter, float maxMagHints) const;
void drawOutlines(StelPainter& sPainter, float maxMagHints) const;
bool objectInDisplayedType() const; bool objectInDisplayedType() const;
Vec3f getHintColor() const;
float getVisibilityLevelByMagnitude() const;
//! Get the printable description of morphological nebula type. //! Get the printable description of morphological nebula type.
//! @return the nebula morphological type string. //! @return the nebula morphological type string.
QString getMorphologicalTypeDescription() const; QString getMorphologicalTypeDescription() const;
unsigned int DSO_nb; unsigned int DSO_nb;
unsigned int M_nb; // Messier Catalog number unsigned int M_nb; // Messier Catalog number
unsigned int NGC_nb; // New General Catalog number unsigned int NGC_nb; // New General Catalog number
unsigned int IC_nb; // Index Catalog number unsigned int IC_nb; // Index Catalog number
unsigned int C_nb; // Caldwell Catalog number unsigned int C_nb; // Caldwell Catalog number
unsigned int B_nb; // Barnard Catalog number (Dark Nebu lae) unsigned int B_nb; // Barnard Catalog number (Dark Nebu lae)
skipping to change at line 236 skipping to change at line 251
unsigned int LDN_nb; // LDN Catalog number (Lynds' Catalo gue of Dark Nebulae (Lynds, 1962)) unsigned int LDN_nb; // LDN Catalog number (Lynds' Catalo gue of Dark Nebulae (Lynds, 1962))
unsigned int LBN_nb; // LBN Catalog number (Lynds' Catalo gue of Bright Nebulae (Lynds, 1965)) unsigned int LBN_nb; // LBN Catalog number (Lynds' Catalo gue of Bright Nebulae (Lynds, 1965))
unsigned int Cr_nb; // Collinder Catalog number unsigned int Cr_nb; // Collinder Catalog number
unsigned int Mel_nb; // Melotte Catalog number unsigned int Mel_nb; // Melotte Catalog number
unsigned int PGC_nb; // PGC number (Catalog of galaxies) unsigned int PGC_nb; // PGC number (Catalog of galaxies)
unsigned int UGC_nb; // UGC number (The Uppsala General C atalogue of Galaxies) unsigned int UGC_nb; // UGC number (The Uppsala General C atalogue of Galaxies)
unsigned int Arp_nb; // Arp number (Atlas of Peculiar Gal axies (Arp, 1966)) unsigned int Arp_nb; // Arp number (Atlas of Peculiar Gal axies (Arp, 1966))
unsigned int VV_nb; // VV number (The Catalogue of Inter acting Galaxies (Vorontsov-Velyaminov+, 2001)) unsigned int VV_nb; // VV number (The Catalogue of Inter acting Galaxies (Vorontsov-Velyaminov+, 2001))
QString Ced_nb; // Ced number (Cederblad Catalog of bright diffuse Galactic nebulae) QString Ced_nb; // Ced number (Cederblad Catalog of bright diffuse Galactic nebulae)
QString PK_nb; // PK number (Catalogue of Galactic Planetary Nebulae) QString PK_nb; // PK number (Catalogue of Galactic Planetary Nebulae)
QString PNG_nb; // PN G number (Strasbourg-ESO Catal
ogue of Galactic Planetary Nebulae (Acker+, 1992))
QString SNRG_nb; // SNR G number (A catalogue of Gala
ctic supernova remnants (Green, 2014))
QString ACO_nb; // ACO number (Rich Clusters of Gala
xies (Abell+ 1989))
bool withoutID; bool withoutID;
QString englishName; // English name QString englishName; // English name
QStringList englishAliases; // English aliases QStringList englishAliases; // English aliases
QString nameI18; // Nebula name QString nameI18; // Nebula name
QStringList nameI18Aliases; // Nebula aliases QStringList nameI18Aliases; // Nebula aliases
QString mTypeString; // Morphological type of object (as string) QString mTypeString; // Morphological type of object (as string)
float bMag; // B magnitude float bMag; // B magnitude
float vMag; // V magnitude. For Dark Nebulae, op acity is stored here. float vMag; // V magnitude. For Dark Nebulae, op acity is stored here.
float majorAxisSize; // Major axis size in degrees float majorAxisSize; // Major axis size in degrees
float minorAxisSize; // Minor axis size in degrees float minorAxisSize; // Minor axis size in degrees
skipping to change at line 300 skipping to change at line 318
static Vec3f starCloudColor; // The color of star cloud marker texture (NebSC) static Vec3f starCloudColor; // The color of star cloud marker texture (NebSC)
static Vec3f emissionObjectColor; // The color of emis sion object marker texture (NebEMO) static Vec3f emissionObjectColor; // The color of emis sion object marker texture (NebEMO)
static Vec3f blLacObjectColor; // The color of BL L ac object marker texture (NebBLL) static Vec3f blLacObjectColor; // The color of BL L ac object marker texture (NebBLL)
static Vec3f blazarColor; // The color of blaz ar marker texture (NebBLA) static Vec3f blazarColor; // The color of blaz ar marker texture (NebBLA)
static Vec3f molecularCloudColor; // The color of mole cular cloud marker texture (NebMolCld) static Vec3f molecularCloudColor; // The color of mole cular cloud marker texture (NebMolCld)
static Vec3f youngStellarObjectColor; // The color of Youn g Stellar Object marker texture (NebYSO) static Vec3f youngStellarObjectColor; // The color of Youn g Stellar Object marker texture (NebYSO)
static Vec3f possibleQuasarColor; // The color of poss ible quasar marker texture (NebPossQSO) static Vec3f possibleQuasarColor; // The color of poss ible quasar marker texture (NebPossQSO)
static Vec3f possiblePlanetaryNebulaColor; // The color of poss ible planetary nebula marker texture (NebPossPN) static Vec3f possiblePlanetaryNebulaColor; // The color of poss ible planetary nebula marker texture (NebPossPN)
static Vec3f protoplanetaryNebulaColor; // The color of prot oplanetary nebula marker texture (NebPPN) static Vec3f protoplanetaryNebulaColor; // The color of prot oplanetary nebula marker texture (NebPPN)
static Vec3f starColor; // The color of star marker texture (NebStar) static Vec3f starColor; // The color of star marker texture (NebStar)
static Vec3f symbioticStarColor; // The color of symb
iotic star marker texture (NebSymbioticStar)
static Vec3f emissionLineStarColor; // The color of emis
sion-line star marker texture (NebEmissionLineStar)
static Vec3f supernovaCandidateColor; // The color of supe
rmova candidate marker texture (NebSNC)
static Vec3f supernovaRemnantCandidateColor; // The color of supe
rmova remnant candidate marker texture (NebSNRC)
static Vec3f galaxyClusterColor; // The color of gala
xy cluster marker texture (NebGxCl)
static bool drawHintProportional; // scale hint with nebula size ? static bool drawHintProportional; // scale hint with nebula size ?
static bool surfaceBrightnessUsage; static bool surfaceBrightnessUsage;
static bool designationUsage; static bool designationUsage;
static bool flagUseTypeFilters; static bool flagUseTypeFilters;
static CatalogGroup catalogFilters; static CatalogGroup catalogFilters;
static TypeGroup typeFilters; static TypeGroup typeFilters;
static bool flagUseArcsecSurfaceBrightness; static bool flagUseArcsecSurfaceBrightness;
static bool flagUseShortNotationSurfaceBrightness;
static bool flagUseOutlines;
std::vector<std::vector<Vec3f> *> outlineSegments;
}; };
Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::CatalogGroup) Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::CatalogGroup)
Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::TypeGroup) Q_DECLARE_OPERATORS_FOR_FLAGS(Nebula::TypeGroup)
#endif // _NEBULA_HPP_ #endif // _NEBULA_HPP_
 End of changes. 10 change blocks. 
43 lines changed or deleted 83 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/