Changeset 222 in ntrip for trunk/BNC/RTCM3/rtcm3.cpp

Timestamp:

Oct 7, 2006, 11:57:05 AM (18 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/RTCM3/rtcm3.cpp (modified) (5 diffs)

trunk/BNC/RTCM3/rtcm3.cpp

@@ -16 +16 @@
  * -----------------------------------------------------------------------*/
 
+#include <iostream>
 #include <math.h>
 
@@ -57 +58 @@
 
         if (rr == 2) {
-          cerr << "No valid RINEX! All values are modulo 299792.458!\n";
+          std::cerr << "No valid RINEX! All values are modulo 299792.458!\n";
           exit(1);
         }
@@ -63 +64 @@
         for (int ii = 0; ii < _Parser.Data.numsats; ii++) {
           Observation* obs = new Observation();
-          
-////      obs->statID   =
-////      obs->cumuLossOfCont =
-
           obs->SVPRN    = _Parser.Data.satellites[ii];
           obs->GPSWeek  = _Parser.Data.week;
-          obs->GPSWeeks = (int) (_Parser.Data.timeofweek / 1000.0);
-          obs->sec      = fmod(_Parser.Data.timeofweek / 1000.0, 3600.0);
+          obs->GPSWeeks = _Parser.Data.timeofweek / 1000.0;
 
           for (int jj = 0; jj < _Parser.numdatatypes; jj++) {
@@ -82 +78 @@
             if      (_Parser.dataflag[jj] & GNSSDF_C1DATA) {
               obs->C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              obs->pCodeIndicator = 0;
             }
             else if (_Parser.dataflag[jj] & GNSSDF_P1DATA) {
-              obs->C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
-              obs->pCodeIndicator = 1;
+              obs->P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];
             }
             else if (_Parser.dataflag[jj] & GNSSDF_P2DATA) {
@@ -100 +94 @@
             }
           }
-          m_lObsList.push_back(obs);
+          _obsList.push_back(obs);
         }
       }