StelObject.cpp   StelObject.cpp 
skipping to change at line 41 skipping to change at line 41
#include <QDebug> #include <QDebug>
Vec3d StelObject::getEquinoxEquatorialPos(const StelCore* core) const Vec3d StelObject::getEquinoxEquatorialPos(const StelCore* core) const
{ {
return core->j2000ToEquinoxEqu(getJ2000EquatorialPos(core)); return core->j2000ToEquinoxEqu(getJ2000EquatorialPos(core));
} }
// Get observer local sideral coordinate // Get observer local sideral coordinate
Vec3d StelObject::getSideralPosGeometric(const StelCore* core) const Vec3d StelObject::getSideralPosGeometric(const StelCore* core) const
{ {
return Mat4d::zrotation(-core->getLocalSideralTime())* getEquinoxEqu // Hour Angle corrected to Delta-T value
atorialPos(core); double dt = (core->getDeltaT(core->getJDay())/240.)*M_PI/180.;
return Mat4d::zrotation(-core->getLocalSideralTime()+dt)* getEquinox
EquatorialPos(core);
} }
// Get observer local sidereal coordinates, deflected by refraction // Get observer local sidereal coordinates, deflected by refraction
Vec3d StelObject::getSideralPosApparent(const StelCore* core) const Vec3d StelObject::getSideralPosApparent(const StelCore* core) const
{ {
Vec3d v=getAltAzPosApparent(core); Vec3d v=getAltAzPosApparent(core);
v = core->altAzToEquinoxEqu(v, StelCore::RefractionOff); v = core->altAzToEquinoxEqu(v, StelCore::RefractionOff);
return Mat4d::zrotation(-core->getLocalSideralTime())*v; // Hour Angle corrected to Delta-T value
double dt = (core->getDeltaT(core->getJDay())/240.)*M_PI/180.;
return Mat4d::zrotation(-core->getLocalSideralTime()+dt)*v;
} }
Vec3d StelObject::getAltAzPosGeometric(const StelCore* core) const Vec3d StelObject::getAltAzPosGeometric(const StelCore* core) const
{ {
return core->j2000ToAltAz(getJ2000EquatorialPos(core), StelCore::Ref ractionOff); return core->j2000ToAltAz(getJ2000EquatorialPos(core), StelCore::Ref ractionOff);
} }
// Get observer-centered alt/az position // Get observer-centered alt/az position
Vec3d StelObject::getAltAzPosApparent(const StelCore* core) const Vec3d StelObject::getAltAzPosApparent(const StelCore* core) const
{ {
skipping to change at line 105 skipping to change at line 109
{ {
double dec_equ, ra_equ; double dec_equ, ra_equ;
StelUtils::rectToSphe(&ra_equ,&dec_equ,getEquinoxEquatorialP os(core)); StelUtils::rectToSphe(&ra_equ,&dec_equ,getEquinoxEquatorialP os(core));
res += q_("RA/DE (of date): %1/%2").arg(StelUtils::radToHmsS tr(ra_equ), StelUtils::radToDmsStr(dec_equ)) + "<br>"; res += q_("RA/DE (of date): %1/%2").arg(StelUtils::radToHmsS tr(ra_equ), StelUtils::radToDmsStr(dec_equ)) + "<br>";
} }
if (flags&GalCoordJ2000) if (flags&GalCoordJ2000)
{ {
double glong, glat; double glong, glat;
StelUtils::rectToSphe(&glong, &glat, getJ2000GalacticPos(cor e)); StelUtils::rectToSphe(&glong, &glat, getJ2000GalacticPos(cor e));
res += q_("Galactic longitude/latitude (J2000): %1/%2").arg( // Note that Gal. Coords are DEFINED in B1950 coordinates, a
StelUtils::radToDmsStr(glong,true), StelUtils::radToDmsStr(glat,true)) + "< nd writing "J2000" to them does not make any sense.
br>"; res += q_("Galactic longitude/latitude: %1/%2").arg(StelUtil
s::radToDmsStr(glong,true), StelUtils::radToDmsStr(glat,true)) + "<br>";
} }
if (flags&HourAngle) if (flags&HourAngle)
{ {
double dec_sidereal, ra_sidereal; double dec_sidereal, ra_sidereal;
StelUtils::rectToSphe(&ra_sidereal,&dec_sidereal,getSideralP osGeometric(core)); StelUtils::rectToSphe(&ra_sidereal,&dec_sidereal,getSideralP osGeometric(core));
ra_sidereal = 2.*M_PI-ra_sidereal; ra_sidereal = 2.*M_PI-ra_sidereal;
if (withAtmosphere) if (withAtmosphere)
{ {
res += q_("Hour angle/DE: %1/%2").arg(StelUtils::radToHm sStr(ra_sidereal), StelUtils::radToDmsStr(dec_sidereal)) + " " + q_("(geome tric)") + "<br>"; res += q_("Hour angle/DE: %1/%2").arg(StelUtils::radToHm sStr(ra_sidereal), StelUtils::radToDmsStr(dec_sidereal)) + " " + q_("(geome tric)") + "<br>";
 End of changes. 3 change blocks. 
6 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/