Changeset 4778 in ntrip for trunk

Timestamp:

Oct 26, 2012, 6:35:15 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/RTRover/bncrtrover.cpp (modified) (5 diffs)

trunk/BNC/src/RTRover/bncrtrover.cpp

@@ -242 +242 @@
 ////////////////////////////////////////////////////////////////////////////
 void copyObs(const t_obs& obsBnc, rtrover_satObs& satObs) {
+  bncTime obsTime(obsBnc.GPSWeek, obsBnc.GPSWeeks);
   satObs._satellite._system = obsBnc.satSys;
   satObs._satellite._number = obsBnc.satNum;
+  satObs._time._mjd  = obsTime.mjd();
+  satObs._time._sec  = obsTime.daysec();
+  satObs._slotNumber = obsBnc.slotNum;
   QMap<QByteArray, rtrover_obs> allObs;
   for (int iEntry = 0; iEntry < GNSSENTRY_NUMBER; ++iEntry) {
@@ -251 +255 @@
         QByteArray codeType = rnxStr.mid(1);
         if (!allObs.contains(codeType)) {
-          allObs[codeType]._rnxType[0] = codeType[0];
-          allObs[codeType]._rnxType[1] = codeType[1];
-          allObs[codeType]._code       = 0.0;
-          allObs[codeType]._phase      = 0.0;
-          allObs[codeType]._doppler    = 0.0;
-          allObs[codeType]._snr        = 0.0;
+          allObs[codeType]._rnxType[0]  = codeType[0];
+          allObs[codeType]._rnxType[1]  = codeType[1];
+          allObs[codeType]._code        = 0.0;
+          allObs[codeType]._phase       = 0.0;
+          allObs[codeType]._doppler     = 0.0;
+          allObs[codeType]._snr         = 0.0;
+          allObs[codeType]._slip        = false;
+          allObs[codeType]._slipCounter = -1;
         }
         if      (rnxStr[0] == 'C') {
@@ -322 +328 @@
     dt = _epochs.back()->_time - _epochs.front()->_time;
   }
-  cout << "dt = " << dt << endl;
   if (dt < WAITTIME) {
     return;
@@ -333 +338 @@
 
   int numSatRover = frontEpoData->_obsRover.size();
-  cout << "numSatRover = " << numSatRover << endl;
   rtrover_satObs satObsRover[numSatRover];
   for (int ii = 0; ii < numSatRover; ii++) {
@@ -343 +347 @@
   int numSatBase = frontEpoData->_obsBase.size();
   rtrover_satObs satObsBase[numSatBase];
-  cout << "numSatBase = " << numSatBase << endl;
   for (int ii = 0; ii < numSatBase; ii++) {
     const t_obs& obsBnc = frontEpoData->_obsBase[ii];