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

Ref T261, logger support for situation change

Browse Source
This commit is contained in:
Klaus Basan
2018-04-27 03:16:25 +02:00
committed by Roland Winklmeier
parent adeea182da
commit 46f509c367
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/blackmisc/simulation/interpolationlogger.cpp
View File

@@ -408,24 +408,26 @@ namespace BlackMisc
const CAircraftSituation situationOldInterpolation = this->oldestInterpolationSituation();
const CAircraftSituation situationNewInterpolation = this->newestInterpolationSituation();
return QStringLiteral("CS: ") % callsign.asString() % separator %
QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) %
QStringLiteral(" | type: ") % this->interpolationType() %
QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) %
QStringLiteral(" | CG: ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) %
QStringLiteral(" | alt.cor.: ") % altCorrection %
QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) %
(
return (
withSetup ?
separator % QStringLiteral("setup: ") % usedSetup.toQString(true) :
QStringLiteral("setup: ") % usedSetup.toQString(true) % separator :
QStringLiteral("")
) %
(
withElevation ?
separator %
QStringLiteral("Elev info.: ") % elevationInfo :
QStringLiteral("Elev info.: ") % elevationInfo % separator :
QStringLiteral("")
) %
QStringLiteral("change: ") % change.toQString(true) %
separator %
QStringLiteral("Interpolation CS: ") % callsign.asString() % separator %
QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) %
QStringLiteral(" | type: ") % this->interpolationType() %
QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) %
QStringLiteral(" | CG: ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::m(), 1) %
QStringLiteral(" ") % cgAboveGround.valueRoundedWithUnit(CLengthUnit::ft(), 1) %
QStringLiteral(" | alt.cor.: ") % altCorrection %
QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) %
(
withDeltaTimes ?
separator %
@@ -442,7 +444,7 @@ namespace BlackMisc
(
withCurrentSituation ?
separator %
QStringLiteral("sit.: ") % situationCurrent.toQString(true) :
QStringLiteral("cur.sit.(interpolated): ") % situationCurrent.toQString(true) :
QStringLiteral("")
) %
(

3
src/blackmisc/simulation/interpolationlogger.h
View File

@@ -14,9 +14,9 @@
#include "interpolationrenderingsetup.h"
#include "blackmisc/simulation/remoteaircraftprovider.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/aviation/aircraftsituationlist.h"
#include "blackmisc/aviation/aircraftpartslist.h"
#include "blackmisc/aviation/aircraftsituationchange.h"
#include "blackmisc/logcategorylist.h"
#include <QObject>
#include <QStringList>
@@ -45,6 +45,7 @@ namespace BlackMisc
Aviation::CAircraftParts parts; //!< corresponding parts used in interpolator
Aviation::CAircraftSituationList interpolationSituations; //!< the interpolator uses 2, 3 situations (oldest at end)
Aviation::CAircraftSituation situationCurrent; //!< interpolated situation
Aviation::CAircraftSituationChange change; //!< change
PhysicalQuantities::CLength cgAboveGround; //!< center of gravity
CInterpolationAndRenderingSetupPerCallsign usedSetup; //!< used setup