Changeset 5337 in ntrip for trunk/BNC

Timestamp:

Aug 18, 2013, 1:46:07 PM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (5 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -661 +661 @@
 void bncComb::dumpResults(const QMap<QString, t_corr*>& resCorr) {
 
-  ostringstream out; out.setf(std::ios::fixed);
-  QStringList   corrLines;
+  QString     outLines;
+  QStringList corrLines;
 
   unsigned year, month, day, hour, minute;
@@ -669 +669 @@
   _resTime.civil_time(hour, minute, sec);
 
-  out << "*  " 
-      << setw(4)  << year   << " " 
-      << setw(2)  << month  << " " 
-      << setw(2)  << day    << " " 
-      << setw(2)  << hour   << " " 
-      << setw(2)  << minute << " " 
-      << setw(12) << setprecision(8) << sec << " "
-      << endl; 
+  outLines.sprintf("*  %4d %2d %2d %d %d %12.8f\n", 
+                   year, month, day, hour, minute, sec);
 
   QMapIterator<QString, t_corr*> it(resCorr);
@@ -700 +694 @@
     }
     
-    out << corr->prn.toAscii().data()
-        << " APC 3 " 
-        << setw(15) << setprecision(4) << xc(1)
-        << setw(15) << setprecision(4) << xc(2)
-        << setw(15) << setprecision(4) << xc(3)
-        << " Clk 1 "
-        << setw(15) << setprecision(4) << xc(4) * t_CST::c
-        << " Vel 3 " 
-        << setw(15) << setprecision(4) << vv(1)
-        << setw(15) << setprecision(4) << vv(2)
-        << setw(15) << setprecision(4) << vv(3)
-        << " CoM 3 " 
-        << setw(15) << setprecision(4) << xc(1) - dx(1)
-        << setw(15) << setprecision(4) << xc(2) - dx(2)
-        << setw(15) << setprecision(4) << xc(3) - dx(2)
-        << endl;
+    outLines += corr->prn;
+    QString hlp;
+    hlp.sprintf(" APC 3 %15.4f %15.4f %15.4f"
+                " Clk 1 %15.4f"
+                " Vel 3 %15.4f %15.4f %15.4f"
+                " CoM 3 %15.4f %15.4f %15.4f\n",
+                xc(1), xc(2), xc(3), 
+                xc(4)*t_CST::c, 
+                vv(1), vv(2), vv(3),
+                xc(1)-dx(1), xc(2)-dx(2), xc(3)-dx(3));
+    outLines += hlp;
+
+    qDebug() << corr->prn << xc(1) << xc(2) << xc(3) << xc(4)*t_CST::c
+             << vv(1) << vv(2) << vv(3) << dx(1) << dx(2) << dx(3);
  
     QString line;
@@ -744 +736 @@
     delete corr;
   }
-  out << "EOE" << endl; // End Of Epoch flag
+
+  outLines += "EOE\n"; // End Of Epoch flag
 
   if (!_rtnetDecoder) {
@@ -751 +744 @@
 
   vector<string> errmsg;
-  _rtnetDecoder->Decode((char*) out.str().data(), out.str().size(), errmsg);
+  _rtnetDecoder->Decode(outLines.toAscii().data(), outLines.length(), errmsg);
 
   // Optionally send new Corrections to PPP