Fixes to jsbsim.

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

diff --git a/src/FDM/JSBSim/FGModel.h b/src/FDM/JSBSim/FGModel.h
index d583d91949e6ad6fa419ba42047bfbcc1c997370..c42f9075344e86cdc16df8a4182117e638526e3c 100644 (file)
--- a/src/FDM/JSBSim/FGModel.h
+++ b/src/FDM/JSBSim/FGModel.h
@@ -41,19 +41,18 @@ INCLUDES
 #include "FGDefs.h"
 
 #ifdef FGFS
-#  include <Include/compiler.h>
-#  include STL_STRING
+#  include <simgear/compiler.h>
 #  ifdef FG_HAVE_STD_INCLUDES
 #    include <iostream>
 #  else
 #    include <iostream.h>
 #  endif
-   FG_USING_STD(string);
 #else
-#  include <string>
 #  include <iostream>
 #endif
 
+#include <string>
+
 /*******************************************************************************
 DEFINES
 *******************************************************************************/
@@ -79,15 +78,23 @@ class FGModel
 {
 public:
   FGModel(FGFDMExec*);
-  ~FGModel(void);
+  virtual ~FGModel(void);
 
   FGModel* NextModel;
   string Name;
   virtual bool Run(void);
   virtual bool InitModel(void);
-  void SetRate(int tt) {rate = tt;};
+  virtual void SetRate(int tt) {rate = tt;}
+  virtual int  GetRate(void)   {return rate;}
 
 protected:
+  enum {eU=1, eV, eW};
+  enum {eNorth=1, eEast, eDown};
+  enum {eP=1, eQ, eR};
+  enum {eL=1, eM, eN};
+  enum {eX=1, eY, eZ};
+  enum {ePhi=1, eTht, ePsi};
+
   int exe_ctr;
   int rate;