From 2eb7e602e353252bd61701fc427ea0c610cb4d7c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 3 Feb 2018 20:38:35 +0100 Subject: [PATCH] Inperolator log. improvements --- .../simulation/interpolationlogger.cpp | 20 +++++++++---------- .../simulation/interpolatorspline.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/blackmisc/simulation/interpolationlogger.cpp b/src/blackmisc/simulation/interpolationlogger.cpp index dac8d9b1f..12891bdec 100644 --- a/src/blackmisc/simulation/interpolationlogger.cpp +++ b/src/blackmisc/simulation/interpolationlogger.cpp @@ -415,9 +415,9 @@ namespace BlackMisc return QStringLiteral("CS: ") % callsign.asString() % separator % QStringLiteral("ts: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % - QStringLiteral(" type: ") % this->interpolationType() % - QStringLiteral(" gnd.fa.: ") % QString::number(groundFactor) % - QStringLiteral(" #nw.sit.: ") % QString::number(noNetworkSituations) % + QStringLiteral(" | type: ") % this->interpolationType() % + QStringLiteral(" | gnd.fa.: ") % QString::number(groundFactor) % + QStringLiteral(" | #nw.sit.: ") % QString::number(noNetworkSituations) % ( withHints ? separator % QStringLiteral("hints: ") % usedHints.toQString(true) : @@ -438,13 +438,13 @@ namespace BlackMisc withDeltaTimes ? separator % QStringLiteral("cur.time: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsCurrent) % - QStringLiteral(" int.time: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsInterpolated) % - QStringLiteral(" dt.cur.int.: ") % QString::number(deltaCurrentToInterpolatedTime()) % QStringLiteral("ms") % - QStringLiteral(" sample dt: ") % QString::number(deltaSampleTimesMs) % QStringLiteral("ms") % - QStringLiteral(" fr.[0-1]: ") % QString::number(simulationTimeFraction) % - QStringLiteral(" old int.pos.: ") % situationOldInterpolation.getTimestampAndOffset(true) % - QStringLiteral(" new int.pos.: ") % situationNewInterpolation.getTimestampAndOffset(true) % - QStringLiteral(" #int.pos.: ") % QString::number(interpolationSituations.size()) : + QStringLiteral(" | int.time: ") % CInterpolationLogger::msSinceEpochToTimeAndTimestamp(tsInterpolated) % + QStringLiteral(" | dt.cur.int.: ") % QString::number(deltaCurrentToInterpolatedTime()) % QStringLiteral("ms") % + QStringLiteral(" | sample dt: ") % QString::number(deltaSampleTimesMs) % QStringLiteral("ms") % + QStringLiteral(" | fr.[0-1]: ") % QString::number(simulationTimeFraction) % + QStringLiteral(" | old int.pos.: ") % situationOldInterpolation.getTimestampAndOffset(true) % + QStringLiteral(" | new int.pos.: ") % situationNewInterpolation.getTimestampAndOffset(true) % + QStringLiteral(" | #int.pos.: ") % QString::number(interpolationSituations.size()) : QStringLiteral("") ) % ( diff --git a/src/blackmisc/simulation/interpolatorspline.cpp b/src/blackmisc/simulation/interpolatorspline.cpp index 3ee7da5ab..879b89b27 100644 --- a/src/blackmisc/simulation/interpolatorspline.cpp +++ b/src/blackmisc/simulation/interpolatorspline.cpp @@ -198,7 +198,7 @@ namespace BlackMisc log.interpolator = 's'; log.deltaSampleTimesMs = dt2; log.simulationTimeFraction = timeFraction; - log.noNetworkSituations = m_aircraftSituations. size(); + log.noNetworkSituations = m_aircraftSituations.size(); log.tsInterpolated = interpolatedTime; // without offsets }