StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 105 skipping to change at line 105
const int vMm = StarMgr::getGcvsMM(s->getHip()); const int vMm = StarMgr::getGcvsMM(s->getHip());
if (s->getHip()) if (s->getHip())
{ {
if ((flags&Name) || (flags&CatalogNumber)) if ((flags&Name) || (flags&CatalogNumber))
oss << "<h2>"; oss << "<h2>";
const QString commonNameI18 = StarMgr::getCommonName(s->getH ip()); const QString commonNameI18 = StarMgr::getCommonName(s->getH ip());
const QString sciName = StarMgr::getSciName(s->getHip()); const QString sciName = StarMgr::getSciName(s->getHip());
const QString addSciName = StarMgr::getSciAdditionalName(s-> getHip()); const QString addSciName = StarMgr::getSciAdditionalName(s-> getHip());
const QString varSciName = StarMgr::getGcvsName(s->getHip()) ; const QString varSciName = StarMgr::getGcvsName(s->getHip()) ;
QStringList sciNames;
if (!sciName.isEmpty())
sciNames.append(sciName);
if (!addSciName.isEmpty())
sciNames.append(addSciName);
if (!varSciName.isEmpty() && varSciName!=addSciName && varSc
iName!=sciName)
sciNames.append(varSciName);
const QString sciNamesList = sciNames.join(" - ");
bool nameWasEmpty=true; bool nameWasEmpty=true;
if (flags&Name) if (flags&Name)
{ {
if (commonNameI18!="" || sciName!="" || addSciName!= "" || varSciName!="") if (!commonNameI18.isEmpty() || !sciNamesList.isEmpt y())
{ {
oss << commonNameI18 << (commonNameI18 == "" if (!commonNameI18.isEmpty())
? "" : " "); oss << commonNameI18;
if (commonNameI18!="" && (sciName!="" || var
SciName!="")) if (!commonNameI18.isEmpty() && !sciNamesLis
oss << "("; t.isEmpty())
oss << (sciName=="" ? "" : sciName); oss << " (" << sciNamesList << ")";
oss << (addSciName=="" ? "" : QString(" - %1
").arg(addSciName)); if (commonNameI18.isEmpty() && !sciNamesList
if (varSciName!="" && varSciName!=sciName) .isEmpty())
oss << (sciName=="" ? "" : " - ") << oss << sciNamesList;
varSciName;
if (commonNameI18!="" && (sciName!="" || var
SciName!=""))
oss << ")";
nameWasEmpty=false; nameWasEmpty=false;
} }
} }
if ((flags&CatalogNumber) && (flags&Name) && !nameWasEmpty) if ((flags&CatalogNumber) && (flags&Name) && !nameWasEmpty)
oss << " - "; oss << " - ";
if (flags&CatalogNumber || (nameWasEmpty && (flags&Name))) if (flags&CatalogNumber || (nameWasEmpty && (flags&Name)))
oss << "HIP " << s->getHip(); oss << "HIP " << s->getHip();
if (s->getComponentIds()) if (s->getComponentIds())
oss << " " << StarMgr::convertToComponentIds(s->getC omponentIds()); oss << " " << StarMgr::convertToComponentIds(s->getC omponentIds());
 End of changes. 3 change blocks. 
15 lines changed or deleted 21 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/