Updates from JSBSim, including new turbine engine model from David Culp

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

diff --git a/src/FDM/JSBSim/FGOutput.h b/src/FDM/JSBSim/FGOutput.h
index a87f6348bc997c094340fa4726fea09fe11e04ae..83b0d7c88c6f7b3cdff0ac9253d6935f2d39be00 100644 (file)
--- a/src/FDM/JSBSim/FGOutput.h
+++ b/src/FDM/JSBSim/FGOutput.h
@@ -62,6 +62,8 @@ INCLUDES
 CLASS DECLARATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+namespace JSBSim {
+
 class FGOutput : public FGModel
 {
 public:
@@ -82,7 +84,7 @@ public:
   bool Load(FGConfigFile* AC_cfg);
 
   /// Subsystem types for specifying which will be output in the FDM data logging
-  enum  SubSystems {
+  enum  eSubSystems {
     /** Subsystem: Simulation (= 1)          */ ssSimulation      = 1,
     /** Subsystem: Aerosurfaces (= 2)        */ ssAerosurfaces    = 2,
     /** Subsystem: Body rates (= 4)          */ ssRates           = 4,
@@ -101,13 +103,14 @@ public:
 private:
   bool sFirstPass, dFirstPass, enabled;
   int SubSystems;
-  string Filename;
+  string Filename, outputInFileName;
   enum {otNone, otCSV, otTab, otSocket, otTerminal, otUnknown} Type;
   ofstream datafile;
   FGfdmSocket* socket;
+  vector <FGPropertyManager*> OutputProperties;
   void Debug(int from);
 };
-
+}
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 #endif