StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 108 skipping to change at line 108
const QString photoVSys = StarMgr::getGcvsPhotometricSystem(s->getHi p()); const QString photoVSys = StarMgr::getGcvsPhotometricSystem(s->getHi p());
const double vEpoch = StarMgr::getGcvsEpoch(s->getHip()); const double vEpoch = StarMgr::getGcvsEpoch(s->getHip());
const double vPeriod = StarMgr::getGcvsPeriod(s->getHip()); const double vPeriod = StarMgr::getGcvsPeriod(s->getHip());
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 additionalNameI18 = StarMgr::getAdditionalName s(s->getHip());
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()) ;
const QString wdsSciName = StarMgr::getWdsName(s->getHip()); const QString wdsSciName = StarMgr::getWdsName(s->getHip());
const QString crossIndexData = StarMgr::getCrossIdentificati onDesignations(s->getHip()); const QString crossIndexData = StarMgr::getCrossIdentificati onDesignations(s->getHip());
QStringList designations; QStringList designations;
if (!sciName.isEmpty()) if (!sciName.isEmpty())
designations.append(sciName); designations.append(sciName);
if (!addSciName.isEmpty()) if (!addSciName.isEmpty())
designations.append(addSciName); designations.append(addSciName);
skipping to change at line 142 skipping to change at line 143
if (!wdsSciName.isEmpty() && wdsSciName!=addSciName && wdsSc iName!=sciName) if (!wdsSciName.isEmpty() && wdsSciName!=addSciName && wdsSc iName!=sciName)
designations.append(wdsSciName); designations.append(wdsSciName);
const QString designationsList = designations.join(" - "); const QString designationsList = designations.join(" - ");
if (flags&Name) if (flags&Name)
{ {
if (!commonNameI18.isEmpty()) if (!commonNameI18.isEmpty())
oss << commonNameI18; oss << commonNameI18;
if (!additionalNameI18.isEmpty())
oss << " (" << additionalNameI18 << ")";
if (!commonNameI18.isEmpty() && !designationsList.is Empty() && flags&CatalogNumber) if (!commonNameI18.isEmpty() && !designationsList.is Empty() && flags&CatalogNumber)
oss << "<br>"; oss << "<br>";
} }
if (flags&CatalogNumber) if (flags&CatalogNumber)
oss << designationsList; oss << designationsList;
if ((flags&Name) || (flags&CatalogNumber)) if ((flags&Name) || (flags&CatalogNumber))
oss << "</h2>"; oss << "</h2>";
} }
 End of changes. 2 change blocks. 
0 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/