MeteorShower.cpp   MeteorShower.cpp 
skipping to change at line 275 skipping to change at line 275
// step through and update all active meteors // step through and update all active meteors
foreach (MeteorObj* m, m_activeMeteors) foreach (MeteorObj* m, m_activeMeteors)
{ {
if (!m->update(deltaTime)) if (!m->update(deltaTime))
{ {
m_activeMeteors.removeOne(m); m_activeMeteors.removeOne(m);
} }
} }
// going forward or backward ? // paused | forward | backward ?
// don't create new meteors // don't create new meteors
if(!core->getRealTimeSpeed()) if(!core->getRealTimeSpeed())
{ {
return; return;
} }
// calculates a ZHR for the current date // calculates a ZHR for the current date
int currentZHR = calculateZHR(currentJD); int currentZHR = calculateZHR(currentJD);
if (currentZHR < 1) if (currentZHR < 1)
{ {
skipping to change at line 515 skipping to change at line 515
QString MeteorShower::getInfoString(const StelCore* core, const InfoStringG roup& flags) const QString MeteorShower::getInfoString(const StelCore* core, const InfoStringG roup& flags) const
{ {
if (!enabled()) if (!enabled())
{ {
GETSTELMODULE(StelObjectMgr)->unSelect(); GETSTELMODULE(StelObjectMgr)->unSelect();
return ""; return "";
} }
QString str; QString str;
QTextStream oss(&str); QTextStream oss(&str);
bool withDecimalDegree = StelApp::getInstance().getFlagShowDecimalDe grees();
QString mstdata; QString mstdata;
if (m_status == ACTIVE_GENERIC) if (m_status == ACTIVE_GENERIC)
{ {
mstdata = q_("generic data"); mstdata = q_("generic data");
} }
else if (m_status == ACTIVE_CONFIRMED) else if (m_status == ACTIVE_CONFIRMED)
{ {
mstdata = q_("confirmed data"); mstdata = q_("confirmed data");
} }
skipping to change at line 553 skipping to change at line 554
if(flags&Extra) if(flags&Extra)
{ {
oss << q_("Type: <b>%1</b> (%2)").arg(q_("meteor shower"), m stdata) << "<br />"; oss << q_("Type: <b>%1</b> (%2)").arg(q_("meteor shower"), m stdata) << "<br />";
} }
// Ra/Dec etc. // Ra/Dec etc.
oss << getPositionInfoString(core, flags); oss << getPositionInfoString(core, flags);
if(flags&Extra) if(flags&Extra)
{ {
QString sDriftRA = StelUtils::radToHmsStr(m_driftAlpha);
QString sDriftDE = StelUtils::radToDmsStr(m_driftDelta);
if (withDecimalDegree)
{
sDriftRA = StelUtils::radToDecDegStr(m_driftAlpha,4,
false,true);
sDriftDE = StelUtils::radToDecDegStr(m_driftDelta,4,
false,true);
}
oss << QString("%1: %2/%3") oss << QString("%1: %2/%3")
.arg(q_("Radiant drift (per day)")) .arg(q_("Radiant drift (per day)"))
.arg(StelUtils::radToHmsStr(m_driftAlpha)) .arg(sDriftRA)
.arg(StelUtils::radToDmsStr(m_driftDelta)); .arg(sDriftDE);
oss << "<br />"; oss << "<br />";
if (m_speed > 0) if (m_speed > 0)
{ {
oss << q_("Geocentric meteoric velocity: %1 km/s").a rg(m_speed) << "<br />"; oss << q_("Geocentric meteoric velocity: %1 km/s").a rg(m_speed) << "<br />";
} }
if(m_pidx > 0) if(m_pidx > 0)
{ {
oss << q_("The population index: %1").arg(m_pidx) << "<br />"; oss << q_("The population index: %1").arg(m_pidx) << "<br />";
skipping to change at line 595 skipping to change at line 604
else else
{ {
oss << QString("%1: %2 - %3") oss << QString("%1: %2 - %3")
.arg(q_("Activity")) .arg(q_("Activity"))
.arg(m_activity.start.toString("d MMM M")) .arg(m_activity.start.toString("d MMM M"))
.arg(m_activity.finish.toString("d MM MM")); .arg(m_activity.finish.toString("d MM MM"));
} }
oss << "<br />"; oss << "<br />";
oss << q_("Maximum: %1").arg(m_activity.peak.toStrin g("d MMMM")); oss << q_("Maximum: %1").arg(m_activity.peak.toStrin g("d MMMM"));
oss << QString(" (%1 %2&deg;)").arg(q_("Solar longit oss << QString(" (%1 %2&deg;)")
ude")) .arg(q_("Solar longitude"))
.arg(getSolarLongitude(m_activity.peak)); .arg(getSolarLongitude(m_activity.peak));
oss << "<br />"; oss << "<br />";
if(m_activity.zhr > 0) if(m_activity.zhr > 0)
{ {
oss << QString("ZHR<sub>max</sub>: %1").arg( m_activity.zhr) << "<br />"; oss << QString("ZHR<sub>max</sub>: %1").arg( m_activity.zhr) << "<br />";
} }
else else
{ {
oss << QString("ZHR<sub>max</sub>: %1").arg( q_("variable")); oss << QString("ZHR<sub>max</sub>: %1").arg( q_("variable"));
 End of changes. 5 change blocks. 
5 lines changed or deleted 16 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/