StelMainScriptAPI.cpp   StelMainScriptAPI.cpp 
skipping to change at line 831 skipping to change at line 831
map.insert("altitude-geometric", alt*180./M_PI); map.insert("altitude-geometric", alt*180./M_PI);
map.insert("azimuth-geometric", az*180./M_PI); map.insert("azimuth-geometric", az*180./M_PI);
// galactic long/lat // galactic long/lat
pos = obj->getGalacticPos(core); pos = obj->getGalacticPos(core);
StelUtils::rectToSphe(&glong, &glat, pos); StelUtils::rectToSphe(&glong, &glat, pos);
map.insert("glong", glong*180./M_PI); map.insert("glong", glong*180./M_PI);
map.insert("glat", glat*180./M_PI); map.insert("glat", glat*180./M_PI);
if (core->getCurrentLocation().planetName == "Earth")
{
SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
double ra_equ, dec_equ, lambda, beta;
// J2000
double eclJ2000 = ssmgr->getEarth()->getRotObliquity(2451545
.0);
double ecl = ssmgr->getEarth()->getRotObliquity(core->getJDE
());
// ecliptic longitude/latitude (J2000 frame)
StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getJ2000Equator
ialPos(core));
StelUtils::equToEcl(ra_equ, dec_equ, eclJ2000, &lambda, &bet
a);
if (lambda<0) lambda+=2.0*M_PI;
map.insert("elongJ2000", lambda*180./M_PI);
map.insert("elatJ2000", beta*180./M_PI);
// ecliptic longitude/latitude
StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getEquinoxEquat
orialPos(core));
StelUtils::equToEcl(ra_equ, dec_equ, ecl, &lambda, &beta);
if (lambda<0) lambda+=2.0*M_PI;
map.insert("elong", lambda*180./M_PI);
map.insert("elat", beta*180./M_PI);
}
// magnitude // magnitude
map.insert("vmag", obj->getVMagnitude(core)); map.insert("vmag", obj->getVMagnitude(core));
map.insert("vmage", obj->getVMagnitudeWithExtinction(core)); map.insert("vmage", obj->getVMagnitudeWithExtinction(core));
// angular size // angular size
double angularSize = 2.*obj->getAngularSize(core)*M_PI/180.; double angularSize = 2.*obj->getAngularSize(core)*M_PI/180.;
bool sign; bool sign;
double deg; double deg;
StelUtils::radToDecDeg(angularSize, sign, deg); StelUtils::radToDecDeg(angularSize, sign, deg);
if (!sign) if (!sign)
skipping to change at line 941 skipping to change at line 964
map.insert("altitude-geometric", alt*180./M_PI); map.insert("altitude-geometric", alt*180./M_PI);
map.insert("azimuth-geometric", az*180./M_PI); map.insert("azimuth-geometric", az*180./M_PI);
// galactic long/lat // galactic long/lat
pos = obj->getGalacticPos(core); pos = obj->getGalacticPos(core);
StelUtils::rectToSphe(&glong, &glat, pos); StelUtils::rectToSphe(&glong, &glat, pos);
map.insert("glong", glong*180./M_PI); map.insert("glong", glong*180./M_PI);
map.insert("glat", glat*180./M_PI); map.insert("glat", glat*180./M_PI);
if (core->getCurrentLocation().planetName == "Earth")
{
SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
double ra_equ, dec_equ, lambda, beta;
// J2000
double eclJ2000 = ssmgr->getEarth()->getRotObliquity(2451545
.0);
double ecl = ssmgr->getEarth()->getRotObliquity(core->getJDE
());
// ecliptic longitude/latitude (J2000 frame)
StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getJ2000Equator
ialPos(core));
StelUtils::equToEcl(ra_equ, dec_equ, eclJ2000, &lambda, &bet
a);
if (lambda<0) lambda+=2.0*M_PI;
map.insert("elongJ2000", lambda*180./M_PI);
map.insert("elatJ2000", beta*180./M_PI);
// ecliptic longitude/latitude
StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getEquinoxEquat
orialPos(core));
StelUtils::equToEcl(ra_equ, dec_equ, ecl, &lambda, &beta);
if (lambda<0) lambda+=2.0*M_PI;
map.insert("elong", lambda*180./M_PI);
map.insert("elat", beta*180./M_PI);
}
// magnitude // magnitude
map.insert("vmag", obj->getVMagnitude(core)); map.insert("vmag", obj->getVMagnitude(core));
map.insert("vmage", obj->getVMagnitudeWithExtinction(core)); map.insert("vmage", obj->getVMagnitudeWithExtinction(core));
// angular size // angular size
double angularSize = 2.*obj->getAngularSize(core)*M_PI/180.; double angularSize = 2.*obj->getAngularSize(core)*M_PI/180.;
bool sign; bool sign;
double deg; double deg;
StelUtils::radToDecDeg(angularSize, sign, deg); StelUtils::radToDecDeg(angularSize, sign, deg);
if (!sign) if (!sign)
 End of changes. 2 change blocks. 
0 lines changed or deleted 56 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/