X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Finstrument_mgr.cxx;h=da82cce9529b2e35eb1999b9975f8e0888861340;hb=43880b201cea2b120fefd99696ae0b43227358dc;hp=765c487158852c8ba9cbf1d1d3b1547ab5a8d807;hpb=5289055776b645f25234f1f1f012727baa31e863;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 765c48715..da82cce95 100644
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -3,58 +3,203 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#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 <Instrumentation/HUD/HUD.hxx>
 
 #include "instrument_mgr.hxx"
+#include "adf.hxx"
+#include "airspeed_indicator.hxx"
 #include "altimeter.hxx"
 #include "attitude_indicator.hxx"
+#include "clock.hxx"
+#include "dme.hxx"
+#include "gps.hxx"
+#include "gsdi.hxx"
 #include "heading_indicator.hxx"
+#include "heading_indicator_fg.hxx"
+#include "heading_indicator_dg.hxx"
+#include "kr_87.hxx"
+#include "kt_70.hxx"
+#include "mag_compass.hxx"
+#include "marker_beacon.hxx"
+#include "navradio.hxx"
+#include "slip_skid_ball.hxx"
+#include "transponder.hxx"
+#include "turn_indicator.hxx"
 #include "vertical_speed_indicator.hxx"
-
+#include "inst_vertical_speed_indicator.hxx"
+#include "od_gauge.hxx"
+#include "wxradar.hxx"
+#include "tacan.hxx"
+#include "mk_viii.hxx"
+#include "mrg.hxx"
+#include "groundradar.hxx"
+#include "agradar.hxx"
+#include "rad_alt.hxx"
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
-    // NO-OP
-}
+    set_subsystem("od_gauge", new FGODGauge);
+    set_subsystem("hud", new HUD);
 
-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() ) {
+                throw sg_throwable(string(
+                        "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!");
     }
-}
 
-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
-}
+    for ( int i = 0; i < config_props->nChildren(); ++i ) {
+        SGPropertyNode *node = config_props->getChild(i);
+        string name = node->getName();
 
-void
-FGInstrumentMgr::update (double dt)
-{
-    for (unsigned int i = 0; i < _instruments.size(); i++)
-        _instruments[i]->update(dt);
+        std::ostringstream subsystemname;
+        subsystemname << "instrument-" << i << '-'
+                << node->getStringValue("name", name.c_str());
+        int index = node->getIntValue("number", 0);
+        if (index > 0)
+            subsystemname << '['<< index << ']';
+        string id = subsystemname.str();
+
+
+        if ( name == "adf" ) {
+            set_subsystem( id, new ADF( node ), 0.15 );
+
+        } else if ( name == "airspeed-indicator" ) {
+            set_subsystem( id, new AirspeedIndicator( node ) );
+
+        } else if ( name == "altimeter" ) {
+            set_subsystem( id, new Altimeter( node ) );
+
+        } else if ( name == "attitude-indicator" ) {
+            set_subsystem( id, new AttitudeIndicator( node ) );
+
+        } else if ( name == "clock" ) {
+            set_subsystem( id, new Clock( node ), 0.25 );
+
+        } else if ( name == "dme" ) {
+            set_subsystem( id, new DME( node ), 1.0 );
+
+        } else if ( name == "encoder" ) {
+            set_subsystem( id, new Altimeter( node ) );
+
+        } else if ( name == "gps" ) {
+            set_subsystem( id, new GPS( node ), 0.45 );
+
+        } else if ( name == "gsdi" ) {
+            set_subsystem( id, new GSDI( node ) );
+
+        } else if ( name == "heading-indicator" ) {
+            set_subsystem( id, new HeadingIndicator( node ) );
+
+        } else if ( name == "heading-indicator-fg" ) {
+            set_subsystem( id, new HeadingIndicatorFG( node ) );
+
+        } else if ( name == "heading-indicator-dg" ) {
+            set_subsystem( id, new HeadingIndicatorDG( node ) );
+
+        } else if ( name == "KR-87" ) {
+            set_subsystem( id, new FGKR_87( node ) );
+
+        } else if ( name == "KT-70" ) {
+            set_subsystem( id, new FGKT_70( node ) );
+
+        } else if ( name == "magnetic-compass" ) {
+            set_subsystem( id, new MagCompass( node ) );
+
+        } else if ( name == "marker-beacon" ) {
+            set_subsystem( id, new FGMarkerBeacon( node ) );
+
+        } else if ( name == "nav-radio" ) {
+            set_subsystem( id, new FGNavRadio( node ) );
+
+        } else if ( name == "slip-skid-ball" ) {
+            set_subsystem( id, new SlipSkidBall( node ) );
+
+        } else if ( name == "transponder" ) {
+            set_subsystem( id, new Transponder( node ) );
+
+        } else if ( name == "turn-indicator" ) {
+            set_subsystem( id, new TurnIndicator( node ) );
+
+        } else if ( name == "vertical-speed-indicator" ) {
+            set_subsystem( id, new VerticalSpeedIndicator( node ) );
+
+        } else if ( name == "radar" ) {
+            set_subsystem( id, new wxRadarBg ( node ), 1);
+
+        } else if ( name == "inst-vertical-speed-indicator" ) {
+            set_subsystem( id, new InstVerticalSpeedIndicator( node ) );
+
+        } else if ( name == "tacan" ) {
+            set_subsystem( id, new TACAN( node ) );
+
+        } else if ( name == "mk-viii" ) {
+            set_subsystem( id, new MK_VIII( node ) );
+
+        } else if ( name == "master-reference-gyro" ) {
+            set_subsystem( id, new MasterReferenceGyro( node ) );
+
+        } else if ( name == "groundradar" ) {
+            set_subsystem( id, new GroundRadar( node ), 1 );
+
+        } else if ( name == "air-ground-radar" ) {
+            set_subsystem( id, new agRadar( node ),1);
+
+        } else if ( name == "radar-altimeter" ) {
+            set_subsystem( id, new radAlt( node ),1);
+
+        } else {
+            SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: "
+                    << name );
+            return false;
+        }
+    }
+    return true;
 }
 
 // end of instrument_manager.cxx