Andreas Gaeb: fix #222 (JSBSIm reset problems)

[flightgear.git] / src / FDM / JSBSim / models / FGFCS.cpp

diff --git a/src/FDM/JSBSim/models/FGFCS.cpp b/src/FDM/JSBSim/models/FGFCS.cpp
index f5bbba07d885103ff29cb796df7993f3df08bd34..f0b77007d23cbabd0b344cf67fdde1e14bd4d791 100644 (file)
--- a/src/FDM/JSBSim/models/FGFCS.cpp
+++ b/src/FDM/JSBSim/models/FGFCS.cpp
@@ -63,7 +63,7 @@ using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id: FGFCS.cpp,v 1.68 2010/03/18 13:21:24 jberndt Exp $";
+static const char *IdSrc = "$Id: FGFCS.cpp,v 1.72 2010/11/18 12:38:06 jberndt Exp $";
 static const char *IdHdr = ID_FCS;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -183,6 +183,17 @@ bool FGFCS::InitModel(void)
   return true;
 }
   
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGFCS::LateBind(void)
+{
+  unsigned int i;
+
+  for (i=0; i<Systems.size(); i++) Systems[i]->LateBind();
+  for (i=0; i<APComponents.size(); i++) APComponents[i]->LateBind();
+  for (i=0; i<FCSComponents.size(); i++) FCSComponents[i]->LateBind();
+}
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 // Notes: In this logic the default engine commands are set. This is simply a
 // sort of safe-mode method in case the user has not defined control laws for
@@ -207,7 +218,7 @@ bool FGFCS::Run(void)
 
   // Set the default steering angle
   for (i=0; i<SteerPosDeg.size(); i++) {
-    FGLGear* gear = GroundReactions->GetGearUnit(i);
+    FGLGear* gear = FDMExec->GetGroundReactions()->GetGearUnit(i);
     SteerPosDeg[i] = gear->GetDefaultSteerAngle( GetDsCmd() );
   }
 
@@ -705,18 +716,18 @@ string FGFCS::FindSystemFullPathname(const string& sysfilename)
     system_filename.append(".xml");
   }
 
-  system_file.open(string(fullpath + system_filename).c_str());
+  system_file.open(string(localpath + system_filename).c_str());
   if ( !system_file.is_open()) {
-    system_file.open(string(localpath + system_filename).c_str());
+    system_file.open(string(fullpath + system_filename).c_str());
       if ( !system_file.is_open()) {
         cerr << " Could not open system file: " << system_filename << " in path "
              << fullpath << " or " << localpath << endl;
         return string("");
       } else {
-        return string(localpath + system_filename);
+        return string(fullpath + system_filename);
       }
   }
-  return string(fullpath + system_filename);
+  return string(localpath + system_filename);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -736,9 +747,9 @@ ifstream* FGFCS::FindSystemFile(const string& sysfilename)
     system_filename.append(".xml");
   }
 
-  system_file->open(string(fullpath + system_filename).c_str());
+  system_file->open(string(localpath + system_filename).c_str());
   if ( !system_file->is_open()) {
-    system_file->open(string(localpath + system_filename).c_str());
+    system_file->open(string(fullpath + system_filename).c_str());
       if ( !system_file->is_open()) {
         cerr << " Could not open system file: " << system_filename << " in path "
              << fullpath << " or " << localpath << endl;
@@ -749,7 +760,7 @@ ifstream* FGFCS::FindSystemFile(const string& sysfilename)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-string FGFCS::GetComponentStrings(const string& delimiter)
+string FGFCS::GetComponentStrings(const string& delimiter) const
 {
   unsigned int comp;
   string CompStrings = "";
@@ -786,7 +797,7 @@ string FGFCS::GetComponentStrings(const string& delimiter)
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-string FGFCS::GetComponentValues(const string& delimiter)
+string FGFCS::GetComponentValues(const string& delimiter) const
 {
   std::ostringstream buf;
 
@@ -953,7 +964,7 @@ void FGFCS::bindModel(void)
   string tmp;
 
   for (i=0; i<SteerPosDeg.size(); i++) {
-    if (GroundReactions->GetGearUnit(i)->GetSteerable()) {
+    if (FDMExec->GetGroundReactions()->GetGearUnit(i)->GetSteerable()) {
       tmp = CreateIndexedPropertyName("fcs/steer-pos-deg", i);
       PropertyManager->Tie( tmp.c_str(), this, i, &FGFCS::GetSteerPosDeg, &FGFCS::SetSteerPosDeg);
     }