Nebula.hpp   Nebula.hpp 
/* /*
* Stellarium * Stellarium
* Copyright (C) 2002 Fabien Chereau * Copyright (C) 2002 Fabien Chereau
* Copyright (C) 2011 Alexander Wolf
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
skipping to change at line 48 skipping to change at line 49
//! Nebula support the following InfoStringGroup flags: //! Nebula support the following InfoStringGroup flags:
//! - Name //! - Name
//! - CatalogNumber //! - CatalogNumber
//! - Magnitude //! - Magnitude
//! - RaDec //! - RaDec
//! - AltAzi //! - AltAzi
//! - Distance //! - Distance
//! - Size //! - Size
//! - Extra1 (contains the Nebula type, which might be "Galaxy", "Cl uster" or similar) //! - Extra1 (contains the Nebula type, which might be "Galaxy", "Cl uster" or similar)
//! - PlainText //! - PlainText
//! @param core the Stelore object //! @param core the StelCore object
//! @param flags a set of InfoStringGroup items to include in the re turn value. //! @param flags a set of InfoStringGroup items to include in the re turn value.
//! @return a QString containing an HMTL encoded description of the Nebula. //! @return a QString containing an HMTL encoded description of the Nebula.
virtual QString getInfoString(const StelCore *core, const InfoString Group& flags) const; virtual QString getInfoString(const StelCore *core, const InfoString Group& flags) const;
virtual QString getType() const {return "Nebula";} virtual QString getType() const {return "Nebula";}
virtual Vec3d getJ2000EquatorialPos(const StelNavigator*) const {ret virtual Vec3d getJ2000EquatorialPos(const StelCore*) const {return X
urn XYZ;} YZ;}
virtual double getCloseViewFov(const StelNavigator* nav = NULL) cons virtual double getCloseViewFov(const StelCore* core = NULL) const;
t; virtual float getVMagnitude(const StelCore* core = NULL) const {Q_UN
virtual float getVMagnitude(const StelNavigator* nav = NULL) const { USED(core); return mag;}
Q_UNUSED(nav); return mag;} virtual float getSelectPriority(const StelCore* core) const;
virtual float getSelectPriority(const StelNavigator *nav) const;
virtual Vec3f getInfoColor() const; virtual Vec3f getInfoColor() const;
virtual QString getNameI18n() const {return nameI18;} virtual QString getNameI18n() const {return nameI18;}
virtual QString getEnglishName() const {return englishName;} virtual QString getEnglishName() const {return englishName;}
virtual double getAngularSize(const StelCore*) const {return angular Size*0.5;} virtual double getAngularSize(const StelCore*) const {return angular Size*0.5;}
virtual SphericalRegionP getRegion() const {return pointRegion;} virtual SphericalRegionP getRegion() const {return pointRegion;}
// Methods specific to Nebula // Methods specific to Nebula
void setLabelColor(const Vec3f& v) {labelColor = v;} void setLabelColor(const Vec3f& v) {labelColor = v;}
void setCircleColor(const Vec3f& v) {circleColor = v;} void setCircleColor(const Vec3f& v) {circleColor = v;}
skipping to change at line 111 skipping to change at line 112
QString nameI18; // Nebula name QString nameI18; // Nebula name
float mag; // Apparent magnitude float mag; // Apparent magnitude
float angularSize; // Angular size in degree float angularSize; // Angular size in degree
Vec3d XYZ; // Cartesian equatorial position Vec3d XYZ; // Cartesian equatorial position
Vec3d XY; // Store temporary 2D position Vec3d XY; // Store temporary 2D position
NebulaType nType; NebulaType nType;
SphericalRegionP pointRegion; SphericalRegionP pointRegion;
static StelTextureSP texCircle; // The symbolic circle texture static StelTextureSP texCircle; // The symbolic circle texture
static StelTextureSP texOpenCluster;
static StelTextureSP texGlobularCluster;
static StelTextureSP texPlanetNebula;
static float hintsBrightness; static float hintsBrightness;
static Vec3f labelColor, circleColor; static Vec3f labelColor, circleColor;
static float circleScale; // Define the scaling of the hints c ircle static float circleScale; // Define the scaling of the hints c ircle
}; };
#endif // _NEBULA_HPP_ #endif // _NEBULA_HPP_
 End of changes. 4 change blocks. 
8 lines changed or deleted 11 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/