Changeset 2028 in ntrip

Timestamp:

Nov 26, 2009, 10:22:36 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncpppthread.cpp (modified) (4 diffs)
• bncpppthread.h (modified) (4 diffs)

trunk/BNC/bncpppthread.cpp

@@ -118 +118 @@
     QByteArray staID = QByteArray(obs->StatID); 
     if (staID == _staID) {
-      _data->GPSWeek  = obs->GPSWeek;
-      _data->GPSWeeks = obs->GPSWeeks;
-
+      if (_data->tt.undef()) {
+        _data->tt.set(obs->GPSWeek, obs->GPSWeeks);
+      }
       ++_data->numSat;
       _data->prn[_data->numSat] = 
@@ -174 +174 @@
         _corr[prn] = cc;
       }
+      cc->tt.set(GPSweek, GPSweeks);
       in >> cc->iod >> cc->dClk >> cc->rao[0] >> cc->rao[1] >> cc->rao[2];
     }
@@ -181 +182 @@
 // Satellite Position
 ////////////////////////////////////////////////////////////////////////////
-t_irc bncPPPthread::getSatPos(const QString& prn, 
+t_irc bncPPPthread::getSatPos(const t_time& tt, const QString& prn, 
                               ColumnVector& xc, ColumnVector& vv) {
 
-
+  return success;
 }
 
@@ -202 +203 @@
     ColumnVector vv(3);
 
-    if (getSatPos(prn, xc, vv) == success) {
+    if (getSatPos(_data->tt, prn, xc, vv) == success) {
 
     }

trunk/BNC/bncpppthread.h

@@ -32 +32 @@
 
 #include "bncconst.h"
+#include "t_time.h"
 #include "RTCM/GPSDecoder.h"
 #include "RTCM3/ephemeris.h"
@@ -42 +43 @@
   t_data() {numSat = 0;}
   ~t_data() {}
-  int     GPSWeek;
-  double  GPSWeeks;
+  t_time  tt;
   int     numSat;  
   QString prn[MAXOBS+1];
@@ -56 +56 @@
 class t_corr {
  public:
+  t_time tt;
   int    iod;
   double dClk;
@@ -86 +87 @@
 
  private:
-  t_irc getSatPos(const QString& prn, ColumnVector& xc, ColumnVector& vv);
+  t_irc getSatPos(const t_time& tt, const QString& prn, 
+                  ColumnVector& xc, ColumnVector& vv);
   void processEpoch();
   QByteArray             _staID;