builddir -> srcdir so builds can be done outside the master source directory.

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

diff --git a/src/FDM/JSBSim/FGOutput.cpp b/src/FDM/JSBSim/FGOutput.cpp
index 48663603cf800245688c75459f102bfdcc1492a4..a9fc0cac1bc3015f9ed1b032d305e992db5a3651 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.cpp
+++ b/src/FDM/JSBSim/FGOutput.cpp
@@ -178,12 +178,18 @@ void FGOutput::DelimitedOutput(void)
       cout << "Phi, Tht, Psi, ";
       cout << "Alpha, ";
       cout << "Latitude, ";
-      cout << "Longitude";
+      cout << "Longitude, ";
+      cout << "Distance AGL, ";
+      cout << "Runway Radius";
     }
     if (SubSystems & FGAircraft::ssCoefficients) {
       cout << ", ";
       cout << Aircraft->GetCoefficientStrings();
     }
+    if (SubSystems & FGAircraft::ssGroundReactions) {
+      cout << ", ";
+      cout << Aircraft->GetGroundReactionStrings();
+    }
 
     cout << endl;
     dFirstPass = false;
@@ -241,12 +247,18 @@ void FGOutput::DelimitedOutput(void)
     cout << Rotation->GetEuler() << ", ";
     cout << Translation->Getalpha() << ", ";
     cout << Position->GetLatitude() << ", ";
-    cout << Position->GetLongitude();
+    cout << Position->GetLongitude() << ", ";
+    cout << Position->GetDistanceAGL() << ", ";
+    cout << Position->GetRunwayRadius();
   }
   if (SubSystems & FGAircraft::ssCoefficients) {
     cout << ", ";
     cout << Aircraft->GetCoefficientValues();
   }
+  if (SubSystems & FGAircraft::ssGroundReactions) {
+    cout << ", ";
+    cout << Aircraft->GetGroundReactionValues();
+  }
   cout << endl;
 }
 
@@ -309,12 +321,18 @@ void FGOutput::DelimitedOutput(string fname)
       datafile << "Phi, Tht, Psi, ";
       datafile << "Alpha, ";
       datafile << "Latitude, ";
-      datafile << "Longitude";
+      datafile << "Longitude, ";
+      datafile << "Distance AGL, ";
+      datafile << "Runway Radius";
     }
     if (SubSystems & FGAircraft::ssCoefficients) {
       datafile << ", ";
       datafile << Aircraft->GetCoefficientStrings();
     }
+    if (SubSystems & FGAircraft::ssGroundReactions) {
+      datafile << ", ";
+      datafile << Aircraft->GetGroundReactionStrings();
+    }
     datafile << endl;
     sFirstPass = false;
   }
@@ -371,12 +389,18 @@ void FGOutput::DelimitedOutput(string fname)
     datafile << Rotation->GetEuler() << ", ";
     datafile << Translation->Getalpha() << ", ";
     datafile << Position->GetLatitude() << ", ";
-    datafile << Position->GetLongitude();
+    datafile << Position->GetLongitude() << ", ";
+    datafile << Position->GetDistanceAGL() << ", ";
+    datafile << Position->GetRunwayRadius();
   }
   if (SubSystems & FGAircraft::ssCoefficients) {
     datafile << ", ";
     datafile << Aircraft->GetCoefficientValues();
   }
+  if (SubSystems & FGAircraft::ssGroundReactions) {
+    datafile << ", ";
+    datafile << Aircraft->GetGroundReactionValues();
+  }
   datafile << endl;
   datafile.flush();
 }