StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 236 skipping to change at line 236
} }
if (flags&Extra) if (flags&Extra)
{ {
if (s->getSpInt()) if (s->getSpInt())
oss << q_("Spectral Type: %1").arg(StarMgr::convertT oSpectralType(s->getSpInt())) << "<br />"; oss << q_("Spectral Type: %1").arg(StarMgr::convertT oSpectralType(s->getSpInt())) << "<br />";
if (s->getPlx()) if (s->getPlx())
oss << q_("Parallax: %1\"").arg(0.00001*s->getPlx(), 0, 'f', 5) << "<br />"; oss << q_("Parallax: %1\"").arg(0.00001*s->getPlx(), 0, 'f', 5) << "<br />";
if (vEpoch>0)
{
double vsEpoch = 2400000+vEpoch;
if (ebsFlag)
oss << q_("Epoch for minimum light: %1 JD").
arg(QString::number(vsEpoch, 'f', 5)) << "<br />";
else
oss << q_("Epoch for maximum light: %1 JD").
arg(QString::number(vsEpoch, 'f', 5)) << "<br />";
}
if (vPeriod>0) if (vPeriod>0)
oss << q_("Period: %1 days").arg(vPeriod) << "<br /> "; oss << q_("Period: %1 days").arg(vPeriod) << "<br /> ";
if (vEpoch>0 && vPeriod>0) if (vEpoch>0 && vPeriod>0)
{ {
// Calculate next minimum or maximum light // Calculate next minimum or maximum light
double vsEpoch = 2400000+vEpoch; double vsEpoch = 2400000+vEpoch;
int npDelta = (core->getJDay()-vsEpoch)/vPeriod; double npDate = vsEpoch + vPeriod * ::floor(1.0 + (c
double npDate = vsEpoch + ((npDelta+1)*vPeriod); ore->getJDay() - vsEpoch)/vPeriod);
QString nextDate = StelUtils::julianDayToISO8601Stri ng(npDate).replace("T", " "); QString nextDate = StelUtils::julianDayToISO8601Stri ng(npDate).replace("T", " ");
if (ebsFlag) if (ebsFlag)
oss << q_("Next minimum light: %1 UTC").arg( nextDate) << "<br />"; oss << q_("Next minimum light: %1 UTC").arg( nextDate) << "<br />";
else else
oss << q_("Next maximum light: %1 UTC").arg( nextDate) << "<br />"; oss << q_("Next maximum light: %1 UTC").arg( nextDate) << "<br />";
} }
if (vMm>0) if (vMm>0)
{ {
if (ebsFlag) if (ebsFlag)
oss << q_("Duration of eclipse: %1%").arg(vM m) << "<br />"; oss << q_("Duration of eclipse: %1%").arg(vM m) << "<br />";
else else
oss << q_("Rising time: %1%").arg(vMm) << "< br />"; oss << q_("Rising time: %1%").arg(vMm) << "< br />";
} }
} }
 End of changes. 3 change blocks. 
13 lines changed or deleted 3 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/