Fix stall widths for the "auxilliary" (reverse flow) stalls so they

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

diff --git a/src/FDM/JSBSim/FGPropeller.h b/src/FDM/JSBSim/FGPropeller.h
index 25575c5559fea6d5fa4347f6bb03516eac565884..0434e694303038a9de25e49e1eec37412a8e5649 100644 (file)
--- a/src/FDM/JSBSim/FGPropeller.h
+++ b/src/FDM/JSBSim/FGPropeller.h
@@ -89,7 +89,7 @@ public:
   /** Constructor for FGPropeller.
       @param exec a pointer to the main executive object
       @param AC_cfg a pointer to the main aircraft config file object */
-  FGPropeller(FGFDMExec* exec, FGConfigFile* AC_cfg);
+  FGPropeller(FGFDMExec* exec, FGConfigFile* AC_cfg, int num = 0);
 
   /// Destructor for FGPropeller - deletes the FGTable objects
   ~FGPropeller();
@@ -114,6 +114,8 @@ public:
       @param pitch the pitch of the blade in degrees. */
   void SetPitch(double pitch) {Pitch = pitch;}
 
+  void SetAdvance(double advance) {Advance = advance;}
+
   /// Sets the P-Factor constant
   void SetPFactor(double pf) {P_Factor = pf;}
 
@@ -123,23 +125,26 @@ public:
                the direction of flight. */
   void SetSense(double s) { Sense = s;}
 
+  double GetSense(void) {return Sense;}
+  double GetPFactorValue(void) {return P_Factor;}
+
   /// Retrieves the pitch of the propeller in degrees.
   double GetPitch(void)         { return Pitch;         }
-  
+
   /// Retrieves the RPMs of the propeller
   double GetRPM(void)           { return RPM;           }
-  
+
   /// Retrieves the propeller moment of inertia
   double GetIxx(void)           { return Ixx;           }
-  
+
   /// Retrieves the Torque in foot-pounds (Don't you love the English system?)
   double GetTorque(void)        { return vTorque(eX);    }
-  
+
   /** Retrieves the power required (or "absorbed") by the propeller -
       i.e. the power required to keep spinning the propeller at the current
       velocity, air density,  and rotational rate. */
   double GetPowerRequired(void);
-  
+
   /** Calculates and returns the thrust produced by this propeller.
       Given the excess power available from the engine (in foot-pounds), the thrust is
       calculated, as well as the current RPM. The RPM is calculated by integrating
@@ -151,6 +156,8 @@ public:
       @return the thrust in pounds */
   double Calculate(double PowerAvailable);
   FGColumnVector3 GetPFactor(void);
+  string GetThrusterLabels(int id, string delimeter);
+  string GetThrusterValues(int id, string delimeter);
 
 private:
   int   numBlades;
@@ -164,6 +171,7 @@ private:
   double P_Factor;
   double Sense;
   double Pitch;
+  double Advance;
   double ExcessTorque;
   FGColumnVector3 vTorque;
   FGTable *cThrust;