Changeset 3035 in ntrip for trunk/BNC/combination

Timestamp:

Feb 25, 2011, 1:35:15 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (4 diffs)
• bnccomb.h (modified) (2 diffs)

trunk/BNC/combination/bnccomb.cpp ¶

@@ -158 +158 @@
     _QQ(iPar,iPar) = pp->sig_0 * pp->sig_0;
   }
+
+  // Output File (skeleton name)
+  // ---------------------------
+  QString path = settings.value("cmbOutPath").toString();
+  if (!path.isEmpty() && !_caster->mountpoint().isEmpty()) {
+    expandEnvVar(path);
+    if ( path.length() > 0 && path[path.length()-1] != QDir::separator() ) {
+      path += QDir::separator();
+    }
+    _outNameSkl = path + _caster->mountpoint();
+  }
+  _out = 0;
 }
 
@@ -169 +181 @@
   }
   delete _caster;
+  delete _out;
 }
 
@@ -341 +354 @@
   }
 
-  // Optionall send new Corrections to PPP client
-  // --------------------------------------------
+  // Optionall send new Corrections to PPP client and/or write into file
+  // -------------------------------------------------------------------
+  RTCM3coDecoder::reopen(_outNameSkl, _outName, _out);
   bncApp* app = (bncApp*) qApp;
-  if (app->_bncPPPclient) {
+  if (app->_bncPPPclient || _out) {
     QStringList corrLines;
     co.messageType = COTYPE_GPSCOMBINED;
@@ -350 +364 @@
                                                   resTime.gpssec(), co, 0));
     while (il.hasNext()) {
-      QString line = il.next() + " " + _caster->mountpoint();
+      QString line = il.next();
+      if (_out) {
+        *_out << line.toAscii().data() << endl;
+        _out->flush(); 
+      }
+      line += " " + _caster->mountpoint();
       corrLines << line;
     }
-
-    app->_bncPPPclient->slotNewCorrections(corrLines);
+    
+    if (app->_bncPPPclient) {
+      app->_bncPPPclient->slotNewCorrections(corrLines);
+    }
   }
 }

trunk/BNC/combination/bnccomb.h ¶

@@ -3 +3 @@
 #define BNCCOMB_H
 
+#include <fstream>
 #include <newmat.h>
 #include "bncephuser.h"
@@ -82 +83 @@
   QByteArray            _log;
   QString               _masterAC;
+  QString               _outNameSkl;
+  QString               _outName;
+  std::ofstream*        _out;
 };