Changeset 5980 in ntrip for trunk/BNC/src

Timestamp:

Aug 17, 2014, 2:32:50 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• PPP/pppRun.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppRun.cpp

@@ -43 +43 @@
 #include <iostream>
 #include <iomanip>
+#include <sstream>
 #include <string.h>
 #include <map>
@@ -241 +242 @@
     delete _epoData.front(); _epoData.pop_front();
     
-    emit newMessage(QByteArray(output._log.c_str()), true);
+    ostringstream log;
+    if (output._error) {
+      log << output._log;
+    }
+    else {
+      log.setf(ios::fixed);
+      log << staID.data()
+          << "  X = "  << setprecision(4) << output._xyzRover[0]
+          << "  Y = "  << setprecision(4) << output._xyzRover[1]
+          << "  Z = "  << setprecision(4) << output._xyzRover[2]
+          << "  dN = " << setprecision(4) << output._neu[0]     
+          << "  dE = " << setprecision(4) << output._neu[1]     
+          << "  dU = " << setprecision(4) << output._neu[2];
+    }
+
+    emit newMessage(QByteArray(log.str().c_str()), true);
   }
 }

trunk/BNC/src/bncwindow.cpp

@@ -1815 +1815 @@
 void bncWindow::slotWindowMessage(const QByteArray msg, bool showOnScreen) {
   if (showOnScreen ) {
-    _log->append(QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ") + msg + '\n');
+    _log->append(QDateTime::currentDateTime().toUTC().toString("yy-MM-dd hh:mm:ss ") + msg);
   }
 }