Changeset 6653 in ntrip for trunk/BNC/src/pppRun.cpp

Timestamp:

Mar 12, 2015, 1:26:34 PM (9 years ago)

Author:

stuerze

Message:

sinex tro file support added,
troposphere results in overall ppp logfile added

File:

• trunk/BNC/src/pppRun.cpp (modified) (4 diffs)

trunk/BNC/src/pppRun.cpp

@@ -53 +53 @@
 #include "bncsettings.h"
 #include "bncoutf.h"
+#include "bncsinextro.h"
 #include "rinex/rnxobsfile.h"
 #include "rinex/rnxnavfile.h"
@@ -159 +160 @@
     }
     else {
-      snxtroFileSkl.replace("${STATION}", roverName);
-    }
-    _snxtroFile = new bncoutf(snxtroFileSkl, "1 day", 0);
+      snxtroFileSkl.replace("${STATION}", roverName.left(4));
+    }
+    int samplSnxTro = settings.value("PPP/snxtroSampl").toInt();
+    _snxtroFile = new bncSinexTro(_opt, snxtroFileSkl, "1 day", samplSnxTro);
   }
 }
@@ -272 +274 @@
           << " Y = "  << setprecision(4) << output._xyzRover[1]
           << " Z = "  << setprecision(4) << output._xyzRover[2]
-          << " NEU: " << setprecision(4) << output._neu[0]     
-          << " " << setprecision(4) << output._neu[1]     
-          << " " << setprecision(4) << output._neu[2];
+          << " NEU: " << showpos << setw(8) << setprecision(4) << output._neu[0]
+          << " "      << showpos << setw(8) << setprecision(4) << output._neu[1]
+          << " "      << showpos << setw(8) << setprecision(4) << output._neu[2]
+          << " TRP: " << showpos << setw(8) << setprecision(4) << output._trp0
+          << " "      << showpos << setw(8) << setprecision(4) << output._trp;
     }
 
@@ -294 +298 @@
 
     if (_snxtroFile && output._epoTime.valid()) {
-     // _snxtroFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),QString("TEST"));
+      _snxtroFile->write(staID, int(output._epoTime.gpsw()), output._epoTime.gpssec(),
+                  output._trp0 + output._trp, output._trpStdev);
     }