X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGOutput.h;h=fe8ac1137e618010c9f3ebf7c2653c16a15a3d02;hb=1575fad886a0b18825363d41d53a287e8d36b9c8;hp=f1cfef7d0e5c2d125208b8a8e410898ecef6bae4;hpb=10366f4f1b91bfb037060a3f02d5c4056edac6c5;p=flightgear.git
diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h
index f1cfef7d0..fe8ac1137 100644
--- a/src/FDM/JSBSim/models/FGOutput.h
+++ b/src/FDM/JSBSim/models/FGOutput.h
@@ -45,12 +45,13 @@ INCLUDES
#include "input_output/FGXMLFileRead.h"
#include "input_output/net_fdm.hxx"
+#include "input_output/FGfdmSocket.h"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_OUTPUT "$Id: FGOutput.h,v 1.17 2009/10/24 22:59:30 jberndt Exp $"
+#define ID_OUTPUT "$Id: FGOutput.h,v 1.25 2012/02/07 23:15:37 bcoconni Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -90,13 +91,13 @@ CLASS DOCUMENTATION
Examples:
@code
-
+
@endcode
@code
-
+
@endcode
@@ -123,7 +124,7 @@ CLASS DOCUMENTATION propulsion ON|OFFNOTE that Time is always output with the data. - @version $Id: FGOutput.h,v 1.17 2009/10/24 22:59:30 jberndt Exp $ + @version $Id: FGOutput.h,v 1.25 2012/02/07 23:15:37 bcoconni Exp $ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -137,25 +138,38 @@ public: ~FGOutput(); bool InitModel(void); - bool Run(void); - + /** Runs the Output model; called by the Executive + Can pass in a value indicating if the executive is directing the simulation to Hold. + @param Holding if true, the executive has been directed to hold the sim from + advancing time. Some models may ignore this flag, such as the Input + model, which may need to be active to listen on a socket for the + "Resume" command to be given. + @return false if no error */ + bool Run(bool Holding); + + void Print(void); void DelimitedOutput(const std::string&); void SocketOutput(void); void FlightGearSocketOutput(void); void SocketStatusOutput(const std::string&); void SocketDataFill(FGNetFDM* net); - void SetType(const std::string& type); + void SetProtocol(const std::string& protocol); + void SetPort(const std::string& port); void SetStartNewFile(bool tt) {StartNewFile = tt;} void SetSubsystems(int tt) {SubSystems = tt;} + void SetOutputFileName(const std::string& fname) {Filename = fname;} + void SetDirectivesFile(const std::string& fname) {DirectivesFile = fname;} + void SetRate(double rt); void Enable(void) { enabled = true; } void Disable(void) { enabled = false; } bool Toggle(void) {enabled = !enabled; return enabled;} + bool Load(Element* el); - void SetOutputFileName(const std::string& fname) {Filename = fname;} - void SetDirectivesFile(const std::string& fname) {DirectivesFile = fname;} - void SetRate(int rt); + bool Load(int subSystems, std::string protocol, std::string type, std::string port, + std::string name, double outRate, + std::vector