Changeset 1197 in ntrip for trunk/BNS/bns.cpp

Timestamp:

Nov 15, 2008, 10:33:54 AM (15 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNS/bns.cpp (modified) (4 diffs)

trunk/BNS/bns.cpp

@@ -289 +289 @@
 void t_bns::readEpoch() {
 
-  QByteArray line = _clkSocket->readLine();
-
-  if (_echoStream) {
-    *_echoStream << line;
-    _echoStream->flush();
-  }
-
-  emit(newClkBytes(line.length()));
-
-  if (line.indexOf('*') == -1) {
+  // Read the first line (if not already read)
+  // -----------------------------------------
+  if (_clkLine.indexOf('*') == -1) {
+    _clkLine = _clkSocket->readLine();
+    if (_echoStream) {
+      *_echoStream << _clkLine;
+      _echoStream->flush();
+    }
+    emit(newClkBytes(_clkLine.length()));
+  }
+
+  if (_clkLine.indexOf('*') == -1) {
     return;
   }
 
-  QTextStream in(line);
+  QTextStream in(_clkLine);
 
   QString hlp;
-  int     GPSweek, numSat;
+  int     year, month, day, hour, min;
+  double  sec;
+  in >> hlp >> year >> month >> day >> hour >> min >> sec;
+
+  int     GPSweek;
   double  GPSweeks;
 
-  in >> hlp >> GPSweek >> GPSweeks >> numSat;
-
-  if (numSat > 0) {
+  GPSweekFromYMDhms(year, month, day, hour, min, sec, GPSweek, GPSweeks);
+
+  QStringList prns;
+
+  // Loop over all satellites
+  // ------------------------
+  QStringList lines;
+  for (;;) {
+    if (!_clkSocket->canReadLine()) {
+      return;
+    }
+    _clkLine = _clkSocket->readLine();
+    if (_echoStream) {
+      *_echoStream << _clkLine;
+      _echoStream->flush();
+    }
+    if (_clkLine[0] == '*') {
+      return;
+    }
+    if (_clkLine[0] == 'P') {
+      _clkLine.remove(0,1);
+      lines.push_back(_clkLine);
+    } 
+  }
+
+  if (lines.size() > 0) {
 
     QStringList prns;
@@ -328 +357 @@
         co.SatRefDatum       = DATUM_ITRF;
       
-        for (int ii = 1; ii <= numSat; ii++) {
-      
+        for (int ii = 0; ii < lines.size(); ii++) {
+
           QString      prn;
           ColumnVector xx(5);
@@ -335 +364 @@
       
           if (oldEph == 0 && ic == 0) {
-            line = _clkSocket->readLine();
-
-            if (_echoStream) {
-              *_echoStream << line;
-              _echoStream->flush();
-            }
-
-            QTextStream in(line);
+            QTextStream in(lines[ii].toAscii());
             in >> prn;
             prns << prn;
             if ( _ephList.contains(prn) ) {
-              in >> xx(1) >> xx(2) >> xx(3) >> xx(4) >> xx(5); xx(4) *= 1e-6;
-      
-              //// beg test (zero clock correction for Gerhard Wuebbena)
-              ////            xx(4) -= xx(5) / 299792458.0;
-              //// end test
+              in >> xx(1) >> xx(2) >> xx(3) >> xx(4);
+              xx(1) *= 1e3;
+              xx(2) *= 1e3;
+              xx(3) *= 1e3;
+              xx(4) *= 1e-6;
       
               t_ephPair* pair = _ephList[prn];
@@ -358 +380 @@
           }
           else {
-            prn = prns[ii-1];
+            prn = prns[ii];
             if ( _ephList.contains(prn) ) {
               t_ephPair* pair = _ephList[prn];