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

Ref T773, style

Browse Source
This commit is contained in:
Klaus Basan
2020-02-11 00:07:00 +01:00
committed by Mat Sutcliffe
parent f4f34341e6
commit 5f1bd14fcf
8 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -1048,7 +1048,7 @@ namespace BlackMisc
bool CAircraftSituation::canLikelySkipNearGroundInterpolation() const
{
// those we can exclude
// those we can exclude, we are ON GROUND
if (this->isOnGround() && this->hasInboundGroundDetails()) { return false; }
// cases where we can skip

25
src/blackmisc/simulation/interpolator.cpp
View File

@@ -37,9 +37,10 @@ namespace BlackMisc
{
template <typename Derived>
CInterpolator<Derived>::CInterpolator(const CCallsign &callsign,
ISimulationEnvironmentProvider *simEnvProvider, IInterpolationSetupProvider *setupProvider,
ISimulationEnvironmentProvider *simEnvProvider,
IInterpolationSetupProvider *setupProvider,
IRemoteAircraftProvider *remoteProvider,
CInterpolationLogger *logger) : m_callsign(callsign)
CInterpolationLogger *logger) : m_callsign(callsign)
{
// normally when created m_cg is still null since there is no CG in the provider yet
@@ -105,7 +106,7 @@ namespace BlackMisc
{
const CLength addValue = os * -1.0; // positive values means too high, negative values too low
int changed = validSituations.addAltitudeOffset(addValue);
Q_UNUSED(changed);
Q_UNUSED(changed)
}
}
else
@@ -318,13 +319,13 @@ namespace BlackMisc
if (this->doLogging())
{
log.tsCurrent = m_currentTimeMsSinceEpoch;
log.callsign = m_callsign;
log.groundFactor = currentSituation.getOnGroundFactor();
log.altCorrection = CAircraftSituation::altitudeCorrectionToString(altCorrection);
log.situationCurrent = currentSituation;
log.callsign = m_callsign;
log.groundFactor = currentSituation.getOnGroundFactor();
log.altCorrection = CAircraftSituation::altitudeCorrectionToString(altCorrection);
log.situationCurrent = currentSituation;
log.interpolantRecalc = interpolant.isRecalculated();
log.change = m_pastSituationsChange;
log.usedSetup = m_currentSetup;
log.change = m_pastSituationsChange;
log.usedSetup = m_currentSetup;
log.elevationInfo = this->getElevationsFoundMissedInfo();
log.cgAboveGround = currentSituation.getCG();
log.sceneryOffset = m_currentSceneryOffset;
@@ -573,7 +574,7 @@ namespace BlackMisc
// preset elevation here, as we do not know where the situation will be after the interpolation step!
const bool preset = currentSituation.presetGroundElevation(oldSituation, newSituation, m_pastSituationsChange);
Q_UNUSED(preset);
Q_UNUSED(preset)
// fetch CG once
const CLength cg(this->getModelCG());
@@ -656,8 +657,8 @@ namespace BlackMisc
{
m_extraInfo.clear();
m_isValidSituation = false;
m_isInterpolated = false;
m_isSameSituation = false;
m_isInterpolated = false;
m_isSameSituation = false;
m_situations = -1;
}

8
src/blackmisc/simulation/interpolator.h
View File

@@ -167,14 +167,14 @@ namespace BlackMisc
//! Implicit conversion @{
operator const Aviation::CAircraftSituation &() const { return m_interpolatedSituation; }
operator const Aviation::CAircraftParts &() const { return m_interpolatedParts; }
operator const Aviation::CAircraftParts &() const { return m_interpolatedParts; }
//! @}
private:
Aviation::CAircraftSituation m_interpolatedSituation; //!< interpolated situation
Aviation::CAircraftParts m_interpolatedParts; //!< guessed or interpolated parts
CInterpolationStatus m_interpolationStatus; //!< interpolation status
CPartsStatus m_partsStatus; //!< parts status
Aviation::CAircraftParts m_interpolatedParts; //!< guessed or interpolated parts
CInterpolationStatus m_interpolationStatus; //!< interpolation status
CPartsStatus m_partsStatus; //!< parts status
};
//! Interpolator, calculation inbetween positions