Sync. with JSBSim CVS

[flightgear.git] / src / FDM / JSBSim / models / flight_control / FGSwitch.cpp

diff --git a/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp b/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
index 63d9e9bbcd54ed1a07a8ecbfbbcf5c95823f0181..4e68ea7ffc2a5cefe08df67ca1cc5a6ef8b9e7bf 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
+++ b/src/FDM/JSBSim/models/flight_control/FGSwitch.cpp
@@ -62,10 +62,14 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGSwitch.h"
+#include <iostream>
+#include <cstdlib>
+
+using namespace std;
 
 namespace JSBSim {
 
-static const char *IdSrc = "$Id$";
+static const char *IdSrc = "$Id: FGSwitch.cpp,v 1.19 2009/10/24 22:59:30 jberndt Exp $";
 static const char *IdHdr = ID_SWITCH;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -98,10 +102,6 @@ FGSwitch::FGSwitch(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element)
       }
       for (unsigned int i=0; i<test_element->GetNumDataLines(); i++) {
         string input_data = test_element->GetDataLine(i);
-        while (input_data[0] <= 32) {
-          input_data = input_data.erase(0,1);
-          if (input_data.size() <= 1) break;
-        }
         if (input_data.size() <= 1) {
           // Make sure there are no bad data lines that consist solely of whitespace
           cerr << fgred << "  Bad data line in switch component: " << Name << reset << endl;
@@ -265,7 +265,10 @@ void FGSwitch::Debug(int from)
         }
         cout << endl;
       }
-      if (IsOutput) cout << "      OUTPUT: " << OutputNode->getName() << endl;
+      if (IsOutput) {
+        for (unsigned int i=0; i<OutputNodes.size(); i++)
+          cout << "      OUTPUT: " << OutputNodes[i]->getName() << endl;
+      }
     }
   }
   if (debug_lvl & 2 ) { // Instantiation/Destruction notification