X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2Fflight.hxx;h=c04b12b8a00bc7abec2e8d43b058110c876c1cc4;hb=b0b6c342492868c465417b0fd71c8752e69a8fe5;hp=da905abb0f14b2e9d792111a73ab96901c336620;hpb=59583890262247d73f48f4f1af21303ea41fda47;p=flightgear.git

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index da905abb0..c04b12b8a 100644
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -282,6 +282,12 @@ private:
     // SGTimeStamp next_stamp;           // time this record is valid
 
 protected:
+
+				// deliberately not virtual so that
+				// FGInterface constructor will call
+				// the right version
+    void _setup();
+
     void _busdump(void);
     void _updatePosition( double lat_geoc, double lon, double alt );
     void _updateWeather( void );
@@ -447,6 +453,8 @@ public:
     virtual void unbind ();
     virtual void update ();
     virtual bool update( int multi_loop );
+    virtual bool ToggleDataLogging(bool state) { return false; }
+    virtual bool ToggleDataLogging(void) { return false; }
 
     // Define the various supported flight models (many not yet implemented)
     enum {
@@ -496,10 +504,10 @@ public:
     virtual void set_Altitude(double alt);  // triggers re-calc of AGL altitude
     virtual void set_AltitudeAGL(double altagl); // and vice-versa
     virtual void set_Latitude_deg (double lat) {
-      set_Latitude(lat * DEG_TO_RAD);
+      set_Latitude(lat * SGD_DEGREES_TO_RADIANS);
     }
     virtual void set_Longitude_deg (double lon) {
-      set_Longitude(lon * DEG_TO_RAD);
+      set_Longitude(lon * SGD_DEGREES_TO_RADIANS);
     }
     
     // Speeds -- setting any of these will trigger a re-calc of the rest
@@ -525,11 +533,11 @@ public:
     virtual void set_Psi (double psi) { 
       set_Euler_Angles(get_Phi(), get_Theta(), psi);
     }
-    virtual void set_Phi_deg (double phi) { set_Phi(phi * DEG_TO_RAD); }
+    virtual void set_Phi_deg (double phi) { set_Phi(phi * SGD_DEGREES_TO_RADIANS); }
     virtual void set_Theta_deg (double theta) {
-      set_Theta(theta * DEG_TO_RAD); 
+      set_Theta(theta * SGD_DEGREES_TO_RADIANS); 
     }
-    virtual void set_Psi_deg (double psi) { set_Psi(psi * DEG_TO_RAD); }
+    virtual void set_Psi_deg (double psi) { set_Psi(psi * SGD_DEGREES_TO_RADIANS); }
     
     // Flight Path
     virtual void set_Climb_Rate( double roc);
@@ -891,19 +899,19 @@ public:
     inline double get_Altitude_AGL(void) const { return altitude_agl; }
 
     inline double get_Latitude_deg () const {
-      return get_Latitude() * RAD_TO_DEG;
+      return get_Latitude() * SGD_RADIANS_TO_DEGREES;
     }
     inline double get_Longitude_deg () const {
-      return get_Longitude() * RAD_TO_DEG;
+      return get_Longitude() * SGD_RADIANS_TO_DEGREES;
     }
 
     // inline double * get_Euler_angles_v() { return euler_angles_v; }
     inline double get_Phi() const { return euler_angles_v[0]; }
     inline double get_Theta() const { return euler_angles_v[1]; }
     inline double get_Psi() const { return euler_angles_v[2]; }
-    inline double get_Phi_deg () const { return get_Phi() * RAD_TO_DEG; }
-    inline double get_Theta_deg () const { return get_Theta() * RAD_TO_DEG; }
-    inline double get_Psi_deg () const { return get_Psi() * RAD_TO_DEG; }
+    inline double get_Phi_deg () const { return get_Phi() * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Theta_deg () const { return get_Theta() * SGD_RADIANS_TO_DEGREES; }
+    inline double get_Psi_deg () const { return get_Psi() * SGD_RADIANS_TO_DEGREES; }
 
 
     // ========== Miscellaneous quantities ==========
@@ -1134,5 +1142,8 @@ void fgFDMForceAltitude(const string &model, double alt_meters);
 // Set the local ground elevation
 void fgFDMSetGroundElevation(const string &model, double alt_meters);
 
+// Toggle data logging on/off
+void fgToggleFDMdataLogging(void);
+
 
 #endif // _FLIGHT_HXX