StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 50 skipping to change at line 50
return std::numeric_limits<T>::has_infinity && value == std::numeric _limits<T>::infinity(); return std::numeric_limits<T>::has_infinity && value == std::numeric _limits<T>::infinity();
} }
namespace BigStarCatalogExtension { namespace BigStarCatalogExtension {
QString StarWrapperBase::getInfoString(const StelCore *core, const InfoStri ngGroup& flags) const QString StarWrapperBase::getInfoString(const StelCore *core, const InfoStri ngGroup& flags) const
{ {
QString str; QString str;
QTextStream oss(&str); QTextStream oss(&str);
if (flags&Extra1)
{
oss << q_("Type: <b>%1</b>").arg(q_("star")) << "<br />";
}
if (flags&Magnitude) if (flags&Magnitude)
{ {
oss << q_("Magnitude: <b>%1</b> (B-V: %2)").arg(QString::number( getVMagnitude(core, false), 'f', 2), QString::number(getBV(), 'f', 2)) << " <br>"; oss << q_("Magnitude: <b>%1</b> (B-V: %2)").arg(QString::number( getVMagnitude(core, false), 'f', 2), QString::number(getBV(), 'f', 2)) << " <br>";
if (core->getSkyDrawer()->getFlagHasAtmosphere()) if (core->getSkyDrawer()->getFlagHasAtmosphere())
{ {
oss << q_("Apparent Magnitude: <b>%1</b> (by extinction)"). arg(QString::number(getVMagnitude(core, true), 'f', 2)) << "<br>"; oss << q_("Apparent Magnitude: <b>%1</b> (by extinction)"). arg(QString::number(getVMagnitude(core, true), 'f', 2)) << "<br>";
} }
} }
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
skipping to change at line 111 skipping to change at line 116
if (flags&CatalogNumber || (nameWasEmpty && (flags&Name))) if (flags&CatalogNumber || (nameWasEmpty && (flags&Name)))
oss << "HIP " << s->hip; oss << "HIP " << s->hip;
if (s->componentIds) if (s->componentIds)
oss << " " << StarMgr::convertToComponentIds(s->comp onentIds); oss << " " << StarMgr::convertToComponentIds(s->comp onentIds);
if ((flags&Name) || (flags&CatalogNumber)) if ((flags&Name) || (flags&CatalogNumber))
oss << "</h2>"; oss << "</h2>";
} }
if (flags&Extra1)
{
if (s->componentIds)
oss << q_("Type: <b>%1</b>").arg(q_("double star"))
<< "<br />";
else
oss << q_("Type: <b>%1</b>").arg(q_("star")) << "<br
/>";
}
if (flags&Magnitude) if (flags&Magnitude)
{ {
if (core->getSkyDrawer()->getFlagHasAtmosphere()) if (core->getSkyDrawer()->getFlagHasAtmosphere())
oss << q_("Magnitude: <b>%1</b> (extincted to: <b>%2</b>. B -V: <b>%3</b>)").arg(QString::number(getVMagnitude(core, false), 'f', 2), oss << q_("Magnitude: <b>%1</b> (extincted to: <b>%2</b>. B -V: <b>%3</b>)").arg(QString::number(getVMagnitude(core, false), 'f', 2),
QString::number(getVMagnitude(core, true), 'f', 2), QString::number(getVMagnitude(core, true), 'f', 2),
QString::number(s->getBV(), 'f', 2)) << "<br>"; QString::number(s->getBV(), 'f', 2)) << "<br>";
else else
oss << q_("Magnitude: <b>%1</b> (B-V: <b>%2</b>)").arg(QStri ng::number(getVMagnitude(core, false), 'f', 2), oss << q_("Magnitude: <b>%1</b> (B-V: <b>%2</b>)").arg(QStri ng::number(getVMagnitude(core, false), 'f', 2),
QStri ng::number(s->getBV(), 'f', 2)) << "<br>"; QStri ng::number(s->getBV(), 'f', 2)) << "<br>";
} }
 End of changes. 2 change blocks. 
0 lines changed or deleted 15 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/