TACAN: fix distance calculations and some other problems.

[flightgear.git] / src / Systems / system_mgr.cxx

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 21bf3f5cf0bb7f51141a516af8f5af0fd726f139..4661b338886b47e73f6ae2f7d61895fe26c71b46 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -3,14 +3,20 @@
 //
 // This file is in the Public Domain and comes with no warranty.
 
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
 #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>
 #include <Main/util.hxx>
 
+#include <cstdlib>
 #include <iostream>
 #include <string>
 #include <sstream>
@@ -20,56 +26,42 @@
 #include "pitot.hxx"
 #include "static.hxx"
 #include "vacuum.hxx"
-#include "submodel.hxx"
 
 
 FGSystemMgr::FGSystemMgr ()
 {
-    set_subsystem( "electrical", new FGElectricalSystem );
-    set_subsystem( "submodel", new SubmodelSystem() );
-
-    config_props = new SGPropertyNode;
+    SGPropertyNode_ptr config_props = new SGPropertyNode;
 
     SGPropertyNode *path_n = fgGetNode("/sim/systems/path");
 
     if (path_n) {
-        SGPath config( globals->get_fg_root() );
-        config.append( path_n->getStringValue() );
+        SGPath config = globals->resolve_aircraft_path(path_n->getStringValue());
 
-        SG_LOG( SG_ALL, SG_INFO, "Reading systems from "
+        SG_LOG( SG_SYSTEMS, SG_INFO, "Reading systems 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 systems");
-                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 systems system model: "
-                    << config.str() );
+        try
+        {
+          readProperties( config.str(), config_props );
+          build(config_props);
+        }
+        catch( const sg_exception& )
+        {
+          SG_LOG( SG_SYSTEMS, SG_ALERT, "Failed to load systems system model: "
+                  << config.str() );
         }
 
     } else {
-        SG_LOG( SG_ALL, SG_WARN,
+        SG_LOG( SG_SYSTEMS, SG_WARN,
                 "No systems model specified for this model!");
     }
 
-    delete config_props;
 }
 
 FGSystemMgr::~FGSystemMgr ()
 {
 }
 
-bool FGSystemMgr::build ()
+bool FGSystemMgr::build (SGPropertyNode* config_props)
 {
     SGPropertyNode *node;
     int i;
@@ -80,7 +72,10 @@ bool FGSystemMgr::build ()
         string name = node->getName();
         std::ostringstream temp;
         temp << i;
-        if ( name == "pitot" ) {
+        if ( name == "electrical" ) {
+            set_subsystem( "electrical" + temp.str(),
+                           new FGElectricalSystem( node ) );
+        } else if ( name == "pitot" ) {
             set_subsystem( "system" + temp.str(), 
                            new PitotSystem( node ) );
         } else if ( name == "static" ) {
@@ -90,9 +85,7 @@ bool FGSystemMgr::build ()
             set_subsystem( "system" + temp.str(), 
                            new VacuumSystem( node ) );
         } else {
-            SG_LOG( SG_ALL, SG_ALERT, "Unknown top level section: " 
-                    << name );
-            return false;
+            SG_LOG(SG_SYSTEMS, SG_ALERT, "Ignoring unknown system: " << name);
         }
     }
     return true;