fly/flightgear
1
0
Fork 0
Code Activity

Fixed autopilot/Predictor.

Browse source 
Signature of Predictor::configure must match AnalogComponent::configure,
otherwise the inherited method isn't overridden.
=> predictor couldn't be configured.
=> speed predictor rules in "generic-autopilot-helper.xml" weren't working.
This commit is contained in:
Thorsten Brehm 2010-10-08 21:41:09 +02:00
parent 9b2cea33e8
commit a4f1139fcd
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Autopilot/predictor.cxx
View file

@ -40,9 +40,18 @@ Predictor::Predictor () :
{
}
bool Predictor::configure(const string& nodeName, SGPropertyNode* configNode)
bool Predictor::configure(const string& nodeName, SGPropertyNode_ptr configNode)
{
SG_LOG( SG_AUTOPILOT, SG_BULK, "Predictor::configure(" << nodeName << ")" << endl );
if( AnalogComponent::configure( nodeName, configNode ) )
return true;
if( nodeName == "config" ) {
Component::configure( configNode );
return true;
}
if (nodeName == "seconds") {
_seconds.push_back( new InputValue( configNode, 0 ) );
return true;

2
src/Autopilot/predictor.hxx
View file

@ -53,7 +53,7 @@ private:
InputValueList _filter_gain;
protected:
bool configure(const std::string& nodeName, SGPropertyNode* configNode );
bool configure(const std::string& nodeName, SGPropertyNode_ptr configNode );
public:
Predictor();