X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FJSBSim%2Fmodels%2FFGOutput.h;h=fe8ac1137e618010c9f3ebf7c2653c16a15a3d02;hb=1575fad886a0b18825363d41d53a287e8d36b9c8;hp=e22dc1319f80f7b40b74fa6d28180a386d553569;hpb=0becb0df2b3364f92bdcad5b9bfd3f87a1649f06;p=flightgear.git
diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h
index e22dc1319..fe8ac1137 100644
--- a/src/FDM/JSBSim/models/FGOutput.h
+++ b/src/FDM/JSBSim/models/FGOutput.h
@@ -51,7 +51,7 @@ INCLUDES
DEFINITIONS
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
-#define ID_OUTPUT "$Id: FGOutput.h,v 1.22 2011/03/11 13:02:26 jberndt Exp $"
+#define ID_OUTPUT "$Id: FGOutput.h,v 1.25 2012/02/07 23:15:37 bcoconni Exp $"
/*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
FORWARD DECLARATIONS
@@ -91,13 +91,13 @@ CLASS DOCUMENTATION
Examples:
@code
-
+
@endcode
@code
-
+
@endcode
@@ -124,7 +124,7 @@ CLASS DOCUMENTATION propulsion ON|OFFNOTE that Time is always output with the data. - @version $Id: FGOutput.h,v 1.22 2011/03/11 13:02:26 jberndt Exp $ + @version $Id: FGOutput.h,v 1.25 2012/02/07 23:15:37 bcoconni Exp $ */ /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -138,7 +138,14 @@ 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&); @@ -160,6 +167,9 @@ public: bool Toggle(void) {enabled = !enabled; return enabled;} bool Load(Element* el); + bool Load(int subSystems, std::string protocol, std::string type, std::string port, + std::string name, double outRate, + std::vector