StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 82 skipping to change at line 82
QTextStream oss(&str); QTextStream oss(&str);
if (s->hip) if (s->hip)
{ {
if ((flags&Name) || (flags&CatalogNumber)) if ((flags&Name) || (flags&CatalogNumber))
oss << "<h2>"; oss << "<h2>";
const QString commonNameI18 = StarMgr::getCommonName(s->hip) ; const QString commonNameI18 = StarMgr::getCommonName(s->hip) ;
const QString sciName = StarMgr::getSciName(s->hip); const QString sciName = StarMgr::getSciName(s->hip);
bool nameWasEmpty=true;
if (flags&Name) if (flags&Name)
{ {
if (commonNameI18!="" || sciName!="") if (commonNameI18!="" || sciName!="")
{ {
oss << commonNameI18 << (commonNameI18 == "" ? "" : " "); oss << commonNameI18 << (commonNameI18 == "" ? "" : " ");
if (commonNameI18!="" && sciName!="") if (commonNameI18!="" && sciName!="")
oss << "("; oss << "(";
oss << (sciName=="" ? "" : sciName); oss << (sciName=="" ? "" : sciName);
if (commonNameI18!="" && sciName!="") if (commonNameI18!="" && sciName!="")
oss << ")"; oss << ")";
nameWasEmpty=false;
} }
} }
if ((flags&CatalogNumber) && (flags&Name) && (commonNameI18! ="" || sciName!="")) if ((flags&CatalogNumber) && (flags&Name) && !nameWasEmpty)
oss << " - "; oss << " - ";
if (flags&CatalogNumber) 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&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),
 End of changes. 4 change blocks. 
3 lines changed or deleted 4 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/