Updated to match changes in radiostack.[ch]xx

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

diff --git a/src/FDM/JSBSim/FGAircraft.h b/src/FDM/JSBSim/FGAircraft.h
index b9624792d1995756abc0d29cd9cc389224d9b0b0..7d4b0be6145d63e3f5c992c776b4e54653b460d9 100644 (file)
--- a/src/FDM/JSBSim/FGAircraft.h
+++ b/src/FDM/JSBSim/FGAircraft.h
@@ -99,6 +99,10 @@ CLASS DOCUMENTATION
      Wiley & Sons, 1979 ISBN 0-471-03032-5</li>
      <li>Bernard Etkin, "Dynamics of Flight, Stability and Control", Wiley & Sons,
      1982 ISBN 0-471-08936-2</li></ol>
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGAircraft.h?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Header File </a>
+    @see <a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/jsbsim/JSBSim/FGAircraft.cpp?rev=HEAD&content-type=text/vnd.viewcvs-markup">
+         Source File </a>
 */
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -130,43 +134,39 @@ public:
   inline string GetAircraftName(void) { return AircraftName; }
   
   /// Gets the wing area
-  inline double GetWingArea(void) { return WingArea; }
+  double GetWingArea(void) const { return WingArea; }
   /// Gets the wing span
-  inline double GetWingSpan(void) { return WingSpan; }
+  double GetWingSpan(void) const { return WingSpan; }
   /// Gets the average wing chord
-  inline double Getcbar(void) { return cbar; }
-  inline double GetWingIncidence(void) { return WingIncidence; }
-  inline double GetHTailArea(void) { return HTailArea; }
-  inline double GetHTailArm(void)  { return HTailArm; }
-  inline double GetVTailArea(void) { return VTailArea; }
-  inline double GetVTailArm(void)  { return VTailArm; }
-  inline double Getlbarh(void) { return lbarh; } // HTailArm / cbar
-  inline double Getlbarv(void) { return lbarv; } // VTailArm / cbar
-  inline double Getvbarh(void) { return vbarh; } // H. Tail Volume
-  inline double Getvbarv(void) { return vbarv; } // V. Tail Volume
+  double Getcbar(void) const { return cbar; }
+  inline double GetWingIncidence(void) const { return WingIncidence; }
+  inline double GetHTailArea(void) const { return HTailArea; }
+  inline double GetHTailArm(void)  const { return HTailArm; }
+  inline double GetVTailArea(void) const { return VTailArea; }
+  inline double GetVTailArm(void)  const { return VTailArm; }
+  inline double Getlbarh(void) const { return lbarh; } // HTailArm / cbar
+  inline double Getlbarv(void) const { return lbarv; } // VTailArm / cbar
+  inline double Getvbarh(void) const { return vbarh; } // H. Tail Volume
+  inline double Getvbarv(void) const { return vbarv; } // V. Tail Volume
   inline FGColumnVector3& GetMoments(void) { return vMoments; }
-  inline double GetMoments(int idx) { return vMoments(idx); }
+  inline double GetMoments(int idx) const { return vMoments(idx); }
   inline FGColumnVector3& GetForces(void) { return vForces; }
-  inline double GetForces(int idx) { return vForces(idx); }
+  inline double GetForces(int idx) const { return vForces(idx); }
   inline FGColumnVector3& GetBodyAccel(void) { return vBodyAccel; }
-  inline FGColumnVector3& GetNcg   (void)    { return vNcg; }
+  inline FGColumnVector3& GetNcg   (void)  { return vNcg; }
   inline FGColumnVector3& GetXYZrp(void) { return vXYZrp; }
   inline FGColumnVector3& GetXYZep(void) { return vXYZep; }
-  inline double GetXYZrp(int idx) { return vXYZrp(idx); }
-  inline double GetXYZep(int idx) { return vXYZep(idx); }
-  inline double GetAlphaCLMax(void) { return alphaclmax; }
-  inline double GetAlphaCLMin(void) { return alphaclmin; }
-
-  inline void SetAlphaCLMax(double tt) { alphaclmax=tt; }
-  inline void SetAlphaCLMin(double tt) { alphaclmin=tt; }
+  inline double GetXYZrp(int idx) const { return vXYZrp(idx); }
+  inline double GetXYZep(int idx) const { return vXYZep(idx); }
   inline void SetAircraftName(string name) {AircraftName = name;}
-  
-  inline double GetStallWarn(void) { return impending_stall; }
-  
+
   float GetNlf(void);
-  
+
   inline FGColumnVector3& GetNwcg(void) { return vNwcg; }
 
+  void bind(void);
+  void unbind(void);
+
 private:
   FGColumnVector3 vMoments;
   FGColumnVector3 vForces;
@@ -181,8 +181,6 @@ private:
   double WingArea, WingSpan, cbar, WingIncidence;
   double HTailArea, VTailArea, HTailArm, VTailArm;
   double lbarh,lbarv,vbarh,vbarv;
-  double alphaclmax,alphaclmin;
-  double impending_stall;
   string AircraftName;
 
   void Debug(int from);