Nebula.hpp   Nebula.hpp 
skipping to change at line 38 skipping to change at line 38
#include <QString> #include <QString>
class StelPainter; class StelPainter;
class QDataStream; class QDataStream;
// This only draws nebula icons. For the DSO images, see StelSkylayerMgr an d StelSkyImageTile. // This only draws nebula icons. For the DSO images, see StelSkylayerMgr an d StelSkyImageTile.
class Nebula : public StelObject class Nebula : public StelObject
{ {
friend class NebulaMgr; friend class NebulaMgr;
//Required for the correct working of the Q_FLAGS macro (which requi
res a MOC pass)
Q_GADGET
Q_FLAGS(CatalogGroup)
Q_FLAGS(TypeGroup)
public: public:
enum CatalogGroupFlags enum CatalogGroupFlags
{ {
CatNGC = 0x00000001, //!< New General Catalogue (NG C) CatNGC = 0x00000001, //!< New General Catalogue (NG C)
CatIC = 0x00000002, //!< Index Catalogue (IC) CatIC = 0x00000002, //!< Index Catalogue (IC)
CatM = 0x00000004, //!< Messier Catalog (M) CatM = 0x00000004, //!< Messier Catalog (M)
CatC = 0x00000008, //!< Caldwell Catalogue (C) CatC = 0x00000008, //!< Caldwell Catalogue (C)
CatB = 0x00000010, //!< Barnard Catalogue (B) CatB = 0x00000010, //!< Barnard Catalogue (B)
CatSh2 = 0x00000020, //!< Sharpless Catalogue (Sh 2 ) CatSh2 = 0x00000020, //!< Sharpless Catalogue (Sh 2 )
CatLBN = 0x00000040, //!< Lynds' Catalogue of Brigh t Nebulae (LBN) CatLBN = 0x00000040, //!< Lynds' Catalogue of Brigh t Nebulae (LBN)
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 brigh t diffuse Galactic nebulae (Ced) CatCed = 0x00004000 //!< Cederblad Catalog of brig ht diffuse Galactic nebulae (Ced)
}; };
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, //!< Different Active Galaxies 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, //!< Planetary Nebulae TypeSupernovaRemnants = 0x00000100, //!< Supernova Remnant s
TypeOther = 0x00000200 //!< Other objects TypeOther = 0x00000200 //!< Other objects
}; };
Q_DECLARE_FLAGS(TypeGroup, TypeGroupFlags)
typedef QFlags<CatalogGroupFlags> CatalogGroup;
Q_FLAGS(CatalogGroup)
typedef QFlags<TypeGroupFlags> TypeGroup;
Q_FLAGS(TypeGroup)
//! 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 NGC|CatIC|CatM|CatC|CatB|CatSh2|CatLBN|CatLDN|CatRCW|CatVdB|CatCr|CatMel|Ca tPGC|CatUGC|CatCed); static const CatalogGroupFlags AllCatalogs = (CatalogGroupFlags)(Cat NGC|CatIC|CatM|CatC|CatB|CatSh2|CatLBN|CatLDN|CatRCW|CatVdB|CatCr|CatMel|Ca tPGC|CatUGC|CatCed);
static const TypeGroupFlags AllTypes = (TypeGroupFlags)(TypeGalaxies |TypeActiveGalaxies|TypeInteractingGalaxies|TypeStarClusters|TypeHydrogenRe gions|TypeBrightNebulae|TypeDarkNebulae|TypePlanetaryNebulae|TypeSupernovaR emnants|TypeOther); static const TypeGroupFlags AllTypes = (TypeGroupFlags)(TypeGalaxies |TypeActiveGalaxies|TypeInteractingGalaxies|TypeStarClusters|TypeHydrogenRe gions|TypeBrightNebulae|TypeDarkNebulae|TypePlanetaryNebulae|TypeSupernovaR emnants|TypeOther);
Nebula(); Nebula();
~Nebula(); ~Nebula();
//! Nebula support the following InfoStringGroup flags: //! Nebula support the following InfoStringGroup flags:
//! - Name //! - Name
skipping to change at line 130 skipping to change at line 132
float getSurfaceBrightness(const StelCore* core) const; float getSurfaceBrightness(const StelCore* core) const;
float getSurfaceBrightnessWithExtinction(const StelCore* core) const ; float getSurfaceBrightnessWithExtinction(const StelCore* core) const ;
//! Get the surface area. //! Get the surface area.
//! @return surface area in square degrees. //! @return surface area in square degrees.
float getSurfaceArea(void) const; float getSurfaceArea(void) const;
void setProperName(QString name) { englishName = name; } void setProperName(QString name) { englishName = name; }
//! 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
QString getDSODesignation();
private: private:
friend struct DrawNebulaFuncObject; friend struct DrawNebulaFuncObject;
//! @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
skipping to change at line 260 skipping to change at line 266
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 float circleScale; // Define the scaling of the h ints circle
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 flagUsageTypeFilter; static bool flagUseTypeFilters;
static CatalogGroup catalogFilters; static CatalogGroup catalogFilters;
static TypeGroup typeFilters; static TypeGroup typeFilters;
}; };
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. 
10 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/