X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGOutput.cpp;h=f6cbcd366737989e2e527bdf45804f6f42deb935;hb=642735ab18421db87a07d6841dd720fd4615bfff;hp=2e509ff6387043d17c44772be50bf2bc421f0ae7;hpb=b39599f5781ee0db2afb1724ea328d13486be68f;p=flightgear.git diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index 2e509ff63..f6cbcd366 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -39,10 +39,16 @@ HISTORY INCLUDES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/ +#include +#include +#include +#include + #include "FGOutput.h" -#include "FGState.h" #include "FGFDMExec.h" #include "FGAtmosphere.h" +#include "FGAccelerations.h" +#include "atmosphere/FGWinds.h" #include "FGFCS.h" #include "FGAerodynamics.h" #include "FGGroundReactions.h" @@ -53,16 +59,10 @@ INCLUDES #include "FGPropagate.h" #include "FGAuxiliary.h" #include "FGInertial.h" +#include "FGPropulsion.h" #include "models/propulsion/FGEngine.h" #include "models/propulsion/FGTank.h" #include "models/propulsion/FGPiston.h" -#include -#include -#include -#include - -#include "input_output/net_fdm.hxx" -#include "input_output/FGfdmSocket.h" #if defined(WIN32) && !defined(__CYGWIN__) # include @@ -77,7 +77,7 @@ using namespace std; namespace JSBSim { -static const char *IdSrc = "$Id$"; +static const char *IdSrc = "$Id: FGOutput.cpp,v 1.67 2012/04/27 12:14:56 jberndt Exp $"; static const char *IdHdr = ID_OUTPUT; // (stolen from FGFS native_fdm.cxx) @@ -132,7 +132,6 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex) Name = "FGOutput"; sFirstPass = dFirstPass = true; socket = 0; - flightGearSocket = 0; runID_postfix = 0; Type = otNone; SubSystems = 0; @@ -153,7 +152,6 @@ FGOutput::FGOutput(FGFDMExec* fdmex) : FGModel(fdmex) FGOutput::~FGOutput() { delete socket; - delete flightGearSocket; OutputProperties.clear(); Debug(1); } @@ -162,8 +160,6 @@ FGOutput::~FGOutput() bool FGOutput::InitModel(void) { - if (!FGModel::InitModel()) return false; - if (Filename.size() > 0 && StartNewFile) { ostringstream buf; string::size_type dot = BaseFilename.find_last_of('.'); @@ -183,35 +179,44 @@ bool FGOutput::InitModel(void) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -bool FGOutput::Run(void) +bool FGOutput::Run(bool Holding) { - if (FGModel::Run()) return true; - - if (enabled && !State->IntegrationSuspended()&& !FDMExec->Holding()) { - if (Type == otSocket) { - SocketOutput(); - } else if (Type == otFlightGear) { - FlightGearSocketOutput(); - } else if (Type == otCSV || Type == otTab) { - DelimitedOutput(Filename); - } else if (Type == otTerminal) { - // Not done yet - } else if (Type == otNone) { - // Do nothing - } else { - // Not a valid type of output - } + if (FGModel::Run(Holding)) return true; + + if (enabled && !FDMExec->IntegrationSuspended() && !Holding) { + RunPreFunctions(); + Print(); + RunPostFunctions(); } return false; } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +void FGOutput::Print(void) +{ + if (Type == otSocket) { + SocketOutput(); + } else if (Type == otFlightGear) { + FlightGearSocketOutput(); + } else if (Type == otCSV || Type == otTab) { + DelimitedOutput(Filename); + } else if (Type == otTerminal) { + // Not done yet + } else if (Type == otNone) { + // Do nothing + } else { + // Not a valid type of output + } +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + void FGOutput::SetType(const string& type) { if (type == "CSV") { Type = otCSV; - delimeter = ", "; + delimeter = ","; } else if (type == "TABULAR") { Type = otTab; delimeter = "\t"; @@ -229,8 +234,31 @@ void FGOutput::SetType(const string& type) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +void FGOutput::SetProtocol(const string& protocol) +{ + if (protocol == "UDP") Protocol = FGfdmSocket::ptUDP; + else if (protocol == "TCP") Protocol = FGfdmSocket::ptTCP; + else Protocol = FGfdmSocket::ptTCP; // Default to TCP +} + +//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + void FGOutput::DelimitedOutput(const string& fname) { + const FGAerodynamics* Aerodynamics = FDMExec->GetAerodynamics(); + const FGAuxiliary* Auxiliary = FDMExec->GetAuxiliary(); + const FGAircraft* Aircraft = FDMExec->GetAircraft(); + const FGAtmosphere* Atmosphere = FDMExec->GetAtmosphere(); + const FGWinds* Winds = FDMExec->GetWinds(); + const FGPropulsion* Propulsion = FDMExec->GetPropulsion(); + const FGMassBalance* MassBalance = FDMExec->GetMassBalance(); + const FGPropagate* Propagate = FDMExec->GetPropagate(); + const FGAccelerations* Accelerations = FDMExec->GetAccelerations(); + const FGFCS* FCS = FDMExec->GetFCS(); + const FGGroundReactions* GroundReactions = FDMExec->GetGroundReactions(); + const FGExternalReactions* ExternalReactions = FDMExec->GetExternalReactions(); + const FGBuoyantForces* BuoyantForces = FDMExec->GetBuoyantForces(); + streambuf* buffer; string scratch = ""; @@ -265,7 +293,8 @@ void FGOutput::DelimitedOutput(const string& fname) if (SubSystems & ssRates) { outstream << delimeter; outstream << "P (deg/s)" + delimeter + "Q (deg/s)" + delimeter + "R (deg/s)" + delimeter; - outstream << "P dot (deg/s^2)" + delimeter + "Q dot (deg/s^2)" + delimeter + "R dot (deg/s^2)"; + outstream << "P dot (deg/s^2)" + delimeter + "Q dot (deg/s^2)" + delimeter + "R dot (deg/s^2)" + delimeter; + outstream << "P_{inertial} (deg/s)" + delimeter + "Q_{inertial} (deg/s)" + delimeter + "R_{inertial} (deg/s)"; } if (SubSystems & ssVelocities) { outstream << delimeter; @@ -275,6 +304,8 @@ void FGOutput::DelimitedOutput(const string& fname) outstream << "V_{Inertial} (ft/s)" + delimeter; outstream << "UBody" + delimeter + "VBody" + delimeter + "WBody" + delimeter; outstream << "Aero V_{X Body} (ft/s)" + delimeter + "Aero V_{Y Body} (ft/s)" + delimeter + "Aero V_{Z Body} (ft/s)" + delimeter; + outstream << "V_{X_{inertial}} (ft/s)" + delimeter + "V_{Y_{inertial}} (ft/s)" + delimeter + "V_{Z_{inertial}} (ft/s)" + delimeter; + outstream << "V_{X_{ecef}} (ft/s)" + delimeter + "V_{Y_{ecef}} (ft/s)" + delimeter + "V_{Z_{ecef}} (ft/s)" + delimeter; outstream << "V_{North} (ft/s)" + delimeter + "V_{East} (ft/s)" + delimeter + "V_{Down} (ft/s)"; } if (SubSystems & ssForces) { @@ -290,7 +321,7 @@ void FGOutput::DelimitedOutput(const string& fname) } if (SubSystems & ssMoments) { outstream << delimeter; - outstream << "L_{Aero} (ft-lbs)" + delimeter + "M_{Aero} ( ft-lbs)" + delimeter + "N_{Aero} (ft-lbs)" + delimeter; + outstream << "L_{Aero} (ft-lbs)" + delimeter + "M_{Aero} (ft-lbs)" + delimeter + "N_{Aero} (ft-lbs)" + delimeter; outstream << "L_{Prop} (ft-lbs)" + delimeter + "M_{Prop} (ft-lbs)" + delimeter + "N_{Prop} (ft-lbs)" + delimeter; outstream << "L_{Gear} (ft-lbs)" + delimeter + "M_{Gear} (ft-lbs)" + delimeter + "N_{Gear} (ft-lbs)" + delimeter; outstream << "L_{ext} (ft-lbs)" + delimeter + "M_{ext} (ft-lbs)" + delimeter + "N_{ext} (ft-lbs)" + delimeter; @@ -332,13 +363,14 @@ void FGOutput::DelimitedOutput(const string& fname) outstream << "Beta (deg)" + delimeter; outstream << "Latitude (deg)" + delimeter; outstream << "Longitude (deg)" + delimeter; - outstream << "ECEF X (ft)" + delimeter + "ECEF Y (ft)" + delimeter + "ECEF Z (ft)" + delimeter; - outstream << "EPA (deg)" + delimeter; + outstream << "X_{ECI} (ft)" + delimeter + "Y_{ECI} (ft)" + delimeter + "Z_{ECI} (ft)" + delimeter; + outstream << "X_{ECEF} (ft)" + delimeter + "Y_{ECEF} (ft)" + delimeter + "Z_{ECEF} (ft)" + delimeter; + outstream << "Earth Position Angle (deg)" + delimeter; outstream << "Distance AGL (ft)" + delimeter; outstream << "Terrain Elevation (ft)"; } - if (SubSystems & ssCoefficients) { - scratch = Aerodynamics->GetCoefficientStrings(delimeter); + if (SubSystems & ssAeroFunctions) { + scratch = Aerodynamics->GetAeroFunctionStrings(delimeter); if (scratch.length() != 0) outstream << delimeter << scratch; } if (SubSystems & ssFCS) { @@ -363,7 +395,7 @@ void FGOutput::DelimitedOutput(const string& fname) dFirstPass = false; } - outstream << State->Getsim_time(); + outstream << FDMExec->GetSimTime(); if (SubSystems & ssSimulation) { } if (SubSystems & ssAerosurfaces) { @@ -381,7 +413,8 @@ void FGOutput::DelimitedOutput(const string& fname) if (SubSystems & ssRates) { outstream << delimeter; outstream << (radtodeg*Propagate->GetPQR()).Dump(delimeter) << delimeter; - outstream << (radtodeg*Propagate->GetPQRdot()).Dump(delimeter); + outstream << (radtodeg*Accelerations->GetPQRdot()).Dump(delimeter) << delimeter; + outstream << (radtodeg*Propagate->GetPQRi()).Dump(delimeter); } if (SubSystems & ssVelocities) { outstream << delimeter; @@ -391,27 +424,29 @@ void FGOutput::DelimitedOutput(const string& fname) outstream << Propagate->GetInertialVelocityMagnitude() << delimeter; outstream << setprecision(12) << Propagate->GetUVW().Dump(delimeter) << delimeter; outstream << Auxiliary->GetAeroUVW().Dump(delimeter) << delimeter; + outstream << Propagate->GetInertialVelocity().Dump(delimeter) << delimeter; + outstream << Propagate->GetECEFVelocity().Dump(delimeter) << delimeter; outstream << Propagate->GetVel().Dump(delimeter); outstream.precision(10); } if (SubSystems & ssForces) { outstream << delimeter; - outstream << Aerodynamics->GetvFw() << delimeter; + outstream << Aerodynamics->GetvFw().Dump(delimeter) << delimeter; outstream << Aerodynamics->GetLoD() << delimeter; - outstream << Aerodynamics->GetForces() << delimeter; - outstream << Propulsion->GetForces() << delimeter; - outstream << GroundReactions->GetForces() << delimeter; - outstream << ExternalReactions->GetForces() << delimeter; - outstream << BuoyantForces->GetForces() << delimeter; + outstream << Aerodynamics->GetForces().Dump(delimeter) << delimeter; + outstream << Propulsion->GetForces().Dump(delimeter) << delimeter; + outstream << GroundReactions->GetForces().Dump(delimeter) << delimeter; + outstream << ExternalReactions->GetForces().Dump(delimeter) << delimeter; + outstream << BuoyantForces->GetForces().Dump(delimeter) << delimeter; outstream << Aircraft->GetForces().Dump(delimeter); } if (SubSystems & ssMoments) { outstream << delimeter; - outstream << Aerodynamics->GetMoments() << delimeter; - outstream << Propulsion->GetMoments() << delimeter; - outstream << GroundReactions->GetMoments() << delimeter; - outstream << ExternalReactions->GetMoments() << delimeter; - outstream << BuoyantForces->GetMoments() << delimeter; + outstream << Aerodynamics->GetMoments().Dump(delimeter) << delimeter; + outstream << Propulsion->GetMoments().Dump(delimeter) << delimeter; + outstream << GroundReactions->GetMoments().Dump(delimeter) << delimeter; + outstream << ExternalReactions->GetMoments().Dump(delimeter) << delimeter; + outstream << BuoyantForces->GetMoments().Dump(delimeter) << delimeter; outstream << Aircraft->GetMoments().Dump(delimeter); } if (SubSystems & ssAtmosphere) { @@ -422,15 +457,15 @@ void FGOutput::DelimitedOutput(const string& fname) outstream << Atmosphere->GetTemperature() << delimeter; outstream << Atmosphere->GetPressureSL() << delimeter; outstream << Atmosphere->GetPressure() << delimeter; - outstream << Atmosphere->GetTurbMagnitude() << delimeter; - outstream << Atmosphere->GetTurbDirection().Dump(delimeter) << delimeter; - outstream << Atmosphere->GetTotalWindNED().Dump(delimeter); + outstream << Winds->GetTurbMagnitude() << delimeter; + outstream << Winds->GetTurbDirection().Dump(delimeter) << delimeter; + outstream << Winds->GetTotalWindNED().Dump(delimeter); } if (SubSystems & ssMassProps) { outstream << delimeter; - outstream << MassBalance->GetJ() << delimeter; + outstream << MassBalance->GetJ().Dump(delimeter) << delimeter; outstream << MassBalance->GetMass() << delimeter; - outstream << MassBalance->GetXYZcg(); + outstream << MassBalance->GetXYZcg().Dump(delimeter); } if (SubSystems & ssPropagate) { outstream.precision(14); @@ -443,15 +478,16 @@ void FGOutput::DelimitedOutput(const string& fname) outstream << Propagate->GetLocation().GetLatitudeDeg() << delimeter; outstream << Propagate->GetLocation().GetLongitudeDeg() << delimeter; outstream.precision(18); + outstream << ((FGColumnVector3)Propagate->GetInertialPosition()).Dump(delimeter) << delimeter; outstream << ((FGColumnVector3)Propagate->GetLocation()).Dump(delimeter) << delimeter; outstream.precision(14); - outstream << Inertial->GetEarthPositionAngleDeg() << delimeter; + outstream << Propagate->GetEarthPositionAngleDeg() << delimeter; outstream << Propagate->GetDistanceAGL() << delimeter; outstream << Propagate->GetTerrainElevation(); outstream.precision(10); } - if (SubSystems & ssCoefficients) { - scratch = Aerodynamics->GetCoefficientValues(delimeter); + if (SubSystems & ssAeroFunctions) { + scratch = Aerodynamics->GetAeroFunctionValues(delimeter); if (scratch.length() != 0) outstream << delimeter << scratch; } if (SubSystems & ssFCS) { @@ -481,6 +517,11 @@ void FGOutput::DelimitedOutput(const string& fname) void FGOutput::SocketDataFill(FGNetFDM* net) { + const FGAuxiliary* Auxiliary = FDMExec->GetAuxiliary(); + const FGPropulsion* Propulsion = FDMExec->GetPropulsion(); + const FGPropagate* Propagate = FDMExec->GetPropagate(); + const FGFCS* FCS = FDMExec->GetFCS(); + const FGGroundReactions* GroundReactions = FDMExec->GetGroundReactions(); unsigned int i; // Version @@ -558,7 +599,6 @@ void FGOutput::SocketDataFill(FGNetFDM* net) } } - // Consumables net->num_tanks = Propulsion->GetNumTanks(); // Max number of fuel tanks @@ -566,7 +606,6 @@ void FGOutput::SocketDataFill(FGNetFDM* net) net->fuel_quantity[i] = (float)(((FGTank *)Propulsion->GetTank(i))->GetContents()); } - // Gear status net->num_wheels = GroundReactions->GetNumGearUnits(); @@ -580,13 +619,11 @@ void FGOutput::SocketDataFill(FGNetFDM* net) net->gear_compression[i] = (float)(GroundReactions->GetGearUnit(i)->GetCompLen()); } - // Environment - net->cur_time = (long int)1234567890; // Friday, Feb 13, 2009, 23:31:30 UTC (not processed by FGFS anyway) + net->cur_time = (long int)1234567890; // Friday, Feb 13, 2009, 23:31:30 UTC (not processed by FGFS anyway) net->warp = 0; // offset in seconds to unix time net->visibility = 25000.0; // visibility in meters (for env. effects) - // Control surface positions (normalized values) net->elevator = (float)(FCS->GetDePos(ofNorm)); // Norm Elevator Pos, -- net->elevator_trim_tab = (float)(FCS->GetPitchTrimCmd()); // Norm Elev Trim Tab Pos, -- @@ -599,7 +636,6 @@ void FGOutput::SocketDataFill(FGNetFDM* net) net->speedbrake = (float)(FCS->GetDsbPos(ofNorm)); // Norm Speedbrake Pos, -- net->spoilers = (float)(FCS->GetDspPos(ofNorm)); // Norm Spoiler Pos, -- - // Convert the net buffer to network format if ( isLittleEndian ) { net->version = htonl(net->version); @@ -683,18 +719,29 @@ void FGOutput::FlightGearSocketOutput(void) { int length = sizeof(fgSockBuf); - - if (flightGearSocket == NULL) return; - if (!flightGearSocket->GetConnectStatus()) return; + if (socket == NULL) return; + if (!socket->GetConnectStatus()) return; SocketDataFill(&fgSockBuf); - flightGearSocket->Send((char *)&fgSockBuf, length); + socket->Send((char *)&fgSockBuf, length); } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% void FGOutput::SocketOutput(void) { + const FGAerodynamics* Aerodynamics = FDMExec->GetAerodynamics(); + const FGAuxiliary* Auxiliary = FDMExec->GetAuxiliary(); + const FGPropulsion* Propulsion = FDMExec->GetPropulsion(); + const FGMassBalance* MassBalance = FDMExec->GetMassBalance(); + const FGPropagate* Propagate = FDMExec->GetPropagate(); + const FGAccelerations* Accelerations = FDMExec->GetAccelerations(); + const FGFCS* FCS = FDMExec->GetFCS(); + const FGAtmosphere* Atmosphere = FDMExec->GetAtmosphere(); + const FGWinds* Winds = FDMExec->GetWinds(); + const FGAircraft* Aircraft = FDMExec->GetAircraft(); + const FGGroundReactions* GroundReactions = FDMExec->GetGroundReactions(); + string asciiData, scratch; if (socket == NULL) return; @@ -790,8 +837,8 @@ void FGOutput::SocketOutput(void) socket->Append("Latitude (deg)"); socket->Append("Longitude (deg)"); } - if (SubSystems & ssCoefficients) { - scratch = Aerodynamics->GetCoefficientStrings(","); + if (SubSystems & ssAeroFunctions) { + scratch = Aerodynamics->GetAeroFunctionStrings(","); if (scratch.length() != 0) socket->Append(scratch); } if (SubSystems & ssFCS) { @@ -815,7 +862,7 @@ void FGOutput::SocketOutput(void) } socket->Clear(); - socket->Append(State->Getsim_time()); + socket->Append(FDMExec->GetSimTime()); if (SubSystems & ssAerosurfaces) { socket->Append(FCS->GetDaCmd()); @@ -832,9 +879,9 @@ void FGOutput::SocketOutput(void) socket->Append(radtodeg*Propagate->GetPQR(eP)); socket->Append(radtodeg*Propagate->GetPQR(eQ)); socket->Append(radtodeg*Propagate->GetPQR(eR)); - socket->Append(radtodeg*Propagate->GetPQRdot(eP)); - socket->Append(radtodeg*Propagate->GetPQRdot(eQ)); - socket->Append(radtodeg*Propagate->GetPQRdot(eR)); + socket->Append(radtodeg*Accelerations->GetPQRdot(eP)); + socket->Append(radtodeg*Accelerations->GetPQRdot(eQ)); + socket->Append(radtodeg*Accelerations->GetPQRdot(eR)); } if (SubSystems & ssVelocities) { socket->Append(Auxiliary->Getqbar()); @@ -867,9 +914,9 @@ void FGOutput::SocketOutput(void) socket->Append(Atmosphere->GetDensity()); socket->Append(Atmosphere->GetPressureSL()); socket->Append(Atmosphere->GetPressure()); - socket->Append(Atmosphere->GetTurbMagnitude()); - socket->Append(Atmosphere->GetTurbDirection().Dump(",")); - socket->Append(Atmosphere->GetTotalWindNED().Dump(",")); + socket->Append(Winds->GetTurbMagnitude()); + socket->Append(Winds->GetTurbDirection().Dump(",")); + socket->Append(Winds->GetTotalWindNED().Dump(",")); } if (SubSystems & ssMassProps) { socket->Append(MassBalance->GetJ()(1,1)); @@ -896,8 +943,8 @@ void FGOutput::SocketOutput(void) socket->Append(Propagate->GetLocation().GetLatitudeDeg()); socket->Append(Propagate->GetLocation().GetLongitudeDeg()); } - if (SubSystems & ssCoefficients) { - scratch = Aerodynamics->GetCoefficientValues(","); + if (SubSystems & ssAeroFunctions) { + scratch = Aerodynamics->GetAeroFunctionValues(","); if (scratch.length() != 0) socket->Append(scratch); } if (SubSystems & ssFCS) { @@ -934,77 +981,81 @@ void FGOutput::SocketStatusOutput(const string& out_str) //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +bool FGOutput::Load(int subSystems, std::string protocol, std::string type, std::string port, std::string name, double outRate, std::vector & outputProperties) +{ + SetType(type); + SetRate(outRate); + SubSystems = subSystems; + OutputProperties = outputProperties; + + if (((Type == otCSV) || (Type == otTab)) && (name != "cout") && (name !="COUT")) + name = FDMExec->GetRootDir() + name; + + if (!port.empty() && (Type == otSocket || Type == otFlightGear)) { + SetProtocol(protocol); + socket = new FGfdmSocket(name, atoi(port.c_str()), Protocol); + } else { + BaseFilename = Filename = name; + } + + Debug(2); + return true; +} + bool FGOutput::Load(Element* element) { - string type="", parameter=""; - string name=""; - string protocol="tcp"; - int OutRate = 0; - string property; - unsigned int port; + int subSystems = 0; Element *property_element; - - string separator = "/"; + std::vector outputProperties; if (!DirectivesFile.empty()) { // A directives filename from the command line overrides output_file_name = DirectivesFile; // one found in the config file. document = LoadXMLDocument(output_file_name); } else if (!element->GetAttributeValue("file").empty()) { - output_file_name = element->GetAttributeValue("file"); + output_file_name = FDMExec->GetRootDir() + element->GetAttributeValue("file"); document = LoadXMLDocument(output_file_name); } else { document = element; } - name = document->GetAttributeValue("name"); - type = document->GetAttributeValue("type"); - SetType(type); - if (!document->GetAttributeValue("port").empty() && type == string("SOCKET")) { - port = atoi(document->GetAttributeValue("port").c_str()); - socket = new FGfdmSocket(name, port); - } else if (!document->GetAttributeValue("port").empty() && type == string("FLIGHTGEAR")) { - port = atoi(document->GetAttributeValue("port").c_str()); - if (!document->GetAttributeValue("protocol").empty()) - protocol = document->GetAttributeValue("protocol"); - if (protocol == "udp") - flightGearSocket = new FGfdmSocket(name, port, FGfdmSocket::ptUDP); // create udp socket - else - flightGearSocket = new FGfdmSocket(name, port, FGfdmSocket::ptTCP); // create tcp socket (default) - } else { - BaseFilename = Filename = name; - } + if (!document) return false; + + string type = document->GetAttributeValue("type"); + string name = document->GetAttributeValue("name"); + string port = document->GetAttributeValue("port"); + string protocol = document->GetAttributeValue("protocol"); if (!document->GetAttributeValue("rate").empty()) { - OutRate = (int)document->GetAttributeValueAsNumber("rate"); + rate = document->GetAttributeValueAsNumber("rate"); } else { - OutRate = 1; + rate = 1; } if (document->FindElementValue("simulation") == string("ON")) - SubSystems += ssSimulation; + subSystems += ssSimulation; if (document->FindElementValue("aerosurfaces") == string("ON")) - SubSystems += ssAerosurfaces; + subSystems += ssAerosurfaces; if (document->FindElementValue("rates") == string("ON")) - SubSystems += ssRates; + subSystems += ssRates; if (document->FindElementValue("velocities") == string("ON")) - SubSystems += ssVelocities; + subSystems += ssVelocities; if (document->FindElementValue("forces") == string("ON")) - SubSystems += ssForces; + subSystems += ssForces; if (document->FindElementValue("moments") == string("ON")) - SubSystems += ssMoments; + subSystems += ssMoments; if (document->FindElementValue("atmosphere") == string("ON")) - SubSystems += ssAtmosphere; + subSystems += ssAtmosphere; if (document->FindElementValue("massprops") == string("ON")) - SubSystems += ssMassProps; + subSystems += ssMassProps; if (document->FindElementValue("position") == string("ON")) - SubSystems += ssPropagate; - if (document->FindElementValue("coefficients") == string("ON")) - SubSystems += ssCoefficients; + subSystems += ssPropagate; + if (document->FindElementValue("coefficients") == string("ON") || document->FindElementValue("aerodynamics") == string("ON")) + subSystems += ssAeroFunctions; if (document->FindElementValue("ground_reactions") == string("ON")) - SubSystems += ssGroundReactions; + subSystems += ssGroundReactions; if (document->FindElementValue("fcs") == string("ON")) - SubSystems += ssFCS; + subSystems += ssFCS; if (document->FindElementValue("propulsion") == string("ON")) - SubSystems += ssPropulsion; + subSystems += ssPropulsion; property_element = document->FindElement("property"); while (property_element) { string property_str = property_element->GetDataLine(); @@ -1015,25 +1066,23 @@ bool FGOutput::Load(Element* element) << " not be logged. You should check your configuration file." << reset << endl; } else { - OutputProperties.push_back(node); + outputProperties.push_back(node); } property_element = document->FindNextElement("property"); } - SetRate(OutRate); + return Load(subSystems, protocol, type, port, name, rate, outputProperties); +} - Debug(2); - return true; -} //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -void FGOutput::SetRate(int rtHz) +void FGOutput::SetRate(double rtHz) { rtHz = rtHz>1000?1000:(rtHz<0?0:rtHz); if (rtHz > 0) { - rate = (int)(0.5 + 1.0/(State->Getdt()*rtHz)); + rate = (int)(0.5 + 1.0/(FDMExec->GetDeltaT()*rtHz)); Enable(); } else { rate = 1; @@ -1083,7 +1132,7 @@ void FGOutput::Debug(int from) } switch (Type) { case otCSV: - cout << scratch << " in CSV format output at rate " << 1/(State->Getdt()*rate) << " Hz" << endl; + cout << scratch << " in CSV format output at rate " << 1/(FDMExec->GetDeltaT()*rate) << " Hz" << endl; break; case otNone: default: @@ -1099,7 +1148,7 @@ void FGOutput::Debug(int from) if (SubSystems & ssMoments) cout << " Moments parameters logged" << endl; if (SubSystems & ssAtmosphere) cout << " Atmosphere parameters logged" << endl; if (SubSystems & ssMassProps) cout << " Mass parameters logged" << endl; - if (SubSystems & ssCoefficients) cout << " Coefficient parameters logged" << endl; + if (SubSystems & ssAeroFunctions) cout << " Coefficient parameters logged" << endl; if (SubSystems & ssPropagate) cout << " Propagate parameters logged" << endl; if (SubSystems & ssGroundReactions) cout << " Ground parameters logged" << endl; if (SubSystems & ssFCS) cout << " FCS parameters logged" << endl;