fly/flightgear
1
0
Fork 0
Code Activity

Reset - instruments can be re-inited now (reloads XML files)

Browse source
This commit is contained in:
James Turner 2010-07-04 23:03:05 +01:00
parent 388a0a5b6a
commit 7aba4333a2
3 changed files with 61 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Instrumentation/gps.cxx
View file

@ -145,10 +145,10 @@ public:
DeprecatedPropListener(SGPropertyNode* gps)
{
_parents.insert(gps);
SGPropertyNode* wp = gps->getChild("wp");
SGPropertyNode* wp = gps->getChild("wp", 0, true);
_parents.insert(wp);
_parents.insert(wp->getChild("wp", 0));
_parents.insert(wp->getChild("wp", 1));
_parents.insert(wp->getChild("wp", 0, true));
_parents.insert(wp->getChild("wp", 1, true));
std::set<SGPropertyNode*>::iterator it;
for (it = _parents.begin(); it != _parents.end(); ++it) {

87
src/Instrumentation/instrument_mgr.cxx
View file

@ -56,47 +56,62 @@ FGInstrumentMgr::FGInstrumentMgr () :
{
set_subsystem("od_gauge", new FGODGauge);
set_subsystem("hud", new HUD);
SGPropertyNode_ptr config_props = new SGPropertyNode;
SGPropertyNode *path_n = fgGetNode("/sim/instrumentation/path");
if (path_n) {
SGPath config = globals->resolve_aircraft_path(path_n->getStringValue());
SG_LOG( SG_ALL, SG_INFO, "Reading instruments from "
<< config.str() );
try {
readProperties( config.str(), config_props );
if ( !build(config_props) ) {
throw sg_error(
"Detected an internal inconsistency in the instrumentation\n"
"system specification file. See earlier errors for details.");
}
} catch (const sg_exception&) {
SG_LOG( SG_ALL, SG_ALERT, "Failed to load instrumentation system model: "
<< config.str() );
}
} else {
SG_LOG( SG_ALL, SG_WARN,
"No instrumentation model specified for this model!");
}
if (!_explicitGps) {
SG_LOG(SG_INSTR, SG_INFO, "creating default GPS instrument");
SGPropertyNode_ptr nd(new SGPropertyNode);
nd->setStringValue("name", "gps");
nd->setIntValue("number", 0);
set_subsystem("gps[0]", new GPS(nd));
}
}
FGInstrumentMgr::~FGInstrumentMgr ()
{
}
void FGInstrumentMgr::init()
{
SGPropertyNode_ptr config_props = new SGPropertyNode;
SGPropertyNode* path_n = fgGetNode("/sim/instrumentation/path");
if (!path_n) {
SG_LOG(SG_COCKPIT, SG_WARN, "No instrumentation model specified for this model!");
return;
}
SGPath config = globals->resolve_aircraft_path(path_n->getStringValue());
SG_LOG( SG_COCKPIT, SG_INFO, "Reading instruments from " << config.str() );
try {
readProperties( config.str(), config_props );
if (!build(config_props)) {
throw sg_error(
"Detected an internal inconsistency in the instrumentation\n"
"system specification file. See earlier errors for details.");
}
} catch (const sg_exception&) {
SG_LOG(SG_COCKPIT, SG_ALERT, "Failed to load instrumentation system model: "
<< config.str() );
}
if (!_explicitGps) {
SG_LOG(SG_INSTR, SG_INFO, "creating default GPS instrument");
SGPropertyNode_ptr nd(new SGPropertyNode);
nd->setStringValue("name", "gps");
nd->setIntValue("number", 0);
set_subsystem("gps[0]", new GPS(nd));
}
SGSubsystemGroup::init();
}
void FGInstrumentMgr::reinit()
{
// delete all our instrument
for (unsigned int i=0; i<_instruments.size(); ++i) {
const std::string& nm(_instruments[i]);
SGSubsystem* instr = get_subsystem(nm);
instr->unbind();
remove_subsystem(nm);
delete instr;
}
init();
}
bool FGInstrumentMgr::build (SGPropertyNode* config_props)
{
for ( int i = 0; i < config_props->nChildren(); ++i ) {
@ -110,7 +125,7 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
if (index > 0)
subsystemname << '['<< index << ']';
string id = subsystemname.str();
_instruments.push_back(id);
if ( name == "adf" ) {
set_subsystem( id, new ADF( node ), 0.15 );

9
src/Instrumentation/instrument_mgr.hxx
View file

@ -31,10 +31,15 @@ public:
FGInstrumentMgr ();
virtual ~FGInstrumentMgr ();
bool build (SGPropertyNode* config_props);
virtual void init();
virtual void reinit();
private:
bool build (SGPropertyNode* config_props);
bool _explicitGps;
std::vector<std::string> _instruments;
};
#endif // __INSTRUMENT_MGR_HXX