StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 64 skipping to change at line 64
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
StelObject::postProcessInfoString(str, flags); StelObject::postProcessInfoString(str, flags);
return str; return str;
} }
QString StarWrapper1::getEnglishName(void) const QString StarWrapper1::getEnglishName(void) const
{ {
if (s->hip) if (s->hip)
return QString("HP %1").arg(s->hip); return QString("HIP %1").arg(s->hip);
return StarWrapperBase::getEnglishName(); return StarWrapperBase::getEnglishName();
} }
QString StarWrapper1::getInfoString(const StelCore *core, const InfoStringG roup& flags) const QString StarWrapper1::getInfoString(const StelCore *core, const InfoStringG roup& flags) const
{ {
QString str; QString str;
const StelNavigator* nav = core->getNavigator(); const StelNavigator* nav = core->getNavigator();
QTextStream oss(&str); QTextStream oss(&str);
if (s->hip) if (s->hip)
skipping to change at line 99 skipping to change at line 99
oss << (sciName=="" ? "" : sciName); oss << (sciName=="" ? "" : sciName);
if (commonNameI18!="" && sciName!="") if (commonNameI18!="" && sciName!="")
oss << ")"; oss << ")";
} }
} }
if ((flags&CatalogNumber) && (flags&Name) && (commonNameI18! ="" || sciName!="")) if ((flags&CatalogNumber) && (flags&Name) && (commonNameI18! ="" || sciName!=""))
oss << " - "; oss << " - ";
if (flags&CatalogNumber) if (flags&CatalogNumber)
oss << "HP " << 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&Magnitude) if (flags&Magnitude)
oss << q_("Magnitude: <b>%1</b> (B-V: %2)").arg(QString::num ber(getVMagnitude(nav), 'f', 2), oss << q_("Magnitude: <b>%1</b> (B-V: %2)").arg(QString::num ber(getVMagnitude(nav), 'f', 2),
QString::num ber(s->getBV(), 'f', 2)) << "<br>"; QString::num ber(s->getBV(), 'f', 2)) << "<br>";
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/