Changeset 2669 in ntrip for trunk/BNC/RTCM3

Timestamp:

Nov 11, 2010, 10:28:51 AM (14 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/RTCM3/RTCM3Decoder.cpp (modified) (3 diffs)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -235 +235 @@
             for (int ii = 0; ii < parser.Data.numsats; ii++) {
               p_obs obs = new t_obs();
-              _obsList.push_back(obs);
               if      (parser.Data.satellites[ii] <= PRN_GPS_END) {
                 obs->_o.satSys = 'G';
@@ -244 +243 @@
                 obs->_o.satNum = parser.Data.satellites[ii] - PRN_GLONASS_START + 1;
                 ////  obs->_o.slotNum   = parser.Data.channels[ii];
-                obs->_o.slotNum   = parser.GLOFreq[obs->_o.satNum] - 100;
+                if (obs->_o.satNum <= PRN_GLONASS_NUM && 
+                    parser.GLOFreq[obs->_o.satNum-1] != 0) {
+                  obs->_o.slotNum   = parser.GLOFreq[obs->_o.satNum-1] - 100;
+                }
+                else { 
+                  delete obs;
+                  obs = 0;
+                }
               }
               else {
@@ -250 +256 @@
                 obs->_o.satNum = parser.Data.satellites[ii] - PRN_WAAS_START + 20;
               }
+
+              if (obs) {
+                _obsList.push_back(obs);
+              }
+              else {
+                continue;
+              }
+
               obs->_o.GPSWeek  = parser.Data.week;
               obs->_o.GPSWeeks = parser.Data.timeofweek / 1000.0;