StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 109 skipping to change at line 109
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),
QString::num ber(s->getBV(), 'f', 2)) << "<br>"; QString::number(s->getBV(), 'f', 2)) << "<br>";
if ((flags&AbsoluteMagnitude) && s->plx && !isNan(s->plx) && !isInf( s->plx)) if ((flags&AbsoluteMagnitude) && s->plx && !isNan(s->plx) && !isInf( s->plx))
oss << q_("Absolute Magnitude: %1").arg(getVMagnitude(nav)+5 .*(1.+std::log10(0.00001*s->plx)), 0, 'f', 2) << "<br>"; oss << q_("Absolute Magnitude: %1").arg(getVMagnitude(nav)+5 .*(1.+std::log10(0.00001*s->plx)), 0, 'f', 2) << "<br>";
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
if (s->spInt && flags&Extra1) if (s->spInt && flags&Extra1)
{ {
oss << q_("Spectral Type: %1").arg(StarMgr::convertToSpectra lType(s->spInt)) << "<br>"; oss << q_("Spectral Type: %1").arg(StarMgr::convertToSpectra lType(s->spInt)) << "<br>";
} }
skipping to change at line 133 skipping to change at line 133
if (s->plx && flags&Extra2) if (s->plx && flags&Extra2)
oss << q_("Parallax: %1\"").arg(0.00001*s->plx, 0, 'f', 5) < < "<br>"; oss << q_("Parallax: %1\"").arg(0.00001*s->plx, 0, 'f', 5) < < "<br>";
StelObject::postProcessInfoString(str, flags); StelObject::postProcessInfoString(str, flags);
return str; return str;
} }
StelObjectP Star1::createStelObject(const SpecialZoneArray<Star1> *a, StelObjectP Star1::createStelObject(const SpecialZoneArray<Star1> *a,
const SpecialZoneData<Star1> *z) const cons
{ t SpecialZoneData<Star1> *z) const {
return StelObjectP(new StarWrapper1(a,z,this)); return StelObjectP(new StarWrapper1(a,z,this), true);
} }
StelObjectP Star2::createStelObject(const SpecialZoneArray<Star2> *a, StelObjectP Star2::createStelObject(const SpecialZoneArray<Star2> *a,
const SpecialZoneData<Star2> *z) const cons
{ t SpecialZoneData<Star2> *z) const {
return StelObjectP(new StarWrapper2(a,z,this)); return StelObjectP(new StarWrapper2(a,z,this), true);
} }
StelObjectP Star3::createStelObject(const SpecialZoneArray<Star3> *a, StelObjectP Star3::createStelObject(const SpecialZoneArray<Star3> *a,
const SpecialZoneData<Star3> *z) const cons
{ t SpecialZoneData<Star3> *z) const {
return StelObjectP(new StarWrapper3(a,z,this)); return StelObjectP(new StarWrapper3(a,z,this), true);
} }
} // namespace BigStarCatalogExtension } // namespace BigStarCatalogExtension
 End of changes. 4 change blocks. 
10 lines changed or deleted 10 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/