StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 82 skipping to change at line 82
if (s->hip) if (s->hip)
return QString("HIP %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;
QTextStream oss(&str); QTextStream oss(&str);
const QString varType = StarMgr::getGCVSVariabilityType(s->hip); const QString varType = StarMgr::getGcvsVariabilityType(s->hip);
const float maxVMag = StarMgr::getGCVSMaxMagnitude(s->hip); const float maxVMag = StarMgr::getGcvsMaxMagnitude(s->hip);
const float magFlag = StarMgr::getGCVSMagnitudeFlag(s->hip); const float magFlag = StarMgr::getGcvsMagnitudeFlag(s->hip);
const float minVMag = StarMgr::getGCVSMinMagnitude(s->hip); const float minVMag = StarMgr::getGcvsMinMagnitude(s->hip);
const float min2VMag = StarMgr::getGCVSMinMagnitude(s->hip, false); const float min2VMag = StarMgr::getGcvsMinMagnitude(s->hip, false);
const QString photoVSys = StarMgr::getGCVSPhotometricSystem(s->hip); const QString photoVSys = StarMgr::getGcvsPhotometricSystem(s->hip);
const double vEpoch = StarMgr::getGCVSEpoch(s->hip); const double vEpoch = StarMgr::getGcvsEpoch(s->hip);
const double vPeriod = StarMgr::getGCVSPeriod(s->hip); const double vPeriod = StarMgr::getGcvsPeriod(s->hip);
const int vMm = StarMgr::getGCVSMM(s->hip); const int vMm = StarMgr::getGcvsMM(s->hip);
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);
const QString addSciName = StarMgr::getSciAdditionalName(s-> hip); const QString addSciName = StarMgr::getSciAdditionalName(s-> hip);
const QString varSciName = StarMgr::getGCVSName(s->hip); const QString varSciName = StarMgr::getGcvsName(s->hip);
bool nameWasEmpty=true; bool nameWasEmpty=true;
if (flags&Name) if (flags&Name)
{ {
if (commonNameI18!="" || sciName!="" || addSciName!= "" || varSciName!="") if (commonNameI18!="" || sciName!="" || addSciName!= "" || varSciName!="")
{ {
oss << commonNameI18 << (commonNameI18 == "" ? "" : " "); oss << commonNameI18 << (commonNameI18 == "" ? "" : " ");
if (commonNameI18!="" && sciName!="") if (commonNameI18!="" && (sciName!="" || var SciName!=""))
oss << "("; oss << "(";
oss << (sciName=="" ? "" : sciName); oss << (sciName=="" ? "" : sciName);
oss << (addSciName=="" ? "" : QString(" - %1 ").arg(addSciName)); oss << (addSciName=="" ? "" : QString(" - %1 ").arg(addSciName));
if (varSciName!="" && varSciName!=sciName) if (varSciName!="" && varSciName!=sciName)
oss << (sciName=="" ? "" : " - ") << varSciName; oss << (sciName=="" ? "" : " - ") << varSciName;
if (commonNameI18!="" && sciName!="") if (commonNameI18!="" && (sciName!="" || var SciName!=""))
oss << ")"; 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->hip; oss << "HIP " << s->hip;
if (s->componentIds) if (s->componentIds)
 End of changes. 4 change blocks. 
12 lines changed or deleted 12 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/