Begin a rewrite of the magnetic compass code. So far, only northerly

[flightgear.git] / src / Instrumentation / instrument_mgr.cxx

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 765c487158852c8ba9cbf1d1d3b1547ab5a8d807..5a47f63a33e0178826daec8da638e8a5ba58cf19 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -3,58 +3,145 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#include <iostream>
+#include <string>
+#include <sstream>
+
+#include <simgear/structure/exception.hxx>
+#include <simgear/misc/sg_path.hxx>
+#include <simgear/sg_inlines.h>
+
+#include <Main/fg_props.hxx>
+#include <Main/globals.hxx>
+#include <Main/util.hxx>
 
 #include "instrument_mgr.hxx"
+#include "adf.hxx"
+#include "airspeed_indicator.hxx"
 #include "altimeter.hxx"
+#include "annunciator.hxx"
 #include "attitude_indicator.hxx"
+#include "clock.hxx"
+#include "dme.hxx"
+#include "encoder.hxx"
+#include "gps.hxx"
 #include "heading_indicator.hxx"
+#include "kr_87.hxx"
+#include "mag_compass.hxx"
+#include "slip_skid_ball.hxx"
+#include "transponder.hxx"
+#include "turn_indicator.hxx"
 #include "vertical_speed_indicator.hxx"
 
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
-    // NO-OP
-}
+    set_subsystem("annunciator", new Annunciator);
 
-FGInstrumentMgr::~FGInstrumentMgr ()
-{
-    for (unsigned int i = 0; i < _instruments.size(); i++) {
-        delete _instruments[i];
-        _instruments[i] = 0;
+    config_props = new SGPropertyNode;
+
+    SGPropertyNode *path_n = fgGetNode("/sim/instrumentation/path");
+
+    if (path_n) {
+        SGPath config( globals->get_fg_root() );
+        config.append( path_n->getStringValue() );
+
+        SG_LOG( SG_ALL, SG_INFO, "Reading instruments from "
+                << config.str() );
+        try {
+            readProperties( config.str(), config_props );
+
+            if ( build() ) {
+                enabled = true;
+            } else {
+                SG_LOG( SG_ALL, SG_ALERT,
+                        "Detected an internal inconsistancy in the instrumentation");
+                SG_LOG( SG_ALL, SG_ALERT,
+                        " system specification file.  See earlier errors for" );
+                SG_LOG( SG_ALL, SG_ALERT,
+                        " details.");
+                exit(-1);
+            }        
+        } catch (const sg_exception& exc) {
+            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!");
     }
-}
 
-void
-FGInstrumentMgr::init ()
-{
-                                // TODO: replace with XML configuration
-    _instruments.push_back(new Altimeter);
-    _instruments.push_back(new AttitudeIndicator);
-    _instruments.push_back(new HeadingIndicator);
-    _instruments.push_back(new VerticalSpeedIndicator);
-
-                                // Initialize the individual instruments
-    for (unsigned int i = 0; i < _instruments.size(); i++)
-        _instruments[i]->init();
+    delete config_props;
 }
 
-void
-FGInstrumentMgr::bind ()
+FGInstrumentMgr::~FGInstrumentMgr ()
 {
-    // NO-OP
 }
 
-void
-FGInstrumentMgr::unbind ()
+bool FGInstrumentMgr::build ()
 {
-    // NO-OP
-}
+    SGPropertyNode *node;
+    int i;
 
-void
-FGInstrumentMgr::update (double dt)
-{
-    for (unsigned int i = 0; i < _instruments.size(); i++)
-        _instruments[i]->update(dt);
+    int count = config_props->nChildren();
+    for ( i = 0; i < count; ++i ) {
+        node = config_props->getChild(i);
+        string name = node->getName();
+        std::ostringstream temp;
+        temp << i;
+        if ( name == "adf" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new ADF( node ), 0.15 );
+        } else if ( name == "airspeed-indicator" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new AirspeedIndicator( node ) );
+        } else if ( name == "altimeter" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new Altimeter( node ) );
+        } else if ( name == "attitude-indicator" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new AttitudeIndicator( node ) );
+        } else if ( name == "clock" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new Clock( node ), 0.25 );
+        } else if ( name == "dme" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new DME( node ), 1.0 );
+        } else if ( name == "encoder" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new Encoder( node ) );
+        } else if ( name == "heading-indicator" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new HeadingIndicator( node ) );
+        } else if ( name == "KR-87" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new FGKR_87( node ) );
+        } else if ( name == "magnetic-compass" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new MagCompass( node ) );
+        } else if ( name == "slip-skid-ball" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new SlipSkidBall( node ) );
+        } else if ( name == "transponder" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new Transponder( node ) );
+        } else if ( name == "turn-indicator" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new TurnIndicator( node ) );
+        } else if ( name == "vertical-speed-indicator" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new VerticalSpeedIndicator( node ) );
+        } else if ( name == "gps" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new GPS( node ), 0.45 );
+        } else {
+            SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: " 
+                    << name );
+            return false;
+        }
+    }
+    return true;
 }
 
 // end of instrument_manager.cxx