Nebula.hpp   Nebula.hpp 
skipping to change at line 18 skipping to change at line 18
* 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.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#ifndef _NEBULA_HPP_ #ifndef _NEBULA_HPP_
#define _NEBULA_HPP_ #define _NEBULA_HPP_
#include <QString> #include <QString>
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
#include "StelTextureTypes.hpp" #include "StelTextureTypes.hpp"
skipping to change at line 56 skipping to change at line 56
//! - 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 StelCore 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 StelCore*) const {return X YZ;} virtual Vec3d getJ2000EquatorialPos(const StelCore*) const {return X YZ;}
virtual double getCloseViewFov(const StelCore* core = NULL) const; virtual double getCloseViewFov(const StelCore* core = NULL) const;
virtual float getVMagnitude(const StelCore* core = NULL) const {Q_UN USED(core); return mag;} virtual float getVMagnitude(const StelCore* core, bool withExtinctio n=false) const;
virtual float getSelectPriority(const StelCore* core) const; virtual float getSelectPriority(const StelCore* core) 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;}
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/