X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FInstrumentation%2Finstrument_mgr.cxx;h=9d034800a7ab08aa1783ff239aa9d9dab5eede9c;hb=caf0138ab35b03bbe7bf367ff2222d0a31be3157;hp=380ccd2ee8bae6dbae57b02ace3ebc969a2e675b;hpb=5aa51e5780d6316822f6cf7f636c36b9fa6b6a34;p=flightgear.git

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 380ccd2ee..9d034800a 100644
--- 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,57 +50,78 @@
 #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);
-
-    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() );
+{    
+    globals->add_subsystem("hud", new HUD, SGSubsystemMgr::DISPLAY);
+}
 
-        SG_LOG( SG_ALL, SG_INFO, "Reading instruments from "
-                << config.str() );
-        try {
-            readProperties( config.str(), config_props );
+FGInstrumentMgr::~FGInstrumentMgr ()
+{
+}
 
-            if ( !build() ) {
-                throw sg_error(
+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_exception(
                     "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!");
-    }
-
-    delete config_props;
-    
-    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));
     }
+  } catch (const sg_exception& e) {
+    SG_LOG(SG_COCKPIT, SG_ALERT, "Failed to load instrumentation system model: "
+                    << config.str() << ":" << e.getFormattedMessage() );
+  }
+
+
+  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);
+    _instruments.push_back("gps[0]");
+    set_subsystem("gps[0]", new GPS(nd));
+  }
+
+  // bind() created instruments before init.
+  for (unsigned int i=0; i<_instruments.size(); ++i) {
+    const std::string& nm(_instruments[i]);
+    SGSubsystem* instr = get_subsystem(nm);
+    instr->bind();
+  }
+
+  SGSubsystemGroup::init();
 }
 
-FGInstrumentMgr::~FGInstrumentMgr ()
-{
+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 ()
+bool FGInstrumentMgr::build (SGPropertyNode* config_props)
 {
     for ( int i = 0; i < config_props->nChildren(); ++i ) {
         SGPropertyNode *node = config_props->getChild(i);
@@ -113,8 +134,8 @@ bool FGInstrumentMgr::build ()
         if (index > 0)
             subsystemname << '['<< index << ']';
         string id = subsystemname.str();
-
-
+        _instruments.push_back(id);
+      
         if ( name == "adf" ) {
             set_subsystem( id, new ADF( node ), 0.15 );
 
@@ -164,7 +185,7 @@ bool FGInstrumentMgr::build ()
             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 ) );
@@ -202,6 +223,12 @@ bool FGInstrumentMgr::build ()
         } 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 );