fly/flightgear
1
0
Fork 0
Code Activity

FlightRecorder: smarter log warning.

Browse source 
When using the default (generic) config, which references many props which may not exist in a particular aircraft, suppress the 'recording non-existent' property warning.
This commit is contained in:
James Turner 2013-02-10 11:47:16 +00:00
parent 808f42e86a
commit d9159e719d
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Aircraft/flightrecorder.cxx
View file

@ -43,7 +43,8 @@ using std::string;
FGFlightRecorder::FGFlightRecorder(const char* pConfigName) :
m_RecorderNode(fgGetNode("/sim/flight-recorder", true)),
m_TotalRecordSize(0),
m_ConfigName(pConfigName)
m_ConfigName(pConfigName),
m_usingDefaultConfig(false)
{
}
@ -55,6 +56,7 @@ void
FGFlightRecorder::reinit(void)
{
m_ConfigNode = 0;
m_usingDefaultConfig = false;
SGPropertyNode_ptr ConfigNode;
int Selected = m_RecorderNode->getIntValue(m_ConfigName, 0);
@ -188,6 +190,7 @@ FGFlightRecorder::getDefault(void)
}
}
m_usingDefaultConfig = true;
return ConfigNode;
}
@ -254,9 +257,15 @@ FGFlightRecorder::processSignalList(const char* pSignalType, TSignalList& Signal
Capture.Signal = fgGetNode(PPath.c_str(),false);
if (!Capture.Signal.valid())
{
// warn user: we're maybe going to record useless data
// 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 << "'.");
// 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.
if (!m_usingDefaultConfig) {
// warn user: we're maybe going to record useless data
// 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);
}

1
src/Aircraft/flightrecorder.hxx
View file

@ -88,6 +88,7 @@ private:
int m_TotalRecordSize;
std::string m_ConfigName;
bool m_usingDefaultConfig;
};
#endif /* FLIGHTRECORDER_HXX_ */