diff --git a/src/Aircraft/flightrecorder.cxx b/src/Aircraft/flightrecorder.cxx
index 94a67a15a..9b477cf01 100644
--- a/src/Aircraft/flightrecorder.cxx
+++ b/src/Aircraft/flightrecorder.cxx
@@ -1,43 +1,28 @@
-// flightrecorder.cxx
-//
-// Written by Thorsten Brehm, started August 2011.
-//
-// Copyright (C) 2011 Thorsten Brehm - brehmt (at) gmail com
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
+/*
+ * SPDX-FileName: flightrecorder.cxx
+ * SPDX-FileCopyrightText: Copyright (C) 2011 Thorsten Brehm - brehmt (at) gmail com
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
#ifdef HAVE_CONFIG_H
-# include "config.h"
+#include "config.h"
#endif
+#include <assert.h>
#include <stdio.h>
#include <string.h>
-#include <assert.h>
+#include <Main/fg_props.hxx>
+#include <MultiPlayer/mpmessages.hxx>
+#include <MultiPlayer/multiplaymgr.hxx>
#include <simgear/debug/logstream.hxx>
-#include <simgear/props/props_io.hxx>
+#include <simgear/math/SGMath.hxx>
#include <simgear/misc/ResourceManager.hxx>
#include <simgear/misc/strutils.hxx>
+#include <simgear/props/props_io.hxx>
#include <simgear/structure/exception.hxx>
-#include <simgear/math/SGMath.hxx>
-#include <Main/fg_props.hxx>
+
#include "flightrecorder.hxx"
-#include <MultiPlayer/multiplaymgr.hxx>
-#include <MultiPlayer/mpmessages.hxx>
using namespace FlightRecorder;
using std::string;
@@ -75,20 +60,19 @@ static void s_AppendString(std::vector<char>& out, const std::string& s)
// We treat all property values as text.
//
static void s_RecordPropertyDiffs(
- std::vector<char>& out,
- SGPropertyNode* a,
- SGPropertyNode* b,
- const std::vector<const char*>* path_exclude_prefixes
- )
+ std::vector<char>& out,
+ SGPropertyNode* a,
+ SGPropertyNode* b,
+ const std::vector<const char*>* path_exclude_prefixes)
{
assert(a);
assert(b);
assert(a->getNameString() == b->getNameString());
assert(a->getPath() == b->getPath());
assert(a->getIndex() == b->getIndex());
-
+
if (path_exclude_prefixes) {
- for (const char* path_exclude_prefix: *path_exclude_prefixes) {
+ for (const char* path_exclude_prefix : *path_exclude_prefixes) {
if (simgear::strutils::starts_with(a->getPath(true /*simplify*/), path_exclude_prefix)) {
SG_LOG(SG_SYSTEMS, SG_BULK, "Ignoring: " << a->getPath(true /*simplify*/));
return;
@@ -100,19 +84,15 @@ static void s_RecordPropertyDiffs(
const std::string b_value = b->getStringValue();
if (a_value != b_value) {
// Values are different so write out node <a> and update b.
- SG_LOG(SG_SYSTEMS, SG_DEBUG, "recording property change:"
- << a->getPath()
- << ": " << b->getStringValue()
- << " => " << a->getStringValue()
- );
+ SG_LOG(SG_SYSTEMS, SG_DEBUG, "recording property change:" << a->getPath() << ": " << b->getStringValue() << " => " << a->getStringValue());
s_AppendString(out, a->getPath(true /*simplify*/));
s_AppendString(out, a->getStringValue());
b->setStringValue(a_value);
}
-
+
// Look at all child nodes of <b>, removing any that are not in <a>.
int bn = b->nChildren();
- for (int i=0; i<bn; ++i) {
+ for (int i = 0; i < bn; ++i) {
SGPropertyNode* bc = b->getChild(i);
SGPropertyNode* ac = a->getChild(bc->getNameString(), bc->getIndex(), false /*create*/);
if (!ac) {
@@ -123,11 +103,11 @@ static void s_RecordPropertyDiffs(
b->removeChild(bc);
}
}
-
+
// Look at all child nodes of <a>, copying across to <b> as required.
//
int an = a->nChildren();
- for (int i=0; i<an; ++i) {
+ for (int i = 0; i < an; ++i) {
SGPropertyNode* ac = a->getChild(i);
SGPropertyNode* bc = b->getChild(ac->getNameString(), ac->getIndex(), true /*create*/);
// Recurse.
@@ -142,17 +122,15 @@ static void s_RecordPropertyDiffs(
// We write different properties depending on properties such as
// /sim/replay/record-main-view.
//
-struct RecordExtraProperties
-{
+struct RecordExtraProperties {
RecordExtraProperties()
- :
- m_record_extra_properties(fgGetNode("/sim/replay/record-extra-properties", true /*create*/)),
- m_record_main_window(fgGetNode("/sim/replay/record-main-window", true /*create*/)),
- m_record_main_view(fgGetNode("/sim/replay/record-main-view", true /*create*/)),
- m_record_extra_properties_paths(fgGetNode("/sim/replay/record-extra-properties-paths", true /*create*/))
+ : m_record_extra_properties(fgGetNode("/sim/replay/record-extra-properties", true /*create*/)),
+ m_record_main_window(fgGetNode("/sim/replay/record-main-window", true /*create*/)),
+ m_record_main_view(fgGetNode("/sim/replay/record-main-view", true /*create*/)),
+ m_record_extra_properties_paths(fgGetNode("/sim/replay/record-extra-properties-paths", true /*create*/))
{
}
-
+
// Added info about property changes to *ReplayData if we are recording
// them.
//
@@ -163,7 +141,7 @@ struct RecordExtraProperties
// /sim/replay/record-extra-properties-paths/path[].
//
auto paths = m_record_extra_properties_paths->getChildren("path");
- for (SGPropertyNode* n: paths) {
+ for (SGPropertyNode* n : paths) {
// We don't try to handle indices or deletion for top-level
// property node.
//
@@ -177,64 +155,59 @@ struct RecordExtraProperties
s_RecordPropertyDiffs(ReplayData->extra_properties, a, b, NULL /*path_exclude_prefixes*/);
}
}
-
+
if (m_record_main_window->getBoolValue()) {
// Record size/position of main window.
//
static std::vector<const char*> s_paths = {
- "sim/startup/xpos",
- "sim/startup/ypos",
- "sim/startup/xsize",
- "sim/startup/ysize"
- };
- for (const char* path: s_paths) {
+ "sim/startup/xpos",
+ "sim/startup/ypos",
+ "sim/startup/xsize",
+ "sim/startup/ysize"};
+ for (const char* path : s_paths) {
SGPropertyNode* a = globals->get_props()->getNode(path, true /*create*/);
SGPropertyNode* b = RecordExtraPropertiesReference->getNode(path, true /*create*/);
s_RecordPropertyDiffs(ReplayData->extra_properties, a, b, NULL /*path_exclude_prefixes*/);
}
}
-
+
if (m_record_main_view->getBoolValue()) {
// Record main window view.
//
static std::vector<const char*> s_excludes = {
- "/sim/current-view/debug/",
- "/sim/current-view/raw-orientation",
- "/sim/current-view/viewer-"
- };
+ "/sim/current-view/debug/",
+ "/sim/current-view/raw-orientation",
+ "/sim/current-view/viewer-"};
const char* path = "sim/current-view";
SGPropertyNode* a = globals->get_props()->getNode(path, true /*create*/);
SGPropertyNode* b = RecordExtraPropertiesReference->getNode(path, true /*create*/);
s_RecordPropertyDiffs(ReplayData->extra_properties, a, b, &s_excludes);
}
}
-
- private:
-
- SGPropertyNode_ptr m_record_extra_properties;
- SGPropertyNode_ptr m_record_main_window;
- SGPropertyNode_ptr m_record_main_view;
- SGPropertyNode_ptr m_record_extra_properties_paths;
+
+private:
+ SGPropertyNode_ptr m_record_extra_properties;
+ SGPropertyNode_ptr m_record_main_window;
+ SGPropertyNode_ptr m_record_main_view;
+ SGPropertyNode_ptr m_record_extra_properties_paths;
};
-static std::shared_ptr<RecordExtraProperties> s_record_extra_properties;
+static std::shared_ptr<RecordExtraProperties> s_record_extra_properties;
-
-FGFlightRecorder::FGFlightRecorder(const char* pConfigName) :
- m_RecorderNode (fgGetNode("/sim/flight-recorder", true)),
- m_ReplayMultiplayer (fgGetNode("/sim/replay/multiplayer", true)),
- m_ReplayExtraProperties (fgGetNode("/sim/replay/replay-extra-properties", true)),
- m_ReplayMainView (fgGetNode("/sim/replay/replay-main-view", true)),
- m_ReplayMainWindowPosition (fgGetNode("/sim/replay/replay-main-window-position", true)),
- m_ReplayMainWindowSize (fgGetNode("/sim/replay/replay-main-window-size", true)),
- m_RecordContinuous (fgGetNode("/sim/replay/record-continuous", true)),
- m_RecordExtraProperties (fgGetNode("/sim/replay/record-extra-properties", true)),
- m_LogRawSpeed (fgGetNode("/sim/replay/log-raw-speed", true)),
- m_TotalRecordSize(0),
- m_ConfigName(pConfigName),
- m_usingDefaultConfig(false),
- m_MultiplayMgr(globals->get_subsystem<FGMultiplayMgr>())
+FGFlightRecorder::FGFlightRecorder(const char* pConfigName) : m_RecorderNode(fgGetNode("/sim/flight-recorder", true)),
+ m_ReplayMultiplayer(fgGetNode("/sim/replay/multiplayer", true)),
+ m_ReplayExtraProperties(fgGetNode("/sim/replay/replay-extra-properties", true)),
+ m_ReplayMainView(fgGetNode("/sim/replay/replay-main-view", true)),
+ m_ReplayMainWindowPosition(fgGetNode("/sim/replay/replay-main-window-position", true)),
+ m_ReplayMainWindowSize(fgGetNode("/sim/replay/replay-main-window-size", true)),
+ m_RecordContinuous(fgGetNode("/sim/replay/record-continuous", true)),
+ m_RecordExtraProperties(fgGetNode("/sim/replay/record-extra-properties", true)),
+ m_LogRawSpeed(fgGetNode("/sim/replay/log-raw-speed", true)),
+ m_TotalRecordSize(0),
+ m_ConfigName(pConfigName),
+ m_usingDefaultConfig(false),
+ m_MultiplayMgr(globals->get_subsystem<FGMultiplayMgr>())
{
}
@@ -243,15 +216,14 @@ FGFlightRecorder::~FGFlightRecorder()
s_record_extra_properties.reset();
}
-void
-FGFlightRecorder::reinit(void)
+void FGFlightRecorder::reinit()
{
m_ConfigNode = 0;
m_usingDefaultConfig = false;
SGPropertyNode_ptr ConfigNode;
int Selected = m_RecorderNode->getIntValue(m_ConfigName, 0);
- SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: Recorder configuration #" << Selected);
+ SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: Recorder configuration #" << std::to_string(Selected));
if (Selected >= 0)
ConfigNode = m_RecorderNode->getChild("config", Selected);
@@ -261,8 +233,7 @@ FGFlightRecorder::reinit(void)
reinit(ConfigNode);
}
-void
-FGFlightRecorder::reinit(SGPropertyNode_ptr ConfigNode)
+void FGFlightRecorder::reinit(SGPropertyNode_ptr ConfigNode)
{
m_TotalRecordSize = 0;
@@ -275,53 +246,47 @@ FGFlightRecorder::reinit(SGPropertyNode_ptr ConfigNode)
m_ConfigNode = ConfigNode;
- if (!m_ConfigNode.valid())
- {
+ if (!m_ConfigNode.valid()) {
SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Configuration is invalid. Flight recorder disabled.");
- }
- else
- {
- // set name of active flight recorder type
+ } else {
+ // set name of active flight recorder type
const std::string pRecorderName =
- m_ConfigNode->getStringValue("name",
- "aircraft-specific flight recorder");
+ m_ConfigNode->getStringValue("name",
+ "aircraft-specific flight recorder");
SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: Using custom recorder configuration: " << pRecorderName);
m_RecorderNode->setStringValue("active-config-name", pRecorderName);
// get signals
- initSignalList("double", m_CaptureDouble, m_ConfigNode );
- initSignalList("float", m_CaptureFloat , m_ConfigNode );
- initSignalList("int", m_CaptureInteger, m_ConfigNode );
- initSignalList("int16", m_CaptureInt16 , m_ConfigNode );
- initSignalList("int8", m_CaptureInt8 , m_ConfigNode );
- initSignalList("bool", m_CaptureBool , m_ConfigNode );
+ initSignalList("double", m_CaptureDouble, m_ConfigNode);
+ initSignalList("float", m_CaptureFloat, m_ConfigNode);
+ initSignalList("int", m_CaptureInteger, m_ConfigNode);
+ initSignalList("int16", m_CaptureInt16, m_ConfigNode);
+ initSignalList("int8", m_CaptureInt8, m_ConfigNode);
+ initSignalList("bool", m_CaptureBool, m_ConfigNode);
}
// calculate size of a single record
- m_TotalRecordSize = sizeof(double) * 1 /* sim time */ +
- sizeof(double) * m_CaptureDouble.size() +
- sizeof(float) * m_CaptureFloat.size() +
- sizeof(int) * m_CaptureInteger.size() +
- sizeof(short int) * m_CaptureInt16.size() +
- sizeof(signed char) * m_CaptureInt8.size() +
- sizeof(unsigned char) * ((m_CaptureBool.size()+7)/8); // 8 bools per byte
+ m_TotalRecordSize = sizeof(double) * 1 /* sim time */ +
+ sizeof(double) * m_CaptureDouble.size() +
+ sizeof(float) * m_CaptureFloat.size() +
+ sizeof(int) * m_CaptureInteger.size() +
+ sizeof(short int) * m_CaptureInt16.size() +
+ sizeof(signed char) * m_CaptureInt8.size() +
+ sizeof(unsigned char) * ((m_CaptureBool.size() + 7) / 8); // 8 bools per byte
// expose size of actual flight recorder record
m_RecorderNode->setIntValue("record-size", m_TotalRecordSize);
SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: record size is " << m_TotalRecordSize << " bytes");
-
+
s_record_extra_properties.reset(new RecordExtraProperties);
}
/** Check if SignalList already contains the given property */
-bool
-FGFlightRecorder::haveProperty(FlightRecorder::TSignalList& SignalList,SGPropertyNode* pProperty)
+bool FGFlightRecorder::haveProperty(FlightRecorder::TSignalList& SignalList, const SGPropertyNode* pProperty)
{
unsigned int Count = SignalList.size();
- for (unsigned int i=0; i<Count; i++)
- {
- if (SignalList[i].Signal.get() == pProperty)
- {
+ for (unsigned int i = 0; i < Count; i++) {
+ if (SignalList[i].Signal.get() == pProperty) {
return true;
}
}
@@ -329,20 +294,19 @@ FGFlightRecorder::haveProperty(FlightRecorder::TSignalList& SignalList,SGPropert
}
/** Check if any signal list already contains the given property */
-bool
-FGFlightRecorder::haveProperty(SGPropertyNode* pProperty)
+bool FGFlightRecorder::haveProperty(const SGPropertyNode* pProperty)
{
- if (haveProperty(m_CaptureDouble, pProperty))
+ if (haveProperty(m_CaptureDouble, pProperty))
return true;
- if (haveProperty(m_CaptureFloat, pProperty))
+ if (haveProperty(m_CaptureFloat, pProperty))
return true;
if (haveProperty(m_CaptureInteger, pProperty))
return true;
- if (haveProperty(m_CaptureInt16, pProperty))
+ if (haveProperty(m_CaptureInt16, pProperty))
return true;
- if (haveProperty(m_CaptureInt8, pProperty))
+ if (haveProperty(m_CaptureInt8, pProperty))
return true;
- if (haveProperty(m_CaptureBool, pProperty))
+ if (haveProperty(m_CaptureBool, pProperty))
return true;
return false;
}
@@ -350,7 +314,7 @@ FGFlightRecorder::haveProperty(SGPropertyNode* pProperty)
/** Read default flight-recorder configuration.
* Default should match properties as hard coded for versions up to FG2.4.0. */
SGPropertyNode_ptr
-FGFlightRecorder::getDefault(void)
+FGFlightRecorder::getDefault()
{
SGPropertyNode_ptr ConfigNode;
@@ -358,27 +322,18 @@ FGFlightRecorder::getDefault(void)
SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: No custom configuration. Loading generic default recorder.");
const std::string Path = m_RecorderNode->getStringValue("default-config", "");
- if (Path.empty())
- {
+ if (Path.empty()) {
SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: No default flight recorder specified! Check defaults.xml!");
- }
- else
- {
+ } else {
SGPath path = globals->resolve_aircraft_path(Path);
- if (path.isNull())
- {
+ if (path.isNull()) {
SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Cannot find file '" << Path << "'.");
- }
- else
- {
- try
- {
- readProperties(path, m_RecorderNode->getChild("config", 0 ,true), 0);
- ConfigNode = m_RecorderNode->getChild("config", 0 ,false);
- } catch (sg_io_exception &e)
- {
- SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Error reading file '" <<
- Path << ": " << e.getFormattedMessage());
+ } else {
+ try {
+ readProperties(path, m_RecorderNode->getChild("config", 0, true), 0);
+ ConfigNode = m_RecorderNode->getChild("config", 0, false);
+ } catch (sg_io_exception& e) {
+ SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Error reading file '" << Path << ": " << e.getFormattedMessage());
}
}
}
@@ -391,43 +346,38 @@ FGFlightRecorder::getDefault(void)
* Only process properties of given signal type and add all signals to the given list.
* This method is called for all supported signal types - properties of each type are
* kept in separate lists for efficiency reasons. */
-void
-FGFlightRecorder::initSignalList(const char* pSignalType, TSignalList& SignalList, SGPropertyNode_ptr BaseNode)
+void FGFlightRecorder::initSignalList(const char* pSignalType, TSignalList& SignalList, SGPropertyNode_ptr BaseNode)
{
// clear old signals
SignalList.clear();
processSignalList(pSignalType, SignalList, BaseNode);
- SG_LOG(SG_SYSTEMS, SG_DEBUG, "FlightRecorder: " << SignalList.size() << " signals of type " << pSignalType );
+ SG_LOG(SG_SYSTEMS, SG_DEBUG, "FlightRecorder: " << SignalList.size() << " signals of type " << pSignalType);
}
/** Process signal list below given base node.
* Only process properties of given signal type and add all signals to the given list.
* This method is called for all supported signal types - properties of each type are
* kept in separate lists for efficiency reasons. */
-void
-FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& SignalList, SGPropertyNode_ptr SignalListNode,
- string PropPrefix, int Count)
+void FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& SignalList, SGPropertyNode_ptr SignalListNode,
+ string PropPrefix, int Count)
{
// get the list of signal sources (property paths) for this signal type
SGPropertyNode_ptr SignalNode;
- int Index=0;
+ int Index = 0;
- Count = SignalListNode->getIntValue("count",Count);
- PropPrefix = simgear::strutils::strip(SignalListNode->getStringValue("prefix",PropPrefix.c_str()));
- if ((!PropPrefix.empty())&&(PropPrefix[PropPrefix.size()-1] != '/'))
+ Count = SignalListNode->getIntValue("count", Count);
+ PropPrefix = simgear::strutils::strip(SignalListNode->getStringValue("prefix", PropPrefix.c_str()));
+ if ((!PropPrefix.empty()) && (PropPrefix[PropPrefix.size() - 1] != '/'))
PropPrefix += "/";
- do
- {
- SignalNode = SignalListNode->getChild("signal",Index,false);
- if (SignalNode.valid()&&
- (std::string(pSignalType) == SignalNode->getStringValue("type", "float")))
- {
+ do {
+ SignalNode = SignalListNode->getChild("signal", Index, false);
+ if (SignalNode.valid() &&
+ (std::string(pSignalType) == SignalNode->getStringValue("type", "float"))) {
string PropertyPath = SignalNode->getStringValue("property", "");
- if (!PropertyPath.empty())
- {
+ if (!PropertyPath.empty()) {
PropertyPath = PropPrefix + PropertyPath;
const std::string pInterpolation = SignalNode->getStringValue("interpolation", "linear");
@@ -437,19 +387,16 @@ FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& Signal
if (IndexPos == string::npos)
SignalCount = 1;
- for (int IndexValue=0;IndexValue<SignalCount;IndexValue++)
- {
+ for (int IndexValue = 0; IndexValue < SignalCount; IndexValue++) {
string PPath = PropertyPath;
- if (IndexPos != string::npos)
- {
+ if (IndexPos != string::npos) {
char strbuf[20];
snprintf(strbuf, 20, "%d", IndexValue);
- PPath = PPath.replace(IndexPos,2,strbuf);
+ PPath = PPath.replace(IndexPos, 2, strbuf);
}
TCapture Capture;
- Capture.Signal = fgGetNode(PPath.c_str(),false);
- if (!Capture.Signal.valid())
- {
+ Capture.Signal = fgGetNode(PPath.c_str(), false);
+ if (!Capture.Signal.valid()) {
// JMT - only warn if using a custom config, not the default one. Since the generic config of
// course requests many props, but we do want this warning for custom configs tailored to the
// aircraft model.
@@ -458,34 +405,26 @@ FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& Signal
// Or maybe the data is only initialized later. Warn anyway, so we can catch useless data.
SG_LOG(SG_SYSTEMS, SG_INFO, "FlightRecorder: Recording non-existent property '" << PPath << "'.");
}
-
- Capture.Signal = fgGetNode(PPath.c_str(),true);
+
+ Capture.Signal = fgGetNode(PPath.c_str(), true);
}
if (pInterpolation == "discrete")
Capture.Interpolation = discrete;
- else
- if ((pInterpolation == "angular")||
- (pInterpolation == "angular-rad"))
+ else if ((pInterpolation == "angular") ||
+ (pInterpolation == "angular-rad"))
Capture.Interpolation = angular_rad;
- else
- if (pInterpolation == "angular-deg")
+ else if (pInterpolation == "angular-deg")
Capture.Interpolation = angular_deg;
- else
- if (pInterpolation == "linear")
+ else if (pInterpolation == "linear")
Capture.Interpolation = linear;
- else
- {
- SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Unsupported interpolation type '"
- << pInterpolation<< "' of signal '" << PPath << "'");
+ else {
+ SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Unsupported interpolation type '" << pInterpolation << "' of signal '" << PPath << "'");
Capture.Interpolation = linear;
}
- if (haveProperty(Capture.Signal))
- {
- SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Property '"
- << PPath << "' specified multiple times. Check flight recorder configuration.");
- }
- else
+ if (haveProperty(Capture.Signal)) {
+ SG_LOG(SG_SYSTEMS, SG_ALERT, "FlightRecorder: Property '" << PPath << "' specified multiple times. Check flight recorder configuration.");
+ } else
SignalList.push_back(Capture);
}
}
@@ -495,8 +434,7 @@ FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& Signal
// allow recursive definition of signal lists
simgear::PropertyList Nodes = SignalListNode->getChildren("signals");
- for (unsigned int i=0;i<Nodes.size();i++)
- {
+ for (unsigned int i = 0; i < Nodes.size(); i++) {
processSignalList(pSignalType, SignalList, Nodes[i], PropPrefix, Count);
}
}
@@ -508,45 +446,42 @@ FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& Signal
FGReplayData*
FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
{
- if (!ReplayData)
- {
+ if (!ReplayData) {
ReplayData = new FGReplayData;
if (!ReplayData)
return NULL;
}
-
+
// When replaying, we are able to carry recording live multiplayer
- // information. To make this work we need to record a stationay
+ // information. To make this work we need to record a stationary
// user aircraft, with information from the last live user aircraft
// FGReplayData. So we store the last live user aircraft information in
// this static vector.
//
- static std::vector<char> s_recent_raw_data;
-
+ static std::vector<char> s_recent_raw_data;
+
int in_replay = fgGetInt("/sim/replay/replay-state");
-
+
ReplayData->sim_time = SimTime;
-
+
if (in_replay && !s_recent_raw_data.empty()) {
// Record the fixed position of live user aircraft at the point at
// which we started replay.
//
ReplayData->raw_data = s_recent_raw_data;
- }
- else {
+ } else {
// Find live information about the user aircraft.
//
int Offset = 0;
- ReplayData->raw_data.resize( m_TotalRecordSize);
+ ReplayData->raw_data.resize(m_TotalRecordSize);
char* pBuffer = &ReplayData->raw_data.front();
// 64bit aligned data first!
{
// capture doubles
- double* pDoubles = (double*) &pBuffer[Offset];
+ double* pDoubles = (double*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureDouble.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
pDoubles[i] = m_CaptureDouble[i].Signal->getDoubleValue();
}
Offset += SignalCount * sizeof(double);
@@ -555,10 +490,9 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
// 32bit aligned data comes second...
{
// capture floats
- float* pFloats = (float*) &pBuffer[Offset];
+ float* pFloats = (float*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureFloat.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
pFloats[i] = m_CaptureFloat[i].Signal->getFloatValue();
}
Offset += SignalCount * sizeof(float);
@@ -566,10 +500,9 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
{
// capture integers (32bit aligned)
- int* pInt = (int*) &pBuffer[Offset];
+ int* pInt = (int*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInteger.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
pInt[i] = m_CaptureInteger[i].Signal->getIntValue();
}
Offset += SignalCount * sizeof(int);
@@ -578,11 +511,10 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
// 16bit aligned data is next...
{
// capture 16bit short integers
- short int* pShortInt = (short int*) &pBuffer[Offset];
+ short int* pShortInt = (short int*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInt16.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
- pShortInt[i] = (short int) m_CaptureInt16[i].Signal->getIntValue();
+ for (unsigned int i = 0; i < SignalCount; i++) {
+ pShortInt[i] = (short int)m_CaptureInt16[i].Signal->getIntValue();
}
Offset += SignalCount * sizeof(short int);
}
@@ -590,26 +522,24 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
// finally: byte aligned data is last...
{
// capture 8bit chars
- signed char* pChar = (signed char*) &pBuffer[Offset];
+ signed char* pChar = (signed char*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInt8.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
- pChar[i] = (signed char) m_CaptureInt8[i].Signal->getIntValue();
+ for (unsigned int i = 0; i < SignalCount; i++) {
+ pChar[i] = (signed char)m_CaptureInt8[i].Signal->getIntValue();
}
Offset += SignalCount * sizeof(signed char);
}
{
// capture 1bit booleans (8bit aligned)
- unsigned char* pFlags = (unsigned char*) &pBuffer[Offset];
+ unsigned char* pFlags = (unsigned char*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureBool.size();
- int Size = (SignalCount+7)/8;
+ int Size = (SignalCount + 7) / 8;
Offset += Size;
- memset(pFlags,0,Size);
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ memset(pFlags, 0, Size);
+ for (unsigned int i = 0; i < SignalCount; i++) {
if (m_CaptureBool[i].Signal->getBoolValue())
- pFlags[i>>3] |= 1 << (i&7);
+ pFlags[i >> 3] |= 1 << (i & 7);
}
}
@@ -620,15 +550,15 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
//
s_recent_raw_data = ReplayData->raw_data;
}
-
+
// If m_ReplayMultiplayer is true, move all recent
// multiplayer messages from m_MultiplayMgr into
// ReplayData->multiplayer_messages. Otherwise clear m_MultiplayMgr's
// list of recent messages.
//
ReplayData->multiplayer_messages.clear();
- bool replayMultiplayer = m_ReplayMultiplayer->getBoolValue();
- for(;;) {
+ bool replayMultiplayer = m_ReplayMultiplayer->getBoolValue();
+ for (;;) {
auto multiplayerMessage = m_MultiplayMgr->popMessageHistory();
if (!multiplayerMessage) {
break;
@@ -642,19 +572,13 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
auto message_header = reinterpret_cast<const T_MsgHdr*>(&multiplayerMessage->front());
xdr_data_t message_id = message_header->MsgId;
if (message_id == CHAT_MSG_ID) {
- SG_LOG(SG_GENERAL, SG_ALERT, "Not recording chat message: "
- << std::string(
- reinterpret_cast<const T_ChatMsg*>(message_header + 1)->Text,
- message_header->MsgLen - sizeof(*message_header)
- )
- );
- }
- else {
- ReplayData->multiplayer_messages.push_back( multiplayerMessage);
+ SG_LOG(SG_GENERAL, SG_ALERT, "Not recording chat message: " << std::string(reinterpret_cast<const T_ChatMsg*>(message_header + 1)->Text, message_header->MsgLen - sizeof(*message_header)));
+ } else {
+ ReplayData->multiplayer_messages.push_back(multiplayerMessage);
}
}
}
-
+
// Add extra properties if we are doing continuous recording.
//
if (m_RecordContinuous->getBoolValue()) {
@@ -664,61 +588,57 @@ FGFlightRecorder::capture(double SimTime, FGReplayData* ReplayData)
}
s_record_extra_properties->capture(m_RecordExtraPropertiesReference, ReplayData);
}
-
+
ReplayData->UpdateStats();
-
+
// Note that if we are replaying, <ReplayData> will contain the last live
// position of the live user aircraft, plus any multiplayer packets that
// have arrived recently. If there were no recent multiplayer packets,
// then there's no actually no need to record anything (unless we're at the
// start of recording).
//
- // But for now at least, we don't try to optimise the recording like that.
+ // But for now at least, we don't try to optimize the recording like that.
//
-
+
return ReplayData;
}
/** Do interpolation as defined by given interpolation type and weighting ratio. */
static double
-weighting(TInterpolation interpolation, double ratio, double v1,double v2)
+weighting(TInterpolation interpolation, double ratio, double v1, double v2)
{
- switch (interpolation)
- {
- case linear:
- return v1 + ratio*(v2-v1);
-
- case angular_deg:
- {
- // special handling of angular data
- double tmp = v2 - v1;
- if ( tmp > 180 )
- tmp -= 360;
- else if ( tmp < -180 )
- tmp += 360;
- return v1 + tmp * ratio;
- }
+ switch (interpolation) {
+ case linear:
+ return v1 + ratio * (v2 - v1);
- case angular_rad:
- {
- // special handling of angular data
- double tmp = v2 - v1;
- if ( tmp > SGD_PI )
- tmp -= SGD_2PI;
- else if ( tmp < -SGD_PI )
- tmp += SGD_2PI;
- return v1 + tmp * ratio;
- }
+ case angular_deg: {
+ // special handling of angular data
+ double tmp = v2 - v1;
+ if (tmp > 180)
+ tmp -= 360;
+ else if (tmp < -180)
+ tmp += 360;
+ return v1 + tmp * ratio;
+ }
- case discrete:
- // fall through
- default:
- return v2;
+ case angular_rad: {
+ // special handling of angular data
+ double tmp = v2 - v1;
+ if (tmp > SGD_PI)
+ tmp -= SGD_2PI;
+ else if (tmp < -SGD_PI)
+ tmp += SGD_2PI;
+ return v1 + tmp * ratio;
+ }
+
+ case discrete:
+ // fall through
+ default:
+ return v2;
}
}
-void
-FGFlightRecorder::resetExtraProperties()
+void FGFlightRecorder::resetExtraProperties()
{
SG_LOG(SG_SYSTEMS, SG_DEBUG, "Clearing m_RecordExtraPropertiesReference");
m_RecordExtraPropertiesReference = nullptr;
@@ -731,8 +651,7 @@ static void setInt(const std::string& value, int* out)
if (!out) return;
try {
*out = std::stoi(value);
- }
- catch (std::exception& e) {
+ } catch (std::exception& e) {
SG_LOG(SG_SYSTEMS, SG_ALERT, "Ignoring failed conversion of '" << value << "' to int: " << e.what());
}
}
@@ -745,8 +664,7 @@ static void string_to_double(const std::string& s, double& out, bool& ok)
errno = 0;
char* end;
out = strtod(s.c_str(), &end);
- if (errno || !end || *end != 0)
- {
+ if (errno || !end || *end != 0) {
ok = false;
return;
}
@@ -757,55 +675,44 @@ static void string_to_double(const std::string& s, double& out, bool& ok)
<frame_prev> and values look like floating point, we interpolate using <ratio>.
*/
static void replayProperty(
- const std::string& path,
- const std::string& value_next_string,
- const FGReplayData* frame_prev,
- double ratio
- )
+ const std::string& path,
+ const std::string& value_next_string,
+ const FGReplayData* frame_prev,
+ double ratio)
{
SGPropertyNode* p = globals->get_props()->getNode(path, true /*create*/);
bool done = false;
- if (frame_prev)
- {
+ if (frame_prev) {
/* Check whether <path> is in frame_prev's list of property changes. */
SG_LOG(SG_SYSTEMS, SG_DEBUG, "p && _pLastBuffer");
auto p_prev_it = frame_prev->replay_extra_property_changes.find(path);
- if (p_prev_it != frame_prev->replay_extra_property_changes.end())
- {
+ if (p_prev_it != frame_prev->replay_extra_property_changes.end()) {
/* Property <path> is also in frame_prev. */
SG_LOG(SG_SYSTEMS, SG_DEBUG, "property in frame_prev and frame_next:"
- << " " << path);
- const std::string& value_prev_string = p_prev_it->second;
+ << " " << path);
+ const std::string& value_prev_string = p_prev_it->second;
bool value_prev_ok;
bool value_next_ok;
double value_prev;
double value_next;
string_to_double(value_prev_string, value_prev, value_prev_ok);
string_to_double(value_next_string, value_next, value_next_ok);
- if (value_prev_ok && value_next_ok)
- {
+ if (value_prev_ok && value_next_ok) {
/* Both values look like floating point so we interpolate. */
SG_LOG(SG_SYSTEMS, SG_DEBUG, "property is fp");
- TInterpolation interpolation = TInterpolation::linear;
- if (simgear::strutils::ends_with(path, "-deg"))
- {
+ TInterpolation interpolation = TInterpolation::linear;
+ if (simgear::strutils::ends_with(path, "-deg")) {
interpolation = TInterpolation::angular_deg;
- }
- else if (simgear::strutils::ends_with(path, "-rad"))
- {
+ } else if (simgear::strutils::ends_with(path, "-rad")) {
interpolation = TInterpolation::angular_rad;
}
SG_LOG(SG_SYSTEMS, SG_DEBUG, "calling weighting() ratio=" << ratio);
double value_interpolated = weighting(
- interpolation,
- ratio,
- value_prev,
- value_next
- );
- SG_LOG(SG_GENERAL, SG_DEBUG, "Interpolating " << path
- << ": [" << value_prev << " .. " << value_next
- << "] => " << value_interpolated
- );
+ interpolation,
+ ratio,
+ value_prev,
+ value_next);
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Interpolating " << path << ": [" << value_prev << " .. " << value_next << "] => " << value_interpolated);
globals->get_props()->setDoubleValue(path, value_interpolated);
done = true;
}
@@ -816,14 +723,12 @@ static void replayProperty(
/** Replay.
* Restore all properties with data from given buffer. */
-void
-FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
- const FGReplayData* _pLastBuffer,
- int* main_window_xpos,
- int* main_window_ypos,
- int* main_window_xsize,
- int* main_window_ysize
- )
+void FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
+ const FGReplayData* _pLastBuffer,
+ int* main_window_xpos,
+ int* main_window_ypos,
+ int* main_window_xsize,
+ int* main_window_ysize)
{
const char* pLastBuffer = (_pLastBuffer && !_pLastBuffer->raw_data.empty()) ? &_pLastBuffer->raw_data.front() : nullptr;
const char* pBuffer = (_pNextBuffer && !_pNextBuffer->raw_data.empty()) ? &_pNextBuffer->raw_data.front() : nullptr;
@@ -831,15 +736,13 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
if (pBuffer) {
/* Replay signals. */
int Offset = 0;
- if (pLastBuffer)
- {
+ if (pLastBuffer) {
double NextSimTime = _pNextBuffer->sim_time;
double LastSimTime = _pLastBuffer->sim_time;
double Numerator = SimTime - LastSimTime;
double dt = NextSimTime - LastSimTime;
// avoid divide by zero and other quirks
- if ((Numerator > 0.0)&&(dt != 0.0))
- {
+ if ((Numerator > 0.0) && (dt != 0.0)) {
ratio = Numerator / dt;
if (ratio > 1.0)
ratio = 1.0;
@@ -849,15 +752,13 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
// 64bit aligned data first!
{
// restore doubles
- const double* pDoubles = (const double*) &pBuffer[Offset];
- const double* pLastDoubles = (const double*) &pLastBuffer[Offset];
+ const double* pDoubles = (const double*)&pBuffer[Offset];
+ const double* pLastDoubles = (const double*)&pLastBuffer[Offset];
unsigned int SignalCount = m_CaptureDouble.size();
-
- for (unsigned int i=0; i<SignalCount; i++)
- {
+
+ for (unsigned int i = 0; i < SignalCount; i++) {
double v = pDoubles[i];
- if (pLastBuffer)
- {
+ if (pLastBuffer) {
v = weighting(m_CaptureDouble[i].Interpolation, ratio,
pLastDoubles[i], v);
}
@@ -870,10 +771,9 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
// scripts/python/recordreplay.py --test-motion.
//
SGGeod pos_geod = SGGeod::fromDegFt(
- fgGetDouble("/position/longitude-deg"),
- fgGetDouble("/position/latitude-deg"),
- fgGetDouble("/position/altitude-ft")
- );
+ fgGetDouble("/position/longitude-deg"),
+ fgGetDouble("/position/latitude-deg"),
+ fgGetDouble("/position/altitude-ft"));
SGVec3d pos = SGVec3d::fromGeod(pos_geod);
static SGVec3d pos_prev;
static double t_prev = -1;
@@ -883,49 +783,40 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
double distance = length(pos - pos_prev);
double speed = dt ? distance / dt : -1;
SG_LOG(SG_GENERAL, SG_DEBUG, ""
- << " User aircraft:"
- << " pLastBuffer=" << ((void*) pLastBuffer)
- << " t_prev=" << std::setprecision(10) << t_prev
- << " t=" << std::setprecision(10) << t
- << " dt=" << dt
- << " distance=" << distance
- << " speed=" << speed
- );
+ << " User aircraft:"
+ << " pLastBuffer=" << ((void*)pLastBuffer) << " t_prev=" << std::setprecision(10) << t_prev << " t=" << std::setprecision(10) << t << " dt=" << dt << " distance=" << distance << " speed=" << speed);
SGPropertyNode* n = fgGetNode("/sim/replay/log-raw-speed-values", true /*create*/);
n->addChild("value")->setDoubleValue(speed);
}
pos_prev = pos;
t_prev = t;
}
-
+
Offset += SignalCount * sizeof(double);
}
// 32bit aligned data comes second...
{
// restore floats
- const float* pFloats = (const float*) &pBuffer[Offset];
- const float* pLastFloats = (const float*) &pLastBuffer[Offset];
+ const float* pFloats = (const float*)&pBuffer[Offset];
+ const float* pLastFloats = (const float*)&pLastBuffer[Offset];
unsigned int SignalCount = m_CaptureFloat.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
float v = pFloats[i];
- if (pLastBuffer)
- {
+ if (pLastBuffer) {
v = weighting(m_CaptureFloat[i].Interpolation, ratio,
pLastFloats[i], v);
}
- m_CaptureFloat[i].Signal->setDoubleValue(v);//setFloatValue
+ m_CaptureFloat[i].Signal->setDoubleValue(v); //setFloatValue
}
Offset += SignalCount * sizeof(float);
}
{
// restore integers (32bit aligned)
- const int* pInt = (const int*) &pBuffer[Offset];
+ const int* pInt = (const int*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInteger.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
m_CaptureInteger[i].Signal->setIntValue(pInt[i]);
}
Offset += SignalCount * sizeof(int);
@@ -934,10 +825,9 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
// 16bit aligned data is next...
{
// restore 16bit short integers
- const short int* pShortInt = (const short int*) &pBuffer[Offset];
+ const short int* pShortInt = (const short int*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInt16.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
m_CaptureInt16[i].Signal->setIntValue(pShortInt[i]);
}
Offset += SignalCount * sizeof(short int);
@@ -946,10 +836,9 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
// finally: byte aligned data is last...
{
// restore 8bit chars
- const signed char* pChar = (const signed char*) &pBuffer[Offset];
+ const signed char* pChar = (const signed char*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureInt8.size();
- for (unsigned int i=0; i<SignalCount; i++)
- {
+ for (unsigned int i = 0; i < SignalCount; i++) {
m_CaptureInt8[i].Signal->setIntValue(pChar[i]);
}
Offset += SignalCount * sizeof(signed char);
@@ -957,37 +846,36 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
{
// restore 1bit booleans (8bit aligned)
- const unsigned char* pFlags = (const unsigned char*) &pBuffer[Offset];
+ const unsigned char* pFlags = (const unsigned char*)&pBuffer[Offset];
unsigned int SignalCount = m_CaptureBool.size();
- int Size = (SignalCount+7)/8;
+ int Size = (SignalCount + 7) / 8;
Offset += Size;
- for (unsigned int i=0; i<SignalCount; i++)
- {
- m_CaptureBool[i].Signal->setBoolValue(0 != (pFlags[i>>3] & (1 << (i&7))));
+ for (unsigned int i = 0; i < SignalCount; i++) {
+ m_CaptureBool[i].Signal->setBoolValue(0 != (pFlags[i >> 3] & (1 << (i & 7))));
}
}
}
// Replay any multiplayer messages.
- for (auto multiplayer_message: _pNextBuffer->multiplayer_messages) {
+ for (auto multiplayer_message : _pNextBuffer->multiplayer_messages) {
SG_LOG(SG_SYSTEMS, SG_DEBUG, "Pushing multiplayer message to multiplay manager");
m_MultiplayMgr->pushMessageHistory(multiplayer_message);
}
-
+
// Replay extra property changes.
//
- bool replay_extra_properties = m_ReplayExtraProperties->getBoolValue();
- bool replay_main_view = m_ReplayMainView->getBoolValue();
- bool replay_main_window_position = m_ReplayMainWindowPosition->getBoolValue();
- bool replay_main_window_size = m_ReplayMainWindowSize->getBoolValue();
-
+ bool replay_extra_properties = m_ReplayExtraProperties->getBoolValue();
+ bool replay_main_view = m_ReplayMainView->getBoolValue();
+ bool replay_main_window_position = m_ReplayMainWindowPosition->getBoolValue();
+ bool replay_main_window_size = m_ReplayMainWindowSize->getBoolValue();
+
if (replay_extra_properties) {
- for (auto extra_property_removed_path: _pNextBuffer->replay_extra_property_removals) {
+ for (auto extra_property_removed_path : _pNextBuffer->replay_extra_property_removals) {
SG_LOG(SG_SYSTEMS, SG_DEBUG, "replaying extra property removal: " << extra_property_removed_path);
globals->get_props()->removeChild(extra_property_removed_path);
}
}
-
+
// Apply any changes to /sim/current-view/view-number* first. This is a
// hack to avoid problems where setting view-number appears to make the
// view code change other things such as pitch-offset-deg internally. So if
@@ -998,7 +886,7 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
// property so when recording we don't always pick up all changes.
//
if (replay_main_view) {
- for (auto prop_change: _pNextBuffer->replay_extra_property_changes) {
+ for (auto prop_change : _pNextBuffer->replay_extra_property_changes) {
const std::string& path = prop_change.first;
const std::string& value = prop_change.second;
if (simgear::strutils::starts_with(path, "/sim/current-view/view-number")) {
@@ -1007,35 +895,28 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
}
}
}
-
- for (auto prop_change: _pNextBuffer->replay_extra_property_changes) {
+
+ for (auto prop_change : _pNextBuffer->replay_extra_property_changes) {
const std::string& path = prop_change.first;
const std::string& value = prop_change.second;
-
- if (0) {}
- else if (path == "/sim/startup/xpos") {
+
+ if (0) {
+ } else if (path == "/sim/startup/xpos") {
if (replay_main_window_position) setInt(value, main_window_xpos);
- }
- else if (path == "/sim/startup/ypos") {
+ } else if (path == "/sim/startup/ypos") {
if (replay_main_window_position) setInt(value, main_window_ypos);
- }
- else if (path == "/sim/startup/xsize") {
- if (replay_main_window_size) setInt(value, main_window_xsize);
- }
- else if (path == "/sim/startup/ysize") {
+ } else if (path == "/sim/startup/xsize") {
+ if (replay_main_window_size) setInt(value, main_window_xsize);
+ } else if (path == "/sim/startup/ysize") {
if (replay_main_window_size) setInt(value, main_window_ysize);
- }
- else if (simgear::strutils::starts_with(path, "/sim/current-view/")) {
+ } else if (simgear::strutils::starts_with(path, "/sim/current-view/")) {
if (replay_main_view) {
- SG_LOG(SG_SYSTEMS, SG_DEBUG, "SimTime=" << SimTime
- << " replaying view change: " << path << "=" << value);
+ SG_LOG(SG_SYSTEMS, SG_DEBUG, "SimTime=" << SimTime << " replaying view change: " << path << "=" << value);
/* Interpolate floating point values if possible. */
replayProperty(path, value, _pLastBuffer, ratio);
}
- }
- else if (replay_extra_properties) {
- SG_LOG(SG_SYSTEMS, SG_DEBUG, "SimTime=" << SimTime
- << " replaying extra_property change: " << path << "=" << value);
+ } else if (replay_extra_properties) {
+ SG_LOG(SG_SYSTEMS, SG_DEBUG, "SimTime=" << SimTime << " replaying extra_property change: " << path << "=" << value);
SGPropertyNode* p = globals->get_props()->getNode(path, true /*create*/);
bool done = false;
if (p && _pLastBuffer) {
@@ -1046,34 +927,29 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
_pNextBuffer, so if it is floating point, we will
interpolate. */
SG_LOG(SG_SYSTEMS, SG_DEBUG, "property in _pLastBuffer and _pNextBuffer:"
- << " " << path);
- const std::string& valus_prev = p_prev_it->second;
- size_t value_prev_len;
- size_t value_next_len;
+ << " " << path);
+ const std::string& valus_prev = p_prev_it->second;
+ size_t value_prev_len;
+ size_t value_next_len;
double value_prev = std::stod(valus_prev, &value_prev_len);
double value_next = std::stod(value, &value_next_len);
if (value_prev_len == valus_prev.size() && value_next_len == value.size()) {
/* Both values look like floating point so we will
interpolate. */
SG_LOG(SG_SYSTEMS, SG_DEBUG, "property is fp");
- TInterpolation interpolation = TInterpolation::linear;
+ TInterpolation interpolation = TInterpolation::linear;
if (simgear::strutils::ends_with(path, "-deg")) {
interpolation = TInterpolation::angular_deg;
- }
- else if (simgear::strutils::ends_with(path, "-rad")) {
+ } else if (simgear::strutils::ends_with(path, "-rad")) {
interpolation = TInterpolation::angular_rad;
}
SG_LOG(SG_SYSTEMS, SG_DEBUG, "calling weighting()");
double value_interpolated = weighting(
- interpolation,
- ratio,
- value_prev,
- value_next
- );
- SG_LOG(SG_GENERAL, SG_DEBUG, "Interpolating " << path
- << ": [" << value_prev << " .. " << value_next
- << "] => " << value_interpolated
- );
+ interpolation,
+ ratio,
+ value_prev,
+ value_next);
+ SG_LOG(SG_GENERAL, SG_DEBUG, "Interpolating " << path << ": [" << value_prev << " .. " << value_next << "] => " << value_interpolated);
globals->get_props()->setDoubleValue(path, value_interpolated);
done = true;
}
@@ -1084,14 +960,12 @@ FGFlightRecorder::replay(double SimTime, const FGReplayData* _pNextBuffer,
}
}
-int
-FGFlightRecorder::getConfig(SGPropertyNode* root, const char* typeStr, const FlightRecorder::TSignalList& SignalList)
+int FGFlightRecorder::getConfig(SGPropertyNode* root, const char* typeStr, const FlightRecorder::TSignalList& SignalList)
{
static const char* InterpolationTypes[] = {"discrete", "linear", "angular-rad", "angular-deg"};
size_t SignalCount = SignalList.size();
SGPropertyNode* Signals = root->getNode("signals", true);
- for (size_t i=0; i<SignalCount; i++)
- {
+ for (size_t i = 0; i < SignalCount; i++) {
SGPropertyNode* SignalProp = Signals->addChild("signal");
SignalProp->setStringValue("type", typeStr);
SignalProp->setStringValue("interpolation", InterpolationTypes[SignalList[i].Interpolation]);
@@ -1102,17 +976,16 @@ FGFlightRecorder::getConfig(SGPropertyNode* root, const char* typeStr, const Fli
return SignalCount;
}
-void
-FGFlightRecorder::getConfig(SGPropertyNode* root)
+void FGFlightRecorder::getConfig(SGPropertyNode* root)
{
root->setStringValue("name", m_RecorderNode->getStringValue("active-config-name", ""));
int SignalCount = 0;
- SignalCount += getConfig(root, "double", m_CaptureDouble);
- SignalCount += getConfig(root, "float", m_CaptureFloat);
+ SignalCount += getConfig(root, "double", m_CaptureDouble);
+ SignalCount += getConfig(root, "float", m_CaptureFloat);
SignalCount += getConfig(root, "int", m_CaptureInteger);
- SignalCount += getConfig(root, "int16", m_CaptureInt16);
- SignalCount += getConfig(root, "int8", m_CaptureInt8);
- SignalCount += getConfig(root, "bool", m_CaptureBool);
+ SignalCount += getConfig(root, "int16", m_CaptureInt16);
+ SignalCount += getConfig(root, "int8", m_CaptureInt8);
+ SignalCount += getConfig(root, "bool", m_CaptureBool);
root->setIntValue("recorder/record-size", getRecordSize());
root->setIntValue("recorder/signal-count", SignalCount);
diff --git a/src/Aircraft/flightrecorder.hxx b/src/Aircraft/flightrecorder.hxx
index 0eb0501d8..bec2fee8f 100644
--- a/src/Aircraft/flightrecorder.hxx
+++ b/src/Aircraft/flightrecorder.hxx
@@ -1,107 +1,88 @@
-// flightrecorder.hxx
-//
-// Written by Thorsten Brehm, started August 2011.
-//
-// Copyright (C) 2011 Thorsten Brehm - brehmt (at) gmail com
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful, but
-// WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-//
-///////////////////////////////////////////////////////////////////////////////
+/*
+ * SPDX-FileName: flightrecorder.hxx
+ * SPDX-FileCopyrightText: Copyright (C) 2011 Thorsten Brehm - brehmt (at) gmail com
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
-#ifndef FLIGHTRECORDER_HXX_
-#define FLIGHTRECORDER_HXX_
+#pragma once
-#include <simgear/props/props.hxx>
#include <MultiPlayer/multiplaymgr.hxx>
+#include <simgear/props/props.hxx>
+
#include "replay-internal.hxx"
-namespace FlightRecorder
+namespace FlightRecorder {
+
+typedef enum {
+ discrete = 0, // no interpolation
+ linear = 1, // linear interpolation
+ angular_rad = 2, // angular interpolation, value in radians
+ angular_deg = 3 // angular interpolation, value in degrees
+} TInterpolation;
+
+typedef struct
{
+ SGPropertyNode_ptr Signal;
+ TInterpolation Interpolation;
+} TCapture;
- typedef enum
- {
- discrete = 0, // no interpolation
- linear = 1, // linear interpolation
- angular_rad = 2, // angular interpolation, value in radians
- angular_deg = 3 // angular interpolation, value in degrees
- } TInterpolation;
+typedef std::vector<TCapture> TSignalList;
- typedef struct
- {
- SGPropertyNode_ptr Signal;
- TInterpolation Interpolation;
- } TCapture;
-
- typedef std::vector<TCapture> TSignalList;
-
-}
+} // namespace FlightRecorder
class FGFlightRecorder
{
public:
- FGFlightRecorder(const char* pConfigName);
+ explicit FGFlightRecorder(const char* pConfigName);
virtual ~FGFlightRecorder();
- void reinit (void);
- void reinit (SGPropertyNode_ptr ConfigNode);
- FGReplayData* capture (double SimTime, FGReplayData* pRecycledBuffer);
-
+ void reinit();
+ void reinit(SGPropertyNode_ptr ConfigNode);
+ FGReplayData* capture(double SimTime, FGReplayData* pRecycledBuffer);
+
// Updates main_window_* out-params if we find window move/resize events
// and replay of such events is enabled.
- void replay (double SimTime, const FGReplayData* pNextBuffer,
- const FGReplayData* pLastBuffer,
- int* main_window_xpos,
- int* main_window_ypos,
- int* main_window_xsize,
- int* main_window_ysize
- );
- int getRecordSize (void) { return m_TotalRecordSize;}
- void getConfig (SGPropertyNode* root);
- void resetExtraProperties();
+ void replay(double SimTime, const FGReplayData* pNextBuffer,
+ const FGReplayData* pLastBuffer,
+ int* main_window_xpos,
+ int* main_window_ypos,
+ int* main_window_xsize,
+ int* main_window_ysize);
+ int getRecordSize() { return m_TotalRecordSize; }
+ void getConfig(SGPropertyNode* root);
+ void resetExtraProperties();
private:
- SGPropertyNode_ptr getDefault(void);
+ SGPropertyNode_ptr getDefault();
void initSignalList(const char* pSignalType, FlightRecorder::TSignalList& SignalList,
SGPropertyNode_ptr BaseNode);
void processSignalList(const char* pSignalType, FlightRecorder::TSignalList& SignalList,
SGPropertyNode_ptr SignalListNode,
- std::string PropPrefix="", int Count = 1);
- bool haveProperty(FlightRecorder::TSignalList& Capture,SGPropertyNode* pProperty);
- bool haveProperty(SGPropertyNode* pProperty);
+ std::string PropPrefix = "", int Count = 1);
+ bool haveProperty(FlightRecorder::TSignalList& Capture, const SGPropertyNode* pProperty);
+ bool haveProperty(const SGPropertyNode* pProperty);
- int getConfig(SGPropertyNode* root, const char* typeStr, const FlightRecorder::TSignalList& SignalList);
+ int getConfig(SGPropertyNode* root, const char* typeStr, const FlightRecorder::TSignalList& SignalList);
SGPropertyNode_ptr m_RecorderNode;
SGPropertyNode_ptr m_ConfigNode;
-
+
SGPropertyNode_ptr m_ReplayMultiplayer;
SGPropertyNode_ptr m_ReplayExtraProperties;
SGPropertyNode_ptr m_ReplayMainView;
SGPropertyNode_ptr m_ReplayMainWindowPosition;
SGPropertyNode_ptr m_ReplayMainWindowSize;
-
+
SGPropertyNode_ptr m_RecordContinuous;
SGPropertyNode_ptr m_RecordExtraProperties;
-
+
SGPropertyNode_ptr m_LogRawSpeed;
-
+
// This contains copy of all properties that we are recording, so that we
// can send only differences.
//
SGPropertyNode_ptr m_RecordExtraPropertiesReference;
-
+
FlightRecorder::TSignalList m_CaptureDouble;
FlightRecorder::TSignalList m_CaptureFloat;
FlightRecorder::TSignalList m_CaptureInteger;
@@ -114,5 +95,3 @@ private:
bool m_usingDefaultConfig;
FGMultiplayMgr* m_MultiplayMgr;
};
-
-#endif /* FLIGHTRECORDER_HXX_ */