Changeset 873 in ntrip

Timestamp:

May 6, 2008, 10:23:13 AM (17 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (1 diff)
• bns.h (modified) (2 diffs)

trunk/BNS/bns.cpp

@@ -324 +324 @@
     
       for (int ii = 1; ii <= numSat; ii++) {
-        line = _clkSocket->readLine();
-      
-        QTextStream in(line);
-      
+
         QString      prn;
         ColumnVector xx(4);
-      
-        in >> prn >> xx(1) >> xx(2) >> xx(3) >> xx(4); 
-        xx(4) *= 1e-6;
-
-        gpsEph* ep   = 0;
-        if ( _ephList.contains(prn) ) {
-          t_ephPair* pair = _ephList[prn];
-          if (oldEph == 1) {
-            ep = pair->oldEph;
+        gpsEph*      ep = 0;
+
+        if (oldEph == 0) {
+          line = _clkSocket->readLine();
+          QTextStream in(line);
+          in >> prn;
+          if ( _ephList.contains(prn) ) {
+            in >> xx(1) >> xx(2) >> xx(3) >> xx(4); xx(4) *= 1e-6;
+            t_ephPair* pair = _ephList[prn];
+            pair->xx = xx;
+            ep = pair->eph;
           }
-          else {
-            ep = pair->eph;
+        }
+        else {
+          if ( _ephList.contains(prn) ) {
+            t_ephPair* pair = _ephList[prn];
+            prn = pair->eph->prn;
+            xx  = pair->xx;
+            ep  = pair->oldEph;
           }
         }

trunk/BNS/bns.h

@@ -20 +20 @@
     eph    = 0;
     oldEph = 0;
+    xx.ReSize(4);
   }
 
@@ -27 +28 @@
   }
 
+  ColumnVector xx;
   gpsEph* eph;
   gpsEph* oldEph;