Change from Dave Perry:

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

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 85e8b87795955eb8e8a1e856a0ce03fe14fda215..01de836b388c440def7f4d7a84fd1fd44225f963 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -3,6 +3,10 @@
 //
 // 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>
@@ -35,11 +39,16 @@
 #include "transponder.hxx"
 #include "turn_indicator.hxx"
 #include "vertical_speed_indicator.hxx"
+#include "inst_vertical_speed_indicator.hxx" // (TJ)
+#include "od_gauge.hxx"
+#include "wxradar.hxx"
+#include "tacan.hxx" 
 
 
 FGInstrumentMgr::FGInstrumentMgr ()
 {
     set_subsystem("annunciator", new Annunciator);
+    set_subsystem("od_gauge", new FGODGauge, 1.0);
 
     config_props = new SGPropertyNode;
 
@@ -58,13 +67,13 @@ FGInstrumentMgr::FGInstrumentMgr ()
                 enabled = true;
             } else {
                 SG_LOG( SG_ALL, SG_ALERT,
-                        "Detected an internal inconsistancy in the instrumentation");
+                        "Detected an internal inconsistency 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() );
@@ -147,6 +156,15 @@ bool FGInstrumentMgr::build ()
         } else if ( name == "vertical-speed-indicator" ) {
             set_subsystem( "instrument" + temp.str(), 
                            new VerticalSpeedIndicator( node ) );
+        } else if ( name == "wxradar" ) {
+            set_subsystem( "instrument" + temp.str(), 
+                           new wxRadarBg ( node ), 0.5 );
+        } else if ( name == "inst-vertical-speed-indicator" ) { // (TJ)
+            set_subsystem( "instrument" + temp.str(), 
+                           new InstVerticalSpeedIndicator( node ) );
+        } else if ( name == "tacan" ) { 
+            set_subsystem( "instrument" + temp.str(), 
+                           new TACAN( node ) );
         } else {
             SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: " 
                     << name );