Updated to match changes in radiostack.[ch]xx

[flightgear.git] / src / FDM / JSBSim / FGRotation.cpp

diff --git a/src/FDM/JSBSim/FGRotation.cpp b/src/FDM/JSBSim/FGRotation.cpp
index d07c973e5ba0981787416cc2eb507d8e67295278..aa48af0e121b5a80ef02899ae963caec90661683 100644 (file)
--- a/src/FDM/JSBSim/FGRotation.cpp
+++ b/src/FDM/JSBSim/FGRotation.cpp
@@ -154,6 +154,73 @@ void FGRotation::GetState(void)
   Ixz = MassBalance->GetIxz();
 }
 
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGRotation::bind(void)
+{
+  typedef double (FGRotation::*PMF)(int) const;
+  PropertyManager->Tie("velocities/p-rad_sec", this,1,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/q-rad_sec", this,2,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/r-rad_sec", this,3,
+                       (PMF)&FGRotation::GetPQR);
+  PropertyManager->Tie("velocities/p-aero-rad_sec", this,1,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("velocities/q-aero-rad_sec", this,2,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("velocities/r-aero-rad_sec", this,3,
+                       (PMF)&FGRotation::GetAeroPQR);
+  PropertyManager->Tie("accelerations/pdot-rad_sec", this,1,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("accelerations/qdot-rad_sec", this,2,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("accelerations/rdot-rad_sec", this,3,
+                       (PMF)&FGRotation::GetPQRdot);
+  PropertyManager->Tie("attitude/roll-rad", this,1,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("attitude/pitch-rad", this,2,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("attitude/heading-true-rad", this,3,
+                       (PMF)&FGRotation::GetEuler);
+  PropertyManager->Tie("velocities/phidot-rad_sec", this,1,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("velocities/thetadot-rad_sec", this,2,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("velocities/psidot-rad_sec", this,3,
+                       (PMF)&FGRotation::GetEulerRates);
+  PropertyManager->Tie("attitude/phi-rad", this,
+                       &FGRotation::Getphi);
+  PropertyManager->Tie("attitude/theta-rad", this,
+                       &FGRotation::Gettht);
+  PropertyManager->Tie("attitude/psi-true-rad", this,
+                       &FGRotation::Getpsi);
+}
+
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void FGRotation::unbind(void)
+{
+  PropertyManager->Untie("velocities/p-rad_sec");
+  PropertyManager->Untie("velocities/q-rad_sec");
+  PropertyManager->Untie("velocities/r-rad_sec");
+  PropertyManager->Untie("velocities/p-aero-rad_sec");
+  PropertyManager->Untie("velocities/q-aero-rad_sec");
+  PropertyManager->Untie("velocities/r-aero-rad_sec");
+  PropertyManager->Untie("accelerations/pdot-rad_sec");
+  PropertyManager->Untie("accelerations/qdot-rad_sec");
+  PropertyManager->Untie("accelerations/rdot-rad_sec");
+  PropertyManager->Untie("attitude/roll-rad");
+  PropertyManager->Untie("attitude/pitch-rad");
+  PropertyManager->Untie("attitude/heading-true-rad");
+  PropertyManager->Untie("velocities/phidot-rad_sec");
+  PropertyManager->Untie("velocities/thetadot-rad_sec");
+  PropertyManager->Untie("velocities/psidot-rad_sec");
+  PropertyManager->Untie("attitude/phi-rad");
+  PropertyManager->Untie("attitude/theta-rad");
+  PropertyManager->Untie("attitude/psi-true-rad");
+}
+
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 //    The bitmasked value choices are as follows:
 //    unset: In this case (the default) JSBSim would only print
@@ -208,62 +275,3 @@ void FGRotation::Debug(int from)
   }
 }
 
-void FGRotation::bind(void){
-  PropertyManager->Tie("velocities/p-rad_sec", this,1,
-                       &FGRotation::GetPQR);
-  PropertyManager->Tie("velocities/q-rad_sec", this,2,
-                       &FGRotation::GetPQR);
-  PropertyManager->Tie("velocities/r-rad_sec", this,3,
-                       &FGRotation::GetPQR);
-  PropertyManager->Tie("velocities/p-aero-rad_sec", this,1,
-                       &FGRotation::GetAeroPQR);
-  PropertyManager->Tie("velocities/q-aero-rad_sec", this,2,
-                       &FGRotation::GetAeroPQR);
-  PropertyManager->Tie("velocities/r-aero-rad_sec", this,3,
-                       &FGRotation::GetAeroPQR);
-  PropertyManager->Tie("accelerations/pdot-rad_sec", this,1,
-                       &FGRotation::GetPQRdot);
-  PropertyManager->Tie("accelerations/qdot-rad_sec", this,2,
-                       &FGRotation::GetPQRdot);
-  PropertyManager->Tie("accelerations/rdot-rad_sec", this,3,
-                       &FGRotation::GetPQRdot);
-  PropertyManager->Tie("attitude/roll-rad", this,1,
-                       &FGRotation::GetEuler);
-  PropertyManager->Tie("attitude/pitch-rad", this,2,
-                       &FGRotation::GetEuler);
-  PropertyManager->Tie("attitude/heading-true-rad", this,3,
-                       &FGRotation::GetEuler);
-  PropertyManager->Tie("velocities/phidot-rad_sec", this,1,
-                       &FGRotation::GetEulerRates);
-  PropertyManager->Tie("velocities/thetadot-rad_sec", this,2,
-                       &FGRotation::GetEulerRates);
-  PropertyManager->Tie("velocities/psidot-rad_sec", this,3,
-                       &FGRotation::GetEulerRates);
-  PropertyManager->Tie("attitude/phi-rad", this,
-                       &FGRotation::Getphi);
-  PropertyManager->Tie("attitude/theta-rad", this,
-                       &FGRotation::Gettht);
-  PropertyManager->Tie("attitude/psi-true-rad", this,
-                       &FGRotation::Getpsi);
-}
-
-void FGRotation::unbind(void){
-  PropertyManager->Untie("velocities/p-rad_sec");
-  PropertyManager->Untie("velocities/q-rad_sec");
-  PropertyManager->Untie("velocities/r-rad_sec");
-  PropertyManager->Untie("velocities/p-aero-rad_sec");
-  PropertyManager->Untie("velocities/q-aero-rad_sec");
-  PropertyManager->Untie("velocities/r-aero-rad_sec");
-  PropertyManager->Untie("accelerations/pdot-rad_sec");
-  PropertyManager->Untie("accelerations/qdot-rad_sec");
-  PropertyManager->Untie("accelerations/rdot-rad_sec");
-  PropertyManager->Untie("attitude/roll-rad");
-  PropertyManager->Untie("attitude/pitch-rad");
-  PropertyManager->Untie("attitude/heading-true-rad");
-  PropertyManager->Untie("velocities/phidot-rad_sec");
-  PropertyManager->Untie("velocities/thetadot-rad_sec");
-  PropertyManager->Untie("velocities/psidot-rad_sec");
-  PropertyManager->Untie("attitude/phi-rad");
-  PropertyManager->Untie("attitude/theta-rad");
-  PropertyManager->Untie("attitude/psi-true-rad");
-}