StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 279 skipping to change at line 279
if (vMm>0) if (vMm>0)
{ {
if (ebsFlag) if (ebsFlag)
oss << q_("Duration of eclipse: %1%").arg(vM m) << "<br />"; oss << q_("Duration of eclipse: %1%").arg(vM m) << "<br />";
else else
oss << q_("Rising time: %1%").arg(vMm) << "< br />"; oss << q_("Rising time: %1%").arg(vMm) << "< br />";
} }
if (wdsObs>0) if (wdsObs>0)
{ {
oss << QString("%1: %2").arg(q_("Year of last satisf oss << QString("%1 (%4): %2%3").arg(q_("Position ang
actory observation")).arg(wdsObs) << "<br />"; le")).arg(QString::number(wdsPA, 'f', 2)).arg(QChar(0x00B0)).arg(wdsObs) <<
oss << QString("%1: %2%3").arg(q_("Position angle")) "<br />";
.arg(QString::number(wdsPA, 'f', 2)).arg(QChar(0x00B0)) << "<br />";
if (wdsSep>0.f) // A spectroscopic binary or not? if (wdsSep>0.f) // A spectroscopic binary or not?
{ {
if (wdsSep>60.f) // A wide binary star? if (wdsSep>60.f) // A wide binary star?
oss << QString("%1: %2\" (%3)").arg( q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(StelUtils::decDe gToDmsStr(wdsSep/3600.f)) << "<br />"; oss << QString("%1 (%4): %2\" (%3)") .arg(q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(StelUtils:: decDegToDmsStr(wdsSep/3600.f)).arg(wdsObs) << "<br />";
else else
oss << QString("%1: %2\"").arg(q_("S eparation")).arg(QString::number(wdsSep, 'f', 3)) << "<br />"; oss << QString("%1 (%3): %2\"").arg( q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(wdsObs) << "<br />";
} }
} }
} }
StelObject::postProcessInfoString(str, flags); StelObject::postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap StarWrapper1::getInfoMap(const StelCore *core) const
{
QVariantMap map = StelObject::getInfoMap(core);
const QString varType = StarMgr::getGcvsVariabilityType(s->getHip())
;
const int wdsObs = StarMgr::getWdsLastObservation(s->getHip());
const float wdsPA = StarMgr::getWdsLastPositionAngle(s->getHip());
const float wdsSep = StarMgr::getWdsLastSeparation(s->getHip());
const double vPeriod = StarMgr::getGcvsPeriod(s->getHip());
QString varstartype = "no";
QString startype = "star";
if(!varType.isEmpty())
{
if (QString("FU GCAS I IA IB IN INA INB INT IT IN(YY) IS ISA
ISB RCB RS SDOR UV UVN WR").contains(varType))
varstartype = "eruptive";
else if (QString("ACYG BCEP BCEPS CEP CEP(B) CW CWA CWB DCEP
DCEPS DSCT DSCTC GDOR L LB LC M PVTEL RPHS RR RR(B) RRAB RRC RV RVA RVB SR
SRA SRB SRC SRD SXPHE ZZ ZZA ZZB").contains(varType))
varstartype = "pulsating";
else if (QString("ACV, ACVO, BY, ELL, FKCOM, PSR, SXARI").co
ntains(varType))
varstartype = "rotating";
else if (QString("N NA NB NC NL NR SN SNI SNII UG UGSS UGSU
UGZ ZAND").contains(varType))
varstartype = "cataclysmic";
else if (QString("E EA EB EW GS PN RS WD WR AR D DM DS DW K
KE KW SD E: E:/WR E/D E+LPB: EA/D EA/D+BY EA/RS EA/SD EA/SD: EA/GS EA/GS+SR
C EA/DM EA/WR EA+LPB EA+LPB: EA+DSCT EA+BCEP: EA+ZAND EA+ACYG EA+SRD EB/GS
EB/DM EB/KE EB/KE: EW/KE EA/AR/RS EA/GS/D EA/D/WR").contains(varType))
{
varstartype = "eclipsing-binary";
}
else
varstartype = "variable";
}
map.insert("variable-star", varstartype);
if (s->getComponentIds() || wdsObs>0)
startype = "double-star";
map.insert("star-type", startype);
map.insert("bV", s->getBV());
if (s->getPlx ()&& !isNan(s->getPlx()) && !isInf(s->getPlx()))
{
map.insert("parallax", 0.00001*s->getPlx());
map.insert("absolute-mag", getVMagnitude(core)+5.*(1.+std::l
og10(0.00001*s->getPlx())));
map.insert("distance-ly", (AU/(SPEED_OF_LIGHT*86400*365.25))
/ (s->getPlx()*((0.00001/3600)*(M_PI/180))));
}
if (s->getSpInt())
map.insert("spectral-class", StarMgr::convertToSpectralType(
s->getSpInt()));
if (vPeriod>0)
map.insert("period", vPeriod);
if (wdsObs>0)
{
map.insert("wds-year", wdsObs);
map.insert("wds-position-angle", wdsPA);
map.insert("wds-separation", wdsSep);
}
return map;
}
StelObjectP Star1::createStelObject(const SpecialZoneArray<Star1> *a, StelObjectP Star1::createStelObject(const SpecialZoneArray<Star1> *a,
cons t SpecialZoneData<Star1> *z) const { cons t SpecialZoneData<Star1> *z) const {
return StelObjectP(new StarWrapper1(a,z,this), true); return StelObjectP(new StarWrapper1(a,z,this), true);
} }
StelObjectP Star2::createStelObject(const SpecialZoneArray<Star2> *a, StelObjectP Star2::createStelObject(const SpecialZoneArray<Star2> *a,
cons t SpecialZoneData<Star2> *z) const { cons t SpecialZoneData<Star2> *z) const {
return StelObjectP(new StarWrapper2(a,z,this), true); return StelObjectP(new StarWrapper2(a,z,this), true);
} }
 End of changes. 4 change blocks. 
6 lines changed or deleted 78 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/