flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 06:35:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T259, Ref T243 misc. smaller improvements of simulator environment provider

Browse Source
This commit is contained in:
Klaus Basan
2018-03-22 16:49:29 +01:00
parent 4ec3a76ed4
commit bb34beed26
2 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/blackmisc/simulation/simulationenvironmentprovider.cpp
View File

@@ -17,15 +17,20 @@ namespace BlackMisc
{
namespace Simulation
{
bool ISimulationEnvironmentProvider::rememberGroundElevation(const ICoordinateGeodetic &elevationCoordinate, const PhysicalQuantities::CLength &epsilon)
bool ISimulationEnvironmentProvider::rememberGroundElevation(const ICoordinateGeodetic &elevationCoordinate, const CLength &epsilon)
{
{
QReadLocker l(&m_lockElvCoordinates);
if (m_elvCoordinates.containsObjectInRange(elevationCoordinate, epsilon)) { return false; }
if (m_elvCoordinates.containsObjectInRange(elevationCoordinate, minRange(epsilon))) { return false; }
}
{
// we keep latest at fron
// * we assume we find them faster
// * and need the more frequently (the recent ones)
QWriteLocker l(&m_lockElvCoordinates);
m_elvCoordinates.push_back(elevationCoordinate);
if (m_elvCoordinates.size() > MaxElevations) { m_elvCoordinates.pop_back(); }
m_elvCoordinates.push_front(elevationCoordinate);
}
return true;
}
@@ -40,13 +45,14 @@ namespace BlackMisc
{
if (cs.isEmpty()) { return false; }
const bool remove = cg.isNull();
QWriteLocker l(&m_lockCG);
if (remove)
{
QWriteLocker l(&m_lockCG);
m_cgs.remove(cs);
}
else
{
QWriteLocker l(&m_lockCG);
m_cgs[cs] = cg;
}
return true;
@@ -58,6 +64,13 @@ namespace BlackMisc
return m_cgs.remove(cs);
}
CLength ISimulationEnvironmentProvider::minRange(const CLength &range)
{
return (range < CElevationPlane::singlePointRadius()) ?
CElevationPlane::singlePointRadius() :
range;
}
CCoordinateGeodeticList ISimulationEnvironmentProvider::getElevationCoordinates() const
{
QReadLocker l(&m_lockElvCoordinates);
@@ -72,15 +85,17 @@ namespace BlackMisc
coordinates.sortByEuclideanDistanceSquared(referenceCoordinate);
coordinates.truncate(maxNumber);
const int delta = size - coordinates.size();
QWriteLocker l(&m_lockElvCoordinates);
m_elvCoordinates = coordinates;
{
QWriteLocker l(&m_lockElvCoordinates);
m_elvCoordinates = coordinates;
}
return delta;
}
CElevationPlane ISimulationEnvironmentProvider::findClosestElevationWithinRange(const ICoordinateGeodetic &reference, const PhysicalQuantities::CLength &range) const
{
const CLength r = range < CElevationPlane::singlePointRadius() ? CElevationPlane::singlePointRadius() : range;
return this->getElevationCoordinates().findClosestWithinRange(reference, r);
const CCoordinateGeodetic coordinate = this->getElevationCoordinates().findClosestWithinRange(reference, minRange(range));
return CElevationPlane(coordinate, reference); // plane with radis = distnace to reference
}
CSimulatorPluginInfo ISimulationEnvironmentProvider::getSimulatorPluginInfo() const
@@ -109,10 +124,18 @@ namespace BlackMisc
bool ISimulationEnvironmentProvider::hasCG(const Aviation::CCallsign &callsign) const
{
if (callsign.isEmpty()) { return false; }
QReadLocker l(&m_lockCG);
return m_cgs.contains(callsign);
}
bool ISimulationEnvironmentProvider::hasSameCG(const CLength &cg, const CCallsign &callsign) const
{
if (callsign.isEmpty()) { return false; }
QReadLocker l(&m_lockCG);
return m_cgs[callsign] == cg;
}
ISimulationEnvironmentProvider::ISimulationEnvironmentProvider(const CSimulatorPluginInfo &pluginInfo) : m_simulatorPluginInfo(pluginInfo)
{ }