Exoplanet.cpp   Exoplanet.cpp 
skipping to change at line 292 skipping to change at line 292
{ {
QString systemName = getNameI18n(); QString systemName = getNameI18n();
if (!starProperName.isEmpty()) if (!starProperName.isEmpty())
systemName.append(QString(" (%1)").arg(designation)) ; systemName.append(QString(" (%1)").arg(designation)) ;
oss << "<h2>" << systemName << "</h2>"; oss << "<h2>" << systemName << "</h2>";
} }
if (flags&ObjectType) if (flags&ObjectType)
{ {
oss << q_("Type: <b>%1</b>").arg(q_("planetary system")) << "<br />"; oss << QString("%1: <b>%2</b>").arg(q_("Type"), q_("planetar y system")) << "<br />";
} }
if (flags&Magnitude) if (flags&Magnitude)
{ {
if (Vmag<99 && !distributionMode) if (Vmag<99 && !distributionMode)
{ {
QString emag = "";
if (core->getSkyDrawer()->getFlagHasAtmosphere()) if (core->getSkyDrawer()->getFlagHasAtmosphere())
{ emag = QString(" (%1: <b>%2</b>)").arg(q_("e
oss << q_("Magnitude: <b>%1</b> (extincted t xtincted to"), QString::number(getVMagnitudeWithExtinction(core), 'f', 2));
o: <b>%2</b>)").arg(QString::number(getVMagnitude(core), 'f', 2),
oss << QString("%1: <b>%2</b>%3").arg(q_("Magnitude"
QString::number(getVMagnitudeWithExtinction(core), 'f', ), QString::number(getVMagnitude(core), 'f', 2), emag) << "<br />";
2)) << "<br>";
}
else
{
oss << q_("Magnitude: <b>%1</b>").arg(QStrin
g::number(getVMagnitude(core), 'f', 2)) << "<br>";
}
} }
} }
// Ra/Dec etc. // Ra/Dec etc.
oss << getPositionInfoString(core, flags); oss << getCommonInfoString(core, flags);
if (flags&Extra && !stype.isEmpty()) if (flags&Extra && !stype.isEmpty())
{ oss << QString("%1: <b>%2</b>").arg(q_("Spectral Type"), st
oss << q_("Spectral Type: %1").arg(stype) << "<br>"; ype) << "<br />";
}
if (flags&Distance && distance>0) if (flags&Distance && distance>0)
{ {
//TRANSLATORS: Unit of measure for distance - Light Years //TRANSLATORS: Unit of measure for distance - Light Years
oss << q_("Distance: %1 ly").arg(QString::number(distance/0. QString ly = qc_("ly", "distance");
306601, 'f', 2)) << "<br>"; oss << QString("%1: %2 %3").arg(q_("Distance"), QString::num
ber(distance/0.306601, 'f', 2), ly) << "<br />";
} }
if (flags&Extra) if (flags&Extra)
{ {
if (smetal!=0) if (smetal!=0)
{ {
oss << QString("%1 [Fe/H]: %2").arg(q_("Metallicity" )).arg(smetal) << "<br>"; oss << QString("%1 [Fe/H]: %2").arg(q_("Metallicity" ), smetal) << "<br />";
} }
if (smass>0) if (smass>0)
{ {
oss << QString("%1: %2 M<sub>%3</sub>").arg(q_("Mass ")).arg(QString::number(smass, 'f', 3)).arg(q_("Sun")) << "<br>"; oss << QString("%1: %2 M<sub>%3</sub>").arg(q_("Mass "), QString::number(smass, 'f', 3), q_("Sun")) << "<br />";
} }
if (sradius>0) if (sradius>0)
{ {
oss << QString("%1: %2 R<sub>%3</sub>").arg(q_("Radi us")).arg(QString::number(sradius, 'f', 5)).arg(q_("Sun")) << "<br>"; oss << QString("%1: %2 R<sub>%3</sub>").arg(q_("Radi us"), QString::number(sradius, 'f', 5), q_("Sun")) << "<br />";
} }
if (effectiveTemp>0) if (effectiveTemp>0)
{ {
oss << q_("Effective temperature: %1 K").arg(effecti veTemp) << "<br>"; oss << QString("%1: %2 %3").arg(q_("Effective temper ature")).arg(effectiveTemp).arg(qc_("K", "temperature")) << "<br />";
} }
if (exoplanets.size() > 0) if (exoplanets.size() > 0)
{ {
QString planetNameLabel = QString("<td style=\"paddi ng: 0 2px 0 0;\">%1</td>").arg(q_("Exoplanet")); QString planetNameLabel = QString("<td style=\"paddi ng: 0 2px 0 0;\">%1</td>").arg(q_("Exoplanet"));
QString planetProperNameLabel = QString("<td style=\ "padding: 0 2px 0 0;\">%1</td>").arg(q_("Name")); QString planetProperNameLabel = QString("<td style=\ "padding: 0 2px 0 0;\">%1</td>").arg(q_("Name"));
QString periodLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Period")).arg(q_("days")); QString periodLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Period")).arg(q_("days"));
QString massLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (M<sub>%2</sub>)</td>").arg(q_("Mass")).arg(q_("Jup")); QString massLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (M<sub>%2</sub>)</td>").arg(q_("Mass")).arg(q_("Jup"));
QString radiusLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (R<sub>%2</sub>)</td>").arg(q_("Radius")).arg(q_("Jup")); QString radiusLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1 (R<sub>%2</sub>)</td>").arg(q_("Radius")).arg(q_("Jup"));
QString semiAxisLabel = QString("<td style=\"padding : 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Semi-Major Axis")).arg(q_("AU")); QString semiAxisLabel = QString("<td style=\"padding : 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Semi-Major Axis")).arg(qc_("AU", "dis tance, astronomical unit"));
QString eccentricityLabel = QString("<td style=\"pad ding: 0 2px 0 0;\">%1</td>").arg(q_("Eccentricity")); QString eccentricityLabel = QString("<td style=\"pad ding: 0 2px 0 0;\">%1</td>").arg(q_("Eccentricity"));
QString inclinationLabel = QString("<td style=\"padd ing: 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Inclination")).arg(QChar(0x00B0)); QString inclinationLabel = QString("<td style=\"padd ing: 0 2px 0 0;\">%1 (%2)</td>").arg(q_("Inclination")).arg(QChar(0x00B0));
QString angleDistanceLabel = QString("<td style=\"pa dding: 0 2px 0 0;\">%1 (\")</td>").arg(q_("Angle Distance")); QString angleDistanceLabel = QString("<td style=\"pa dding: 0 2px 0 0;\">%1 (\")</td>").arg(q_("Angle Distance"));
QString discoveredLabel = QString("<td style=\"paddi ng: 0 2px 0 0;\">%1</td>").arg(q_("Discovered year")); QString discoveredLabel = QString("<td style=\"paddi ng: 0 2px 0 0;\">%1</td>").arg(q_("Discovered year"));
QString pClassLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1</td>").arg(q_("Planetary class")); QString pClassLabel = QString("<td style=\"padding: 0 2px 0 0;\">%1</td>").arg(q_("Planetary class"));
//TRANSLATORS: Full phrase is "Equilibrium Temperatu re" //TRANSLATORS: Full phrase is "Equilibrium Temperatu re"
QString equilibriumTempLabel = QString("<td style=\" padding: 0 2px 0 0;\">%1 (%2C)</td>").arg(q_("Equilibrium temp.")).arg(QCha r(0x00B0)); QString equilibriumTempLabel = QString("<td style=\" padding: 0 2px 0 0;\">%1 (%2C)</td>").arg(q_("Equilibrium temp.")).arg(QCha r(0x00B0));
//TRANSLATORS: ESI = Earth Similarity Index //TRANSLATORS: ESI = Earth Similarity Index
QString ESILabel = QString("<td style=\"padding: 0 2 px 0 0;\">%1</td>").arg(q_("ESI")); QString ESILabel = QString("<td style=\"padding: 0 2 px 0 0;\">%1</td>").arg(q_("ESI"));
foreach(const exoplanetData &p, exoplanets) foreach(const exoplanetData &p, exoplanets)
 End of changes. 11 change blocks. 
24 lines changed or deleted 18 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/