Satellites.cpp   Satellites.cpp 
skipping to change at line 466 skipping to change at line 466
result.sort(); result.sort();
if (result.size()>maxNbItem) result.erase(result.begin()+maxNbItem, result.end()); if (result.size()>maxNbItem) result.erase(result.begin()+maxNbItem, result.end());
return result; return result;
} }
QStringList Satellites::listAllObjects(bool inEnglish) const QStringList Satellites::listAllObjects(bool inEnglish) const
{ {
QStringList result; QStringList result;
if (!hintFader || StelApp::getInstance().getCore()->getCurrentLocati
on().planetName != earth->getEnglishName() || !isValidRangeDates())
return result;
if (inEnglish) if (inEnglish)
{ {
foreach(const SatelliteP& sat, satellites) foreach(const SatelliteP& sat, satellites)
{ {
result << sat->getEnglishName(); result << sat->getEnglishName();
} }
} }
else else
{ {
foreach(const SatelliteP& sat, satellites) foreach(const SatelliteP& sat, satellites)
skipping to change at line 1420 skipping to change at line 1423
} }
else else
{ {
if (autoRemoveEnabled) if (autoRemoveEnabled)
toBeRemoved.append(sat->id); toBeRemoved.append(sat->id);
else else
qWarning() << "Satellites:" << sat->id << sa t->name qWarning() << "Satellites:" << sat->id << sa t->name
<< "is missing in the update list s."; << "is missing in the update list s.";
missingCount++; missingCount++;
} }
// All satellites, who has invalid orbit should be removed.
if (!sat->orbitValid)
{
toBeRemoved.append(sat->id);
qWarning() << "Satellite" << sat->id << sat->name
<< "has invalid orbit and will be removed
.";
missingCount++;
}
} }
// Only those not in the loaded collection have remained // Only those not in the loaded collection have remained
// (autoAddEnabled is not checked, because it's already in the flags ) // (autoAddEnabled is not checked, because it's already in the flags )
QHash<QString, TleData>::const_iterator i; QHash<QString, TleData>::const_iterator i;
for (i = newTleSets.begin(); i != newTleSets.end(); ++i) for (i = newTleSets.begin(); i != newTleSets.end(); ++i)
{ {
if (i.value().addThis) if (i.value().addThis)
{ {
// Add the satellite... // Add the satellite...
 End of changes. 2 change blocks. 
0 lines changed or deleted 13 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/