Added static port system and a new altimeter model connected to it.

[flightgear.git] / src / Main / logger.cxx

diff --git a/src/Main/logger.cxx b/src/Main/logger.cxx
index 9dfe7399c68428059e4a2a458bd89333fa3ec291..afd32db2cfa8422471cb2f41827ee79b026d3188 100644 (file)
--- a/src/Main/logger.cxx
+++ b/src/Main/logger.cxx
@@ -5,9 +5,11 @@
 
 #include "logger.hxx"
 
-#include <fstream>
+#include STL_FSTREAM
+#ifndef SG_HAVE_NATIVE_SGI_COMPILERS
 SG_USING_STD(ofstream);
 SG_USING_STD(endl);
+#endif
 
 #include <string>
 SG_USING_STD(string);
@@ -37,26 +39,27 @@ FGLogger::init ()
   if (logging == 0)
     return;
 
-  vector<SGPropertyNode *> children = logging->getChildren("log");
-  for (int i = 0; i < children.size(); i++) {
+  vector<SGPropertyNode_ptr> children = logging->getChildren("log");
+  for (unsigned int i = 0; i < children.size(); i++) {
     _logs.push_back(Log());
     Log &log = _logs[_logs.size()-1];
     SGPropertyNode * child = children[i];
     string filename = child->getStringValue("filename", "fg_log.csv");
     log.interval_ms = child->getLongValue("interval-ms", 0);
+    log.delimiter = child->getStringValue("delimiter", ",")[0];
     log.output = new ofstream(filename.c_str());
     if (!log.output) {
       SG_LOG(SG_INPUT, SG_ALERT, "Cannot write log to " << filename);
       continue;
     }
-    vector<SGPropertyNode *> entries = child->getChildren("entry");
+    vector<SGPropertyNode_ptr> entries = child->getChildren("entry");
     (*log.output) << "Time";
-    for (int j = 0; j < entries.size(); j++) {
+    for (unsigned int j = 0; j < entries.size(); j++) {
       SGPropertyNode * entry = entries[j];
       SGPropertyNode * node =
        fgGetNode(entry->getStringValue("property"), true);
       log.nodes.push_back(node);
-      (*log.output) << ',' 
+      (*log.output) << log.delimiter
                    << entry->getStringValue("title", node->getPath());
     }
     (*log.output) << endl;
@@ -74,15 +77,16 @@ FGLogger::unbind ()
 }
 
 void
-FGLogger::update (int dt)
+FGLogger::update (double dt)
 {
-  long elapsed_ms = globals->get_elapsed_time_ms();
-  for (int i = 0; i < _logs.size(); i++) {
-    if ((elapsed_ms - _logs[i].last_time_ms) >= _logs[i].interval_ms) {
-      _logs[i].last_time_ms = elapsed_ms;
-      (*_logs[i].output) << globals->get_elapsed_time_ms();
-      for (int j = 0; j < _logs[i].nodes.size(); j++) {
-       (*_logs[i].output) << ',' << _logs[i].nodes[j]->getStringValue();
+  double sim_time_ms = globals->get_sim_time_sec() * 1000;
+  for (unsigned int i = 0; i < _logs.size(); i++) {
+    if ((sim_time_ms - _logs[i].last_time_ms) >= _logs[i].interval_ms) {
+      _logs[i].last_time_ms = sim_time_ms;
+      (*_logs[i].output) << sim_time_ms;
+      for (unsigned int j = 0; j < _logs[i].nodes.size(); j++) {
+       (*_logs[i].output) << _logs[i].delimiter
+                          << _logs[i].nodes[j]->getStringValue();
       }
       (*_logs[i].output) << endl;
     }
@@ -98,7 +102,8 @@ FGLogger::update (int dt)
 FGLogger::Log::Log ()
   : output(0),
     interval_ms(0),
-    last_time_ms(-99999999999999L)
+    last_time_ms(-999999.0),
+    delimiter(',')
 {
 }