Changeset 7536 in ntrip

Timestamp:

Oct 20, 2015, 5:37:01 PM (9 years ago)

Author:

stuerze

Message:

minor changes to harmonize PPP output formats

Location:

trunk/BNC/src

Files:

• PPP/pppClient.cpp (modified) (1 diff)
• PPP_SSR_I/pppFilter.cpp (modified) (9 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -434 +434 @@
     }
 
-    LOG << "\nResults of Epoch ";
+    LOG << "\nPrecise Point Positioning of Epoch ";
     if (!_epoTimeRover.undef()) LOG << string(_epoTimeRover);
-    LOG << "\n--------------------------------------\n";
+    LOG << "\n---------------------------------------------------------------\n";
 
     for (int iter = 1; iter <= 2; iter++) {

trunk/BNC/src/PPP_SSR_I/pppFilter.cpp

@@ -613 +613 @@
 
   if (OPT->useOrbClkCorr()) {
-    LOG << "Precise Point Positioning of Epoch " << _time.datestr() <<  "_" << _time.timestr(1)
+    LOG << "Precise Point Positioning of Epoch " << _time.datestr() <<  "_" << _time.timestr(3)
         << "\n---------------------------------------------------------------\n";
   }
   else {
-    LOG << "Single Point Positioning of Epoch " << _time.datestr() <<  "_" << _time.timestr(1)
-        << "\n--------------------------------------------------------------\n";
+    LOG << "Single Point Positioning of Epoch " << _time.datestr() <<  "_" << _time.timestr(3)
+        << "\n---------------------------------------------------------------\n";
   }
 
@@ -634 +634 @@
     t_pppParam* par = itPar.next();
     if      (par->type == t_pppParam::RECCLK) {
-      LOG << "\n    clk     = " << setw(10) << setprecision(3) << par->xx
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " CLK     " << setw(10) << setprecision(3) << par->xx
           << " +- " << setw(6) << setprecision(3)
           << sqrt(_QQ(par->index,par->index));
@@ -640 +641 @@
     else if (par->type == t_pppParam::AMB_L3) {
       ++par->numEpo;
-      LOG << "\n    amb " << par->prn.mid(0,3).toAscii().data() << " = "
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " AMB " << par->prn.mid(0,3).toAscii().data() << " "
           << setw(10) << setprecision(3) << par->xx
           << " +- " << setw(6) << setprecision(3)
@@ -648 +650 @@
     else if (par->type == t_pppParam::TROPO) {
       double aprTrp = delay_saast(M_PI/2.0);
-      LOG << "\n    trp     = " << par->prn.mid(0,3).toAscii().data()
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " TRP     " << par->prn.mid(0,3).toAscii().data()
           << setw(7) << setprecision(3) << aprTrp << " "
           << setw(6) << setprecision(3) << showpos << par->xx << noshowpos
@@ -655 +658 @@
     }
     else if (par->type == t_pppParam::GLONASS_OFFSET) {
-      LOG << "\n    offGlo  = " << setw(10) << setprecision(3) << par->xx
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " OFFGLO  " << setw(10) << setprecision(3) << par->xx
           << " +- " << setw(6) << setprecision(3)
           << sqrt(_QQ(par->index,par->index));
     }
     else if (par->type == t_pppParam::GALILEO_OFFSET) {
-      LOG << "\n    offGal  = " << setw(10) << setprecision(3) << par->xx
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " OFFGAL  " << setw(10) << setprecision(3) << par->xx
           << " +- " << setw(6) << setprecision(3)
           << sqrt(_QQ(par->index,par->index));
     }
     else if (par->type == t_pppParam::BDS_OFFSET) {
-      LOG << "\n    offBds  = " << setw(10) << setprecision(3) << par->xx
+      LOG << "\n" << _time.datestr() << "_" << _time.timestr(3)
+          << " OFFBDS  " << setw(10) << setprecision(3) << par->xx
           << " +- " << setw(6) << setprecision(3)
           << sqrt(_QQ(par->index,par->index));
@@ -680 +686 @@
   // ----------------------------------------
   LOG << OPT->_roverName << "  PPP "
-      << epoData->tt.timestr(1) << " " << epoData->sizeAll() << " "
+      << epoData->tt.datestr() << "_" << epoData->tt.timestr(3) << " " << epoData->sizeAll() << " "
       << setw(14) << setprecision(3) << x()                  << " +- "
       << setw(6)  << setprecision(3) << sqrt(_QQ(1,1))       << " "
@@ -937 +943 @@
                     useObs = OPT->ambLCs(satData->system()).size();
     if (satData->obsIndex != 0 && useObs) {
-      str << _time.timestr(1)
+      str << _time.datestr() << "_" << _time.timestr(3)
           << " RES " << satData->prn.mid(0,3).toAscii().data()
           << (iPhase ? "   L3 " : "   P3 ")
@@ -1030 +1036 @@
           nObs -= epoData->sizeSys(s);
         }
+        else {
+          LOG << _time.datestr() << "_" << _time.timestr(3)
+              << " SATNUM " << s << ' ' << right << setw(2)
+              << epoData->sizeSys(s) << endl;
+        }
       }
 
@@ -1040 +1051 @@
       unsigned iObs = 0;
       QMapIterator<QString, t_satData*> it(epoData->satData);
+
       while (it.hasNext()) {
         it.next();