fly/flightgear
1
0
Fork 0
Code Activity

Merge branch 'torsten/proplist' into next

Browse source
This commit is contained in:
Tim Moore 2010-04-19 12:22:48 +02:00
commit 4fae1160d4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Autopilot/xmlauto.cxx
View file

@ -40,6 +40,8 @@
using std::cout; using std::cout;
using std::endl; using std::endl;
using simgear::PropertyList;
FGPeriodicalValue::FGPeriodicalValue( SGPropertyNode_ptr root ) FGPeriodicalValue::FGPeriodicalValue( SGPropertyNode_ptr root )
{ {
SGPropertyNode_ptr minNode = root->getChild( "min" ); SGPropertyNode_ptr minNode = root->getChild( "min" );

10
src/Autopilot/xmlauto.hxx
View file

@ -49,8 +49,6 @@ and writes properties used only by a few aircraft.
#include <simgear/structure/subsystem_mgr.hxx> #include <simgear/structure/subsystem_mgr.hxx>
#include <simgear/props/condition.hxx> #include <simgear/props/condition.hxx>
using simgear::PropertyList;
typedef SGSharedPtr<class FGXMLAutoInput> FGXMLAutoInput_ptr; typedef SGSharedPtr<class FGXMLAutoInput> FGXMLAutoInput_ptr;
typedef SGSharedPtr<class FGPeriodicalValue> FGPeriodicalValue_ptr; typedef SGSharedPtr<class FGPeriodicalValue> FGPeriodicalValue_ptr;
@ -124,7 +122,7 @@ class FGXMLAutoInputList : public std::vector<FGXMLAutoInput_ptr> {
class FGXMLAutoComponent : public SGReferenced { class FGXMLAutoComponent : public SGReferenced {
private: private:
PropertyList output_list; simgear::PropertyList output_list;
SGSharedPtr<const SGCondition> _condition; SGSharedPtr<const SGCondition> _condition;
SGPropertyNode_ptr enable_prop; SGPropertyNode_ptr enable_prop;
@ -203,7 +201,8 @@ public:
// helpful for things like flight directors which position // helpful for things like flight directors which position
// their vbars from the autopilot computations. // their vbars from the autopilot computations.
if ( honor_passive && passive_mode->getBoolValue() ) return; if ( honor_passive && passive_mode->getBoolValue() ) return;
for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it) for( simgear::PropertyList::iterator it = output_list.begin();
it != output_list.end(); ++it)
(*it)->setDoubleValue( clamp( value ) ); (*it)->setDoubleValue( clamp( value ) );
} }
@ -214,7 +213,8 @@ public:
// helpful for things like flight directors which position // helpful for things like flight directors which position
// their vbars from the autopilot computations. // their vbars from the autopilot computations.
if ( honor_passive && passive_mode->getBoolValue() ) return; if ( honor_passive && passive_mode->getBoolValue() ) return;
for( PropertyList::iterator it = output_list.begin(); it != output_list.end(); ++it) for( simgear::PropertyList::iterator it = output_list.begin();
it != output_list.end(); ++it)
(*it)->setBoolValue( value ); // don't use clamp here, bool is clamped anyway (*it)->setBoolValue( value ); // don't use clamp here, bool is clamped anyway
} }