StarWrapper.hpp   StarWrapper.hpp 
skipping to change at line 26 skipping to change at line 26
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA.
*/ */
#ifndef _STARWRAPPER_HPP_ #ifndef _STARWRAPPER_HPP_
#define _STARWRAPPER_HPP_ #define _STARWRAPPER_HPP_
#include <QString> #include <QString>
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelNavigator.hpp" #include "StelCore.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "Star.hpp" #include "Star.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
namespace BigStarCatalogExtension { namespace BigStarCatalogExtension {
template <class Star> struct SpecialZoneArray; template <class Star> struct SpecialZoneArray;
template <class Star> struct SpecialZoneData; template <class Star> struct SpecialZoneData;
//! @class StarWrapperBase //! @class StarWrapperBase
skipping to change at line 76 skipping to change at line 76
private: private:
int ref_count; int ref_count;
}; };
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 StelCore* core) const
{ {
static const double d2000 = 2451545.0; static const double d2000 = 2451545.0;
Vec3f 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.) * ((core->getJD ay()-d2000)/365.25) / a->star_position_scale, v);
return Vec3d(v[0], v[1], v[2]); 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*) const float getVMagnitude(const StelCore*) 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 StelCore* core) const {return getVMagn itude(core);}
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*) 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;
}; };
 End of changes. 5 change blocks. 
5 lines changed or deleted 5 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/