Comet.cpp   Comet.cpp 
skipping to change at line 182 skipping to change at line 182
{ {
// Parabolic and hyperbolic comets doesn't have semi -major axis of the orbit. We have comet with elliptic orbit. // Parabolic and hyperbolic comets doesn't have semi -major axis of the orbit. We have comet with elliptic orbit.
cometType = qc_("periodic", "type of comet"); cometType = qc_("periodic", "type of comet");
} }
oss << q_("Type: <b>%1</b> (%2)").arg(q_(getPlanetTypeString ())).arg(cometType) << "<br />"; oss << q_("Type: <b>%1</b> (%2)").arg(q_(getPlanetTypeString ())).arg(cometType) << "<br />";
} }
if (flags&Magnitude) if (flags&Magnitude)
{ {
if (core->getSkyDrawer()->getFlagHasAtmosphere() && (alt_app>-3. 0*M_PI/180.0)) // Don't show extincted magnitude much below horizon where m odel is meaningless. if (core->getSkyDrawer()->getFlagHasAtmosphere() && (alt_app>-3. 0*M_PI/180.0)) // Don't show extincted magnitude much below horizon where m odel is meaningless.
oss << q_("Magnitude: <b>%1</b> (extincted to: <b>%2</b>)"). arg(QString::number(getVMagnitude(core), 'f', 2), oss << q_("Magnitude: <b>%1</b> (after extinction: <b>%2</b> )").arg(QString::number(getVMagnitude(core), 'f', 2),
QString::number(getVMagnitudeWithExtinction(core), 'f', 2)) << "<br>"; QString::number(getVMagnitudeWithExtinction(core), 'f', 2)) << "<br>";
else else
oss << q_("Magnitude: <b>%1</b>").arg(getVMagnitude(core), 0 , 'f', 2) << "<br>"; oss << q_("Magnitude: <b>%1</b>").arg(getVMagnitude(core), 0 , 'f', 2) << "<br>";
} }
if (flags&AbsoluteMagnitude) if (flags&AbsoluteMagnitude)
{ {
//TODO: Make sure absolute magnitude is a sane value //TODO: Make sure absolute magnitude is a sane value
//If the two parameter magnitude system is not use, don't di splay this //If the two parameter magnitude system is not use, don't di splay this
//value. (Using radius/albedo doesn't make any sense for com ets.) //value. (Using radius/albedo doesn't make any sense for com ets.)
if (slopeParameter >= 0) if (slopeParameter >= 0)
oss << q_("Absolute Magnitude: %1").arg(absoluteMagn itude, 0, 'f', 2) << "<br>"; oss << q_("Absolute Magnitude: %1").arg(absoluteMagn itude, 0, 'f', 2) << "<br>";
} }
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
if (flags&Distance) if (flags&Distance)
{ {
// GZ: Distance from sun should be added to all planets IMHO .
double distanceAu = getHeliocentricEclipticPos().length(); double distanceAu = getHeliocentricEclipticPos().length();
double distanceKm = AU * distanceAu; double distanceKm = AU * distanceAu;
if (distanceAu < 0.1) if (englishName!="Sun")
{
// xgettext:no-c-format
oss << QString(q_("Distance from Sun: %1AU (%2 km)")
)
.arg(distanceAu, 0, 'f', 6)
.arg(distanceKm, 0, 'f', 3);
}
else
{ {
// xgettext:no-c-format if (distanceAu < 0.1)
oss << QString(q_("Distance from Sun: %1AU (%2 Mio k {
m)")) // xgettext:no-c-format
.arg(distanceAu, 0, 'f', 3) oss << QString(q_("Distance from Sun: %1AU (
.arg(distanceKm / 1.0e6, 0, 'f', 3); %2 km)"))
.arg(distanceAu, 0, 'f', 6)
.arg(distanceKm, 0, 'f', 3);
}
else
{
// xgettext:no-c-format
oss << QString(q_("Distance from Sun: %1AU (
%2 Mio km)"))
.arg(distanceAu, 0, 'f', 3)
.arg(distanceKm / 1.0e6, 0, 'f', 3);
}
oss << "<br>";
} }
oss << "<br>";
distanceAu = getJ2000EquatorialPos(core).length(); distanceAu = getJ2000EquatorialPos(core).length();
distanceKm = AU * distanceAu; distanceKm = AU * distanceAu;
if (distanceAu < 0.1) if (distanceAu < 0.1)
{ {
// xgettext:no-c-format // xgettext:no-c-format
oss << QString(q_("Distance: %1AU (%2 km)")) oss << QString(q_("Distance: %1AU (%2 km)"))
.arg(distanceAu, 0, 'f', 6) .arg(distanceAu, 0, 'f', 6)
.arg(distanceKm, 0, 'f', 3); .arg(distanceKm, 0, 'f', 3);
} }
else else
 End of changes. 5 change blocks. 
17 lines changed or deleted 19 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/