StarWrapper.hpp   StarWrapper.hpp 
skipping to change at line 79 skipping to change at line 79
template <class Star> class StarWrapper : public StarWrapperBase template <class Star> class StarWrapper : public StarWrapperBase
{ {
protected: protected:
StarWrapper(const SpecialZoneArray<Star> *a, StarWrapper(const SpecialZoneArray<Star> *a,
const SpecialZoneData<Star> *z, const SpecialZoneData<Star> *z,
const Star *s) : a(a), z(z), s(s) {;} const Star *s) : a(a), z(z), s(s) {;}
Vec3d getJ2000EquatorialPos(const StelNavigator* nav) const Vec3d getJ2000EquatorialPos(const StelNavigator* nav) const
{ {
static const double d2000 = 2451545.0; static const double d2000 = 2451545.0;
Vec3d v; Vec3f v;
s->getJ2000Pos(z, (M_PI/180.)*(0.0001/3600.) * ((nav->getJDa y()-d2000)/365.25) / a->star_position_scale, v); s->getJ2000Pos(z, (M_PI/180.)*(0.0001/3600.) * ((nav->getJDa y()-d2000)/365.25) / a->star_position_scale, v);
return v; return Vec3d(v[0], v[1], v[2]);
} }
Vec3f getInfoColor(void) const Vec3f getInfoColor(void) const
{ {
return StelApp::getInstance().getVisionModeNight() ? Vec3f(0 .8, 0.2, 0.2) : StelSkyDrawer::indexToColor(s->bV); return StelApp::getInstance().getVisionModeNight() ? Vec3f(0 .8, 0.2, 0.2) : StelSkyDrawer::indexToColor(s->bV);
} }
float getVMagnitude(const StelNavigator *nav) const float getVMagnitude(const StelNavigator*) const
{ {
return 0.001f*a->mag_min + s->mag*(0.001f*a->mag_range)/a->m ag_steps; return 0.001f*a->mag_min + s->mag*(0.001f*a->mag_range)/a->m ag_steps;
} }
float getSelectPriority(const StelNavigator *nav) const {return getV Magnitude(nav);} float getSelectPriority(const StelNavigator *nav) const {return getV Magnitude(nav);}
float getBV(void) const {return s->getBV();} float getBV(void) const {return s->getBV();}
QString getEnglishName(void) const {return QString();} QString getEnglishName(void) const {return QString();}
QString getNameI18n(void) const {return s->getNameI18n();} QString getNameI18n(void) const {return s->getNameI18n();}
virtual double getAngularSize(const StelCore* core) const {return 0. ;} virtual double getAngularSize(const StelCore*) const {return 0.;}
protected: protected:
const SpecialZoneArray<Star> *const a; const SpecialZoneArray<Star> *const a;
const SpecialZoneData<Star> *const z; const SpecialZoneData<Star> *const z;
const Star *const s; const Star *const s;
}; };
class StarWrapper1 : public StarWrapper<Star1> class StarWrapper1 : public StarWrapper<Star1>
{ {
public: public:
StarWrapper1(const SpecialZoneArray<Star1> *a, StarWrapper1(const SpecialZoneArray<Star1> *a,
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 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/