mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-16 02:06:08 +08:00
Ref T322, renamings
This commit is contained in:
committed by
Roland Winklmeier
parent
09ab653cf9
commit
b4e17ed091
@@ -263,7 +263,7 @@ namespace BlackCore
|
|||||||
CAtcStation station;
|
CAtcStation station;
|
||||||
CAtcStationList stations = m_atcStationsOnline.findIfComUnitTunedIn25KHz(comSystem);
|
CAtcStationList stations = m_atcStationsOnline.findIfComUnitTunedIn25KHz(comSystem);
|
||||||
if (stations.isEmpty()) { return station; }
|
if (stations.isEmpty()) { return station; }
|
||||||
stations.sortByDistanceToOwnAircraft();
|
stations.sortByDistanceToReferencePosition();
|
||||||
return stations.front();
|
return stations.front();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -221,13 +221,13 @@ namespace BlackMisc
|
|||||||
}
|
}
|
||||||
|
|
||||||
template <class OBJ, class CONTAINER>
|
template <class OBJ, class CONTAINER>
|
||||||
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::sortByDistanceToOwnAircraft()
|
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::sortByDistanceToReferencePosition()
|
||||||
{
|
{
|
||||||
this->container().sort([ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
|
this->container().sort([ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class OBJ, class CONTAINER>
|
template <class OBJ, class CONTAINER>
|
||||||
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::partiallySortByDistanceToOwnAircraft(int number)
|
void IGeoObjectWithRelativePositionList<OBJ, CONTAINER>::partiallySortByDistanceToReferencePosition(int number)
|
||||||
{
|
{
|
||||||
this->container().partiallySort(number, [ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
|
this->container().partiallySort(number, [ & ](const OBJ & a, const OBJ & b) { return a.getRelativeDistance() < b.getRelativeDistance(); });
|
||||||
}
|
}
|
||||||
@@ -238,7 +238,7 @@ namespace BlackMisc
|
|||||||
if (number < 1) { return CONTAINER(); }
|
if (number < 1) { return CONTAINER(); }
|
||||||
if (this->container().size() >= number) { return (this->container()); }
|
if (this->container().size() >= number) { return (this->container()); }
|
||||||
CONTAINER closest(this->container());
|
CONTAINER closest(this->container());
|
||||||
closest.partiallySortByDistanceToOwnAircraft(number);
|
closest.partiallySortByDistanceToReferencePosition(number);
|
||||||
Q_ASSERT_X(closest.size() <= number, Q_FUNC_INFO, "size exceeded");
|
Q_ASSERT_X(closest.size() <= number, Q_FUNC_INFO, "size exceeded");
|
||||||
return closest;
|
return closest;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,11 +127,12 @@ namespace BlackMisc
|
|||||||
//! Calculate distances, then sort by range
|
//! Calculate distances, then sort by range
|
||||||
void sortByRange(const ICoordinateGeodetic &position, bool updateValues);
|
void sortByRange(const ICoordinateGeodetic &position, bool updateValues);
|
||||||
|
|
||||||
//! If distance is already set, just sort
|
//! If distance is already set, just sort container
|
||||||
void sortByDistanceToOwnAircraft();
|
//! \remark requires calculcateAndUpdateRelativeDistanceAndBearing
|
||||||
|
void sortByDistanceToReferencePosition();
|
||||||
|
|
||||||
//! Sort the first n closest objects
|
//! Sort the first n closest objects
|
||||||
void partiallySortByDistanceToOwnAircraft(int number);
|
void partiallySortByDistanceToReferencePosition(int number);
|
||||||
|
|
||||||
//! Get n closest objects
|
//! Get n closest objects
|
||||||
CONTAINER getClosestObjects(int number) const;
|
CONTAINER getClosestObjects(int number) const;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace BlackMisc
|
|||||||
if (allAircraft.isEmpty()) { return; }
|
if (allAircraft.isEmpty()) { return; }
|
||||||
|
|
||||||
CSimulatedAircraftList aircraft(allAircraft);
|
CSimulatedAircraftList aircraft(allAircraft);
|
||||||
aircraft.sortByDistanceToOwnAircraft();
|
aircraft.sortByDistanceToReferencePosition();
|
||||||
int numberAll = aircraft.size();
|
int numberAll = aircraft.size();
|
||||||
Q_ASSERT_X(numberAll == allAircraft.size(), Q_FUNC_INFO, "aircraft got lost");
|
Q_ASSERT_X(numberAll == allAircraft.size(), Q_FUNC_INFO, "aircraft got lost");
|
||||||
CSimulatedAircraftList vtolAircraft(aircraft.findByVtol(true));
|
CSimulatedAircraftList vtolAircraft(aircraft.findByVtol(true));
|
||||||
|
|||||||
@@ -1547,7 +1547,7 @@ namespace BlackSimPlugin
|
|||||||
m_airportsInRangeFromSimulator.replaceOrAddByIcao(consolidatedAirport);
|
m_airportsInRangeFromSimulator.replaceOrAddByIcao(consolidatedAirport);
|
||||||
if (m_airportsInRangeFromSimulator.size() > this->maxAirportsInRange())
|
if (m_airportsInRangeFromSimulator.size() > this->maxAirportsInRange())
|
||||||
{
|
{
|
||||||
m_airportsInRangeFromSimulator.sortByDistanceToOwnAircraft();
|
m_airportsInRangeFromSimulator.sortByDistanceToReferencePosition();
|
||||||
m_airportsInRangeFromSimulator.truncate(this->maxAirportsInRange());
|
m_airportsInRangeFromSimulator.truncate(this->maxAirportsInRange());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user