NavDisplay enhancements for Syd.

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

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 2e3f21e3f3d5fcaaf7549e8f79715e9eb535ebef..9d034800a7ab08aa1783ff239aa9d9dab5eede9c 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -14,6 +14,7 @@
 #include <simgear/structure/exception.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/sg_inlines.h>
+#include <simgear/props/props_io.hxx>
 
 #include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
@@ -36,13 +37,12 @@
 #include "kt_70.hxx"
 #include "mag_compass.hxx"
 #include "marker_beacon.hxx"
-#include "navradio.hxx"
+#include "newnavradio.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"
@@ -50,12 +50,13 @@
 #include "groundradar.hxx"
 #include "agradar.hxx"
 #include "rad_alt.hxx"
+#include "tcas.hxx"
+#include "NavDisplay.hxx"
 
 FGInstrumentMgr::FGInstrumentMgr () :
   _explicitGps(false)
-{
-    set_subsystem("od_gauge", new FGODGauge);
-    set_subsystem("hud", new HUD);
+{    
+    globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
 }
 
 FGInstrumentMgr::~FGInstrumentMgr ()
@@ -77,13 +78,13 @@ void FGInstrumentMgr::init()
   try {
     readProperties( config.str(), config_props );
     if (!build(config_props)) {
-      throw sg_error(
+      throw sg_exception(
                     "Detected an internal inconsistency in the instrumentation\n"
                     "system specification file.  See earlier errors for details.");
     }
-  } catch (const sg_exception&) {
+  } catch (const sg_exception& e) {
     SG_LOG(SG_COCKPIT, SG_ALERT, "Failed to load instrumentation system model: "
-                    << config.str() );
+                    << config.str() << ":" << e.getFormattedMessage() );
   }
 
 
@@ -134,7 +135,7 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
             subsystemname << '['<< index << ']';
         string id = subsystemname.str();
         _instruments.push_back(id);
-
+      
         if ( name == "adf" ) {
             set_subsystem( id, new ADF( node ), 0.15 );
 
@@ -184,7 +185,7 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
             set_subsystem( id, new FGMarkerBeacon( node ) );
 
         } else if ( name == "nav-radio" ) {
-            set_subsystem( id, new FGNavRadio( node ) );
+            set_subsystem( id, Instrumentation::NavRadio::createInstance( node ) );
 
         } else if ( name == "slip-skid-ball" ) {
             set_subsystem( id, new SlipSkidBall( node ) );
@@ -222,6 +223,12 @@ bool FGInstrumentMgr::build (SGPropertyNode* config_props)
         } else if ( name == "radar-altimeter" ) {
             set_subsystem( id, new radAlt( node ),1);
 
+        } else if ( name == "tcas" ) {
+            set_subsystem( id, new TCAS( node ) );
+        
+        } else if ( name == "navigation-display" ) {
+            set_subsystem( id, new NavDisplay( node ) );
+            
         } else {
             SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: "
                     << name );