Removed FGMatrix.* because it is no longer used by JSBSim.

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

diff --git a/src/FDM/JSBSim/FGRotation.cpp b/src/FDM/JSBSim/FGRotation.cpp
index d7a440040382dbd66599289bdde089db9faf0959..73763e5a0cfbf045e58ddcc2d87f96c784b15ff8 100644 (file)
--- a/src/FDM/JSBSim/FGRotation.cpp
+++ b/src/FDM/JSBSim/FGRotation.cpp
@@ -80,15 +80,15 @@ FGRotation::FGRotation(FGFDMExec* fdmex) : FGModel(fdmex)
   Name = "FGRotation";
   cTht=cPhi=cPsi=1.0;
   sTht=sPhi=sPsi=0.0;
-
-  if (debug_lvl & 2) cout << "Instantiated: " << Name << endl;
+  
+  Debug(0);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 FGRotation::~FGRotation()
 {
-  if (debug_lvl & 2) cout << "Destroyed:    FGRotation" << endl;
+  Debug(1);
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -128,7 +128,7 @@ bool FGRotation::Run(void)
 
     vlastPQRdot = vPQRdot;
 
-    if (debug_lvl > 1) Debug();
+    if (debug_lvl > 1) Debug(2);
 
     return false;
   } else {
@@ -150,16 +150,56 @@ void FGRotation::GetState(void)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-void FGRotation::Debug(void)
+//    The bitmasked value choices are as follows:
+//    unset: In this case (the default) JSBSim would only print
+//       out the normally expected messages, essentially echoing
+//       the config files as they are read. If the environment
+//       variable is not set, debug_lvl is set to 1 internally
+//    0: This requests JSBSim not to output any messages
+//       whatsoever.
+//    1: This value explicity requests the normal JSBSim
+//       startup messages
+//    2: This value asks for a message to be printed out when
+//       a class is instantiated
+//    4: When this value is set, a message is displayed when a
+//       FGModel object executes its Run() method
+//    8: When this value is set, various runtime state variables
+//       are printed out periodically
+//    16: When set various parameters are sanity checked and
+//       a message is printed out when they go out of bounds
+
+void FGRotation::Debug(int from)
 {
+  if (debug_lvl <= 0) return;
+
+  if (debug_lvl & 1) { // Standard console startup message output
+    if (from == 0) { // Constructor
+
+    }
+  }
+  if (debug_lvl & 2 ) { // Instantiation/Destruction notification
+    if (from == 0) cout << "Instantiated: FGRotation" << endl;
+    if (from == 1) cout << "Destroyed:    FGRotation" << endl;
+  }
+  if (debug_lvl & 4 ) { // Run() method entry print for FGModel-derived objects
+  }
+  if (debug_lvl & 8 ) { // Runtime state variables
+  }
   if (debug_lvl & 16) { // Sanity check variables
-    if (fabs(vPQR(eP)) > 100)
-      cout << "FGRotation::P (Roll Rate) out of bounds: " << vPQR(eP) << endl;
-    if (fabs(vPQR(eQ)) > 100)
-      cout << "FGRotation::Q (Pitch Rate) out of bounds: " << vPQR(eQ) << endl;
-    if (fabs(vPQR(eR)) > 100)
-      cout << "FGRotation::R (Yaw Rate) out of bounds: " << vPQR(eR) << endl;
+    if (from == 2) {
+      if (fabs(vPQR(eP)) > 100)
+        cout << "FGRotation::P (Roll Rate) out of bounds: " << vPQR(eP) << endl;
+      if (fabs(vPQR(eQ)) > 100)
+        cout << "FGRotation::Q (Pitch Rate) out of bounds: " << vPQR(eQ) << endl;
+      if (fabs(vPQR(eR)) > 100)
+        cout << "FGRotation::R (Yaw Rate) out of bounds: " << vPQR(eR) << endl;
+    }
+  }
+  if (debug_lvl & 64) {
+    if (from == 0) { // Constructor
+      cout << IdSrc << endl;
+      cout << IdHdr << endl;
+    }
   }
 }