Satellite.cpp   Satellite.cpp 
skipping to change at line 280 skipping to change at line 280
catalogNumbers = QString("%1: %2; %3: %4") catalogNumbers = QString("%1: %2; %3: %4")
.arg(q_("Catalog #")) .arg(q_("Catalog #"))
.arg(id) .arg(id)
.arg(q_("International Designator") ) .arg(q_("International Designator") )
.arg(internationalDesignator); .arg(internationalDesignator);
oss << catalogNumbers << "<br/><br/>"; oss << catalogNumbers << "<br/><br/>";
} }
if (flags & ObjectType) if (flags & ObjectType)
{ {
oss << q_("Type: <b>%1</b>").arg(q_("artificial satellite")) << "<br/>"; oss << QString("%1: <b>%2</b>").arg(q_("Type"), q_("artifici al satellite")) << "<br/>";
} }
if ((flags & Magnitude) && (stdMag!=99.f)) if ((flags & Magnitude) && (stdMag!=99.f))
{ {
float mag = getVMagnitude(core); QString emag = "";
if (core->getSkyDrawer()->getFlagHasAtmosphere()) if (core->getSkyDrawer()->getFlagHasAtmosphere())
oss << q_("Approx. magnitude: <b>%1</b> (extincted t emag = QString(" (%1: <b>%2</b>)").arg(q_("extincted
o: <b>%2</b>)").arg(QString::number(mag, 'f', 2), to"), QString::number(getVMagnitudeWithExtinction(core), 'f', 2));
QString::number(getVMagnitudeWithExtinction(core), 'f', oss << QString("%1: <b>%2</b>%3").arg(q_("Approx. magnitude"
2)) << "<br>"; ), QString::number(getVMagnitude(core), 'f', 2), emag) << "<br />";
else
oss << q_("Approx. magnitude: <b>%1</b>").arg(QStrin
g::number(mag, 'f', 2)) << "<br/>";
#ifdef IRIDIUM_SAT_TEXT_DEBUG #ifdef IRIDIUM_SAT_TEXT_DEBUG
oss << myText << "<br/>"; oss << myText << "<br/>";
#endif #endif
} }
// Ra/Dec etc. // Ra/Dec etc.
oss << getPositionInfoString(core, flags); oss << getCommonInfoString(core, flags);
if (flags & Extra) if (flags & Extra)
{ {
// TRANSLATORS: Slant range: distance between the satellite and the observer // TRANSLATORS: Slant range: distance between the satellite and the observer
oss << QString(q_("Range (km): %1")).arg(range, 5, 'f', 2); oss << QString("%1: %2 %3").arg(q_("Range")).arg(range, 5, '
oss << "<br/>"; f', 2).arg(qc_("km", "distance")) << "<br/>";
// TRANSLATORS: Rate at which the distance changes // TRANSLATORS: Rate at which the distance changes
oss << QString(q_("Range rate (km/s): %1")).arg(rangeRate, 5 oss << QString("%1: %2 %3").arg(q_("Range rate")).arg(rangeR
, 'f', 3); ate, 5, 'f', 3).arg(qc_("km/s", "speed")) << "<br/>";
oss << "<br/>";
// TRANSLATORS: Satellite altitude // TRANSLATORS: Satellite altitude
oss << QString(q_("Altitude (km): %1")).arg(height, 5, 'f', oss << QString("%1: %2 %3").arg(q_("Altitude")).arg(height,
2); 5, 'f', 2).arg(qc_("km", "distance")) << "<br/>";
oss << "<br/>"; oss << QString("%1: %2%3/%4%5")
// TRANSLATORS: %1 and %3 are numbers, %2 and %4 - degree si .arg(q_("SubPoint (Lat./Long.)"))
gns.
oss << QString(q_("SubPoint (Lat./Long.): %1%2/%3%4"))
.arg(latLongSubPointPosition[0], 5, 'f', 2) .arg(latLongSubPointPosition[0], 5, 'f', 2)
.arg(QChar(0x00B0)) .arg(QChar(0x00B0))
.arg(latLongSubPointPosition[1], 5, 'f', 3) .arg(latLongSubPointPosition[1], 5, 'f', 3)
.arg(QChar(0x00B0)); .arg(QChar(0x00B0));
oss << "<br/>"; oss << "<br/>";
//TODO: This one can be done better //TODO: This one can be done better
const char* xyz = "<b>X:</b> %1, <b>Y:</b> %2, <b>Z:</b> %3" ; const char* xyz = "<b>X:</b> %1, <b>Y:</b> %2, <b>Z:</b> %3" ;
QString temeCoords = QString(xyz) QString temeCoords = QString(xyz)
.arg(position[0], 5, 'f', 2) .arg(position[0], 5, 'f', 2)
.arg(position[1], 5, 'f', 2) .arg(position[1], 5, 'f', 2)
.arg(position[2], 5, 'f', 2); .arg(position[2], 5, 'f', 2);
// TRANSLATORS: TEME is an Earth-centered inertial coordinat e system // TRANSLATORS: TEME is an Earth-centered inertial coordinat e system
oss << QString(q_("TEME coordinates (km): %1")).arg(temeCoor oss << QString("%1: %2 %3").arg(q_("TEME coordinates")).arg(
ds); temeCoords).arg(qc_("km", "distance")) << "<br/>";
oss << "<br/>";
QString temeVel = QString(xyz) QString temeVel = QString(xyz)
.arg(velocity[0], 5, 'f', 2) .arg(velocity[0], 5, 'f', 2)
.arg(velocity[1], 5, 'f', 2) .arg(velocity[1], 5, 'f', 2)
.arg(velocity[2], 5, 'f', 2); .arg(velocity[2], 5, 'f', 2);
// TRANSLATORS: TEME is an Earth-centered inertial coordinat e system // TRANSLATORS: TEME is an Earth-centered inertial coordinat e system
oss << QString(q_("TEME velocity (km/s): %1")).arg(temeVel); oss << QString("%1: %2 %3").arg(q_("TEME velocity")).arg(tem
oss << "<br/>"; eVel).arg(qc_("km/s", "speed")) << "<br/>";
if (sunReflAngle>0) if (sunReflAngle>0)
{ // Iridium { // Iridium
oss << QString(q_("Sun reflection angle: %1%2")) oss << QString("%1: %2%3").arg(q_("Sun reflection an gle"))
.arg(sunReflAngle,0,'f',1) .arg(sunReflAngle,0,'f',1)
.arg(QChar(0x00B0)); // Degree sign .arg(QChar(0x00B0)); // Degree sign
oss << "<br/>"; oss << "<br />";
} }
// Groups of the artificial satellites // Groups of the artificial satellites
QStringList groupList; QStringList groupList;
foreach(const QString &g, groups) foreach(const QString &g, groups)
groupList << q_(g); groupList << q_(g);
if (!groupList.isEmpty()) if (!groupList.isEmpty())
{ {
QString group = q_("Group"); QString group = q_("Group");
if (groups.count()>1) if (groups.count()>1)
group = q_("Groups"); group = q_("Groups");
oss << QString("%1: %2").arg(group, groupList.join(" , ")) << "<br/>"; oss << QString("%1: %2").arg(group, groupList.join(" , ")) << "<br />";
} }
if (status!=StatusUnknown) if (status!=StatusUnknown)
oss << QString(q_("Operational status: %1")).arg(get OperationalStatus()) << "<br/>"; oss << QString("%1 %2").arg(q_("Operational status") ).arg(getOperationalStatus()) << "<br />";
//Visibility: Full text //Visibility: Full text
//TODO: Move to a more prominent place. //TODO: Move to a more prominent place.
switch (visibility) switch (visibility)
{ {
case gSatWrapper::RADAR_SUN: case gSatWrapper::RADAR_SUN:
oss << q_("The satellite and the observer ar e in sunlight.") << "<br/>"; oss << q_("The satellite and the observer ar e in sunlight.") << "<br/>";
break; break;
case gSatWrapper::VISIBLE: case gSatWrapper::VISIBLE:
oss << q_("The satellite is visible.") << "< br/>"; oss << q_("The satellite is visible.") << "< br/>";
skipping to change at line 401 skipping to change at line 395
sign='-'; sign='-';
ddop*=-1; ddop*=-1;
} }
else else
sign='+'; sign='+';
oss << "<br/>"; oss << "<br/>";
if (!c.modulation.isEmpty() && c.modulation != "") oss << " " << c.modulation; if (!c.modulation.isEmpty() && c.modulation != "") oss << " " << c.modulation;
if (!c.description.isEmpty() && c.descriptio n != "") oss << " " << c.description; if (!c.description.isEmpty() && c.descriptio n != "") oss << " " << c.description;
if ((!c.modulation.isEmpty() && c.modulation != "") || (!c.description.isEmpty() && c.description != "")) oss << "<br/> "; if ((!c.modulation.isEmpty() && c.modulation != "") || (!c.description.isEmpty() && c.description != "")) oss << "<br/> ";
oss << QString(q_("%1 MHz (%2%3 kHz)")) oss << QString("%1 %2 (%3%4%5)")
.arg(qc_("MHz", "frequency"))
.arg(c.frequency, 8, 'f', 5) .arg(c.frequency, 8, 'f', 5)
.arg(sign) .arg(sign)
.arg(ddop, 6, 'f', 3); .arg(ddop, 6, 'f', 3)
oss << "<br/>"; .arg(qc_("kHz", "frequency"));
oss << "<br />";
} }
} }
} }
postProcessInfoString(str, flags); postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap Satellite::getInfoMap(const StelCore *core) const QVariantMap Satellite::getInfoMap(const StelCore *core) const
{ {
 End of changes. 15 change blocks. 
34 lines changed or deleted 29 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/