Encapsulate the interpolstion version of FGEnvironment and fix some bugs

[flightgear.git] / src / FDM / JSBSim / FGOutput.cpp

diff --git a/src/FDM/JSBSim/FGOutput.cpp b/src/FDM/JSBSim/FGOutput.cpp
index afe6a7a8d84ff0d1680abfe868bd78cc3d40b1d6..c15d2f188656a7bb610fa219aba87856b81529df 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.cpp
+++ b/src/FDM/JSBSim/FGOutput.cpp
@@ -545,7 +545,7 @@ bool FGOutput::Load(FGConfigFile* AC_cfg)
       OutputProperties.push_back(PropertyManager->GetNode(property));
     }
 
-    if (Output_cfg->GetNextConfigLine() == "EOF") break;
+    if (parameter == "EOF") break;
   }
 
   OutRate = OutRate>120?120:(OutRate<0?0:OutRate);
@@ -590,6 +590,7 @@ void FGOutput::Debug(int from)
         cout << "  " << "Output parameters read inline" << endl;
       else
         cout << "    Output parameters read from file: " << outputInFileName << endl;
+
       if (Filename == "cout" || Filename == "COUT") {
         scratch = "    Log output goes to screen console";
       } else if (!Filename.empty()) {
@@ -603,6 +604,20 @@ void FGOutput::Debug(int from)
         cout << "  No log output" << endl;
         break;
       }
+      
+      if (SubSystems & ssSimulation)      cout << "    Simulation parameters logged" << endl;
+      if (SubSystems & ssAerosurfaces)    cout << "    Aerosurface parameters logged" << endl;
+      if (SubSystems & ssRates)           cout << "    Rate parameters logged" << endl;
+      if (SubSystems & ssVelocities)      cout << "    Velocity parameters logged" << endl;
+      if (SubSystems & ssForces)          cout << "    Force parameters logged" << endl;
+      if (SubSystems & ssMoments)         cout << "    Moments parameters logged" << endl;
+      if (SubSystems & ssAtmosphere)      cout << "    Atmosphere parameters logged" << endl;
+      if (SubSystems & ssMassProps)       cout << "    Mass parameters logged" << endl;
+      if (SubSystems & ssCoefficients)    cout << "    Coefficient parameters logged" << endl;
+      if (SubSystems & ssPosition)        cout << "    Position parameters logged" << endl;
+      if (SubSystems & ssGroundReactions) cout << "    Ground parameters logged" << endl;
+      if (SubSystems & ssFCS)             cout << "    FCS parameters logged" << endl;
+      if (SubSystems & ssPropulsion)      cout << "    Propulsion parameters logged" << endl;
     }
   }
   if (debug_lvl & 2 ) { // Instantiation/Destruction notification