Changeset 3751 in ntrip for trunk/BNC/bncephuser.cpp

Timestamp:

Mar 30, 2012, 3:44:32 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncephuser.cpp (modified) (3 diffs)

trunk/BNC/bncephuser.cpp

@@ -208 +208 @@
   double  GPSweeks;
   in >> updateInterval >> GPSweek >> GPSweeks >> prn;
-
-  tt.set(GPSweek, GPSweeks);
 
   if      ( messageType == COTYPE_GPSCOMBINED    || 
@@ -226 +224 @@
     dotDClk    /= t_CST::c;
     dotDotDClk /= t_CST::c;
-    raoSet  = true;
-    dClkSet = true;
+
+    tClk.set(GPSweek, GPSweeks);
+    tRao.set(GPSweek, GPSweeks);
   }
   else if ( messageType == COTYPE_GPSORBIT    || 
@@ -238 +237 @@
       >> dotRao[0]    >> dotRao[1]    >> dotRao[2]
       >> dotDotRao[0] >> dotDotRao[1] >> dotDotRao[2];
-    raoSet  = true;
+
+    tRao.set(GPSweek, GPSweeks);
   }
   else if ( messageType == COTYPE_GPSCLOCK    || 
             messageType == COTYPE_GLONASSCLOCK ) {
-    int dummyIOD;
-    dClk       = 0.0;
-    dotDClk    = 0.0;
-    dotDotDClk = 0.0;
-    in >> dummyIOD >> dClk >> dotDClk >> dotDotDClk;
-    dClk       /= t_CST::c;
-    dotDClk    /= t_CST::c;
-    dotDotDClk /= t_CST::c;
-    dClkSet = true;
+    if (tRao.valid()) {
+      int dummyIOD;
+      dClk       = 0.0;
+      dotDClk    = 0.0;
+      dotDotDClk = 0.0;
+      in >> dummyIOD >> dClk >> dotDClk >> dotDotDClk;
+      dClk       /= t_CST::c;
+      dotDClk    /= t_CST::c;
+      dotDotDClk /= t_CST::c;
+
+      tClk.set(GPSweek, GPSweeks);
+    }
   }
   else if ( messageType == COTYPE_GPSHR    ||
             messageType == COTYPE_GLONASSHR ) {
-    int dummyIOD;
-    in >> dummyIOD >> hrClk;
-    hrClk /= t_CST::c; 
+    if (tRao.valid() && tClk.valid()) {
+      int dummyIOD;
+      in >> dummyIOD >> hrClk;
+      hrClk /= t_CST::c; 
+    }
   }