StarWrapper.cpp   StarWrapper.cpp 
skipping to change at line 147 skipping to change at line 147
if (flags&Name) if (flags&Name)
{ {
if (!commonNameI18.isEmpty()) if (!commonNameI18.isEmpty())
oss << commonNameI18; oss << commonNameI18;
if (!additionalNameI18.isEmpty()) if (!additionalNameI18.isEmpty())
oss << " (" << additionalNameI18 << ")"; 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>";
} }
bool ebsFlag = false; bool ebsFlag = false;
skipping to change at line 201 skipping to change at line 201
oss << q_("Type: <b>%1</b>").arg(varstartype ); oss << q_("Type: <b>%1</b>").arg(varstartype );
oss << " (" << varType << ")<br />"; oss << " (" << varType << ")<br />";
} else } else
oss << q_("Type: <b>%1</b>").arg(startype) << "<br / >"; oss << q_("Type: <b>%1</b>").arg(startype) << "<br / >";
} }
if (flags&Magnitude) if (flags&Magnitude)
{ {
if (core->getSkyDrawer()->getFlagHasAtmosphere()) if (core->getSkyDrawer()->getFlagHasAtmosphere())
oss << q_("Magnitude: <b>%1</b> (after extinction: < oss << q_("Magnitude: <b>%1</b> (after extinction: <
b>%2</b>)").arg(QString::number(getVMagnitude(core), 'f', 2)) b>%2</b>)").arg(QString::number(getVMagnitude(core), 'f', 2)).arg(QString::
.arg(QString::number(getVMagnitudeWithExt number(getVMagnitudeWithExtinction(core), 'f', 2)) << "<br />";
inction(core), 'f', 2)) << "<br>";
else else
oss << q_("Magnitude: <b>%1</b>").arg(QString::numbe r(getVMagnitude(core), 'f', 2)) << "<br>"; oss << q_("Magnitude: <b>%1</b>").arg(QString::numbe r(getVMagnitude(core), 'f', 2)) << "<br />";
} }
if ((flags&AbsoluteMagnitude) && s->getPlx ()&& !isNan(s->getPlx()) && !isInf(s->getPlx())) if ((flags&AbsoluteMagnitude) && s->getPlx ()&& !isNan(s->getPlx()) && !isInf(s->getPlx()))
oss << q_("Absolute Magnitude: %1").arg(getVMagnitude(core)+ 5.*(1.+std::log10(0.00001*s->getPlx())), 0, 'f', 2) << "<br>"; oss << q_("Absolute Magnitude: %1").arg(getVMagnitude(core)+ 5.*(1.+std::log10(0.00001*s->getPlx())), 0, 'f', 2) << "<br />";
if (flags&Extra) if (flags&Extra)
{ {
oss << q_("Color Index (B-V): <b>%1</b>").arg(QString::numbe oss << q_("Color Index (B-V): <b>%1</b>").arg(QString::numbe
r(s->getBV(), 'f', 2)) << "<br>"; r(s->getBV(), 'f', 2)) << "<br />";
}
if (flags&Extra)
{
if (!varType.isEmpty()) if (!varType.isEmpty())
{ {
float minimumM1 = minVMag; float minimumM1 = minVMag;
float minimumM2 = min2VMag; float minimumM2 = min2VMag;
if (magFlag==1) // Amplitude if (magFlag==1) // Amplitude
{ {
minimumM1 += maxVMag; minimumM1 += maxVMag;
minimumM2 += maxVMag; minimumM2 += maxVMag;
} }
skipping to change at line 242 skipping to change at line 238
oss << q_("Magnitude range: <b>%1</b >%2<b>%3/%4</b> (Photometric system: %5)").arg(QString::number(maxVMag, 'f' , 2)).arg(QChar(0x00F7)).arg(QString::number(minimumM1, 'f', 2)).arg(QStrin g::number(minimumM2, 'f', 2)).arg(photoVSys) << "<br />"; oss << q_("Magnitude range: <b>%1</b >%2<b>%3/%4</b> (Photometric system: %5)").arg(QString::number(maxVMag, 'f' , 2)).arg(QChar(0x00F7)).arg(QString::number(minimumM1, 'f', 2)).arg(QStrin g::number(minimumM2, 'f', 2)).arg(photoVSys) << "<br />";
} }
} }
} }
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
if ((flags&Distance) && s->getPlx ()&& !isNan(s->getPlx()) && !isInf (s->getPlx())) if ((flags&Distance) && s->getPlx ()&& !isNan(s->getPlx()) && !isInf (s->getPlx()))
{ {
//TRANSLATORS: Unit of measure for distance - Light Years //TRANSLATORS: Unit of measure for distance - Light Years
oss << q_("Distance: %1 ly").arg((AU/(SPEED_OF_LIGHT*86400*3 65.25)) / (s->getPlx()*((0.00001/3600)*(M_PI/180))), 0, 'f', 2) << "<br>"; oss << q_("Distance: %1 ly").arg((AU/(SPEED_OF_LIGHT*86400*3 65.25)) / (s->getPlx()*((0.00001/3600)*(M_PI/180))), 0, 'f', 2) << "<br />" ;
} }
if (flags&Extra) if (flags&Extra)
{ {
if (s->getSpInt()) if (s->getSpInt())
oss << q_("Spectral Type: %1").arg(StarMgr::convertT oSpectralType(s->getSpInt())) << "<br />"; oss << q_("Spectral Type: %1").arg(StarMgr::convertT oSpectralType(s->getSpInt())) << "<br />";
if (s->getPlx()) if (s->getPlx())
oss << q_("Parallax: %1\"").arg(0.00001*s->getPlx(), 0, 'f', 5) << "<br />"; oss << q_("Parallax: %1\"").arg(0.00001*s->getPlx(), 0, 'f', 5) << "<br />";
skipping to change at line 288 skipping to change at line 284
{ {
oss << QString("%1 (%4): %2%3").arg(q_("Position ang le")).arg(QString::number(wdsPA, 'f', 2)).arg(QChar(0x00B0)).arg(wdsObs) << "<br />"; oss << QString("%1 (%4): %2%3").arg(q_("Position ang le")).arg(QString::number(wdsPA, 'f', 2)).arg(QChar(0x00B0)).arg(wdsObs) << "<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 (%4): %2\" (%3)") .arg(q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(StelUtils:: decDegToDmsStr(wdsSep/3600.f)).arg(wdsObs) << "<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 (%3): %2\"").arg( q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(wdsObs) << "<br />"; oss << QString("%1 (%3): %2\"").arg( q_("Separation")).arg(QString::number(wdsSep, 'f', 3)).arg(wdsObs) << "<br />";
} }
} }
float dx = 0.1*s->getDx0();
float dy = 0.1*s->getDx1();
float pa = 90.f - std::atan2(dy, dx)*180.f/M_PI;
if (pa<0)
pa += 360.f;
oss << QString("%1: %2 %3 (%4)").arg(q_("Proper motions by a
xes")).arg(QString::number(dx, 'f', 1)).arg(QString::number(dy, 'f', 1)).ar
g(qc_("mas/yr", "milliarc second per year")) << "<br />";
oss << QString("%1: %2%3").arg(q_("Position angle of the pro
per motion")).arg(QString::number(pa,'f', 1)).arg(QChar(0x00B0)) << "<br />
";
oss << QString("%1: %2 (%3)").arg(q_("Angular speed of the p
roper motion")).arg(QString::number(std::sqrt(dx*dx + dy*dy), 'f', 1)).arg(
qc_("mas/yr", "milliarc second per year")) << "<br />";
} }
StelObject::postProcessInfoString(str, flags); StelObject::postProcessInfoString(str, flags);
return str; return str;
} }
QVariantMap StarWrapper1::getInfoMap(const StelCore *core) const QVariantMap StarWrapper1::getInfoMap(const StelCore *core) const
{ {
QVariantMap map = StelObject::getInfoMap(core); QVariantMap map = StelObject::getInfoMap(core);
 End of changes. 8 change blocks. 
13 lines changed or deleted 25 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/