flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T322, renamings

Browse Source
This commit is contained in:
Klaus Basan
2018-09-03 13:37:01 +02:00
committed by Roland Winklmeier
parent 09ab653cf9
commit b4e17ed091
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/airspacemonitor.cpp
View File

@@ -263,7 +263,7 @@ namespace BlackCore
CAtcStation station;
CAtcStationList stations = m_atcStationsOnline.findIfComUnitTunedIn25KHz(comSystem);
if (stations.isEmpty()) { return station; }
stations.sortByDistanceToOwnAircraft();
stations.sortByDistanceToReferencePosition();
return stations.front();
}

6
src/blackmisc/geo/geoobjectlist.cpp
View File

@@ -221,13 +221,13 @@ namespace BlackMisc
}
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(); });
}
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(); });
}
@@ -238,7 +238,7 @@ namespace BlackMisc
if (number < 1) { return CONTAINER(); }
if (this->container().size() >= number) { return (this->container()); }
CONTAINER closest(this->container());
closest.partiallySortByDistanceToOwnAircraft(number);
closest.partiallySortByDistanceToReferencePosition(number);
Q_ASSERT_X(closest.size() <= number, Q_FUNC_INFO, "size exceeded");
return closest;
}

7
src/blackmisc/geo/geoobjectlist.h
View File

@@ -127,11 +127,12 @@ namespace BlackMisc
//! Calculate distances, then sort by range
void sortByRange(const ICoordinateGeodetic &position, bool updateValues);
//! If distance is already set, just sort
void sortByDistanceToOwnAircraft();
//! If distance is already set, just sort container
//! \remark requires calculcateAndUpdateRelativeDistanceAndBearing
void sortByDistanceToReferencePosition();
//! Sort the first n closest objects
void partiallySortByDistanceToOwnAircraft(int number);
void partiallySortByDistanceToReferencePosition(int number);
//! Get n closest objects
CONTAINER getClosestObjects(int number) const;

2
src/blackmisc/simulation/airspaceaircraftsnapshot.cpp
View File

@@ -36,7 +36,7 @@ namespace BlackMisc
if (allAircraft.isEmpty()) { return; }
CSimulatedAircraftList aircraft(allAircraft);
aircraft.sortByDistanceToOwnAircraft();
aircraft.sortByDistanceToReferencePosition();
int numberAll = aircraft.size();
Q_ASSERT_X(numberAll == allAircraft.size(), Q_FUNC_INFO, "aircraft got lost");
CSimulatedAircraftList vtolAircraft(aircraft.findByVtol(true));

2
src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
View File

@@ -1547,7 +1547,7 @@ namespace BlackSimPlugin
m_airportsInRangeFromSimulator.replaceOrAddByIcao(consolidatedAirport);
if (m_airportsInRangeFromSimulator.size() > this->maxAirportsInRange())
{
m_airportsInRangeFromSimulator.sortByDistanceToOwnAircraft();
m_airportsInRangeFromSimulator.sortByDistanceToReferencePosition();
m_airportsInRangeFromSimulator.truncate(this->maxAirportsInRange());
}
}