Changeset 622 in ntrip for trunk/BNC/RTCM3
- Timestamp:
- Dec 16, 2007, 4:27:13 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/RTCM3/RTCM3Decoder.cpp
r621 r622 84 84 //////////////////////////////////////////////////////////////////////////// 85 85 RTCM3Decoder::~RTCM3Decoder() { 86 QListIterator<p_obs> it(_obsList);87 while (it.hasNext()) {88 delete it.next();89 }90 _obsList.clear();91 86 } 92 87 … … 116 111 117 112 for (int ii = 0; ii < _Parser.Data.numsats; ii++) { 118 Observation* obs = new Observation();113 p_obs obs = new t_obs(); 119 114 if (_Parser.Data.satellites[ii] <= PRN_GPS_END) { 120 obs-> satSys = 'G';121 obs-> satNum = _Parser.Data.satellites[ii];115 obs->_o.satSys = 'G'; 116 obs->_o.satNum = _Parser.Data.satellites[ii]; 122 117 } 123 118 else if (_Parser.Data.satellites[ii] <= PRN_GLONASS_END) { 124 obs-> satSys = 'R';125 obs-> satNum = _Parser.Data.satellites[ii] - PRN_GLONASS_START + 1;119 obs->_o.satSys = 'R'; 120 obs->_o.satNum = _Parser.Data.satellites[ii] - PRN_GLONASS_START + 1; 126 121 } 127 122 else { 128 obs-> satSys = 'S';129 obs-> satNum = _Parser.Data.satellites[ii] - PRN_WAAS_START + 20;123 obs->_o.satSys = 'S'; 124 obs->_o.satNum = _Parser.Data.satellites[ii] - PRN_WAAS_START + 20; 130 125 } 131 obs-> GPSWeek = _Parser.Data.week;132 obs-> GPSWeeks = _Parser.Data.timeofweek / 1000.0;126 obs->_o.GPSWeek = _Parser.Data.week; 127 obs->_o.GPSWeeks = _Parser.Data.timeofweek / 1000.0; 133 128 134 129 for (int jj = 0; jj < _Parser.numdatatypesGPS; jj++) { … … 155 150 { 156 151 if (_Parser.dataflag[jj] & GNSSDF_C1DATA) { 157 obs-> C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];152 obs->_o.C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; 158 153 } 159 154 else if (_Parser.dataflag[jj] & GNSSDF_C2DATA) { 160 obs-> C2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];155 obs->_o.C2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; 161 156 } 162 157 else if (_Parser.dataflag[jj] & GNSSDF_P1DATA) { 163 obs-> P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];158 obs->_o.P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; 164 159 } 165 160 else if (_Parser.dataflag[jj] & GNSSDF_P2DATA) { 166 obs-> P2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]];161 obs->_o.P2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; 167 162 } 168 163 else if (df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) { 169 obs-> L1 = _Parser.Data.measdata[ii][pos];170 obs-> SNR1 = _Parser.Data.snrL1[ii];164 obs->_o.L1 = _Parser.Data.measdata[ii][pos]; 165 obs->_o.SNR1 = _Parser.Data.snrL1[ii]; 171 166 } 172 167 else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) { 173 obs-> L2 = _Parser.Data.measdata[ii][pos];174 obs-> SNR2 = _Parser.Data.snrL2[ii];168 obs->_o.L2 = _Parser.Data.measdata[ii][pos]; 169 obs->_o.SNR2 = _Parser.Data.snrL2[ii]; 175 170 } 176 171 else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) { 177 obs-> S1 = _Parser.Data.measdata[ii][pos];172 obs->_o.S1 = _Parser.Data.measdata[ii][pos]; 178 173 } 179 174 else if (df & (GNSSDF_S2CDATA|GNSSDF_S2PDATA)) { 180 obs-> S2 = _Parser.Data.measdata[ii][pos];175 obs->_o.S2 = _Parser.Data.measdata[ii][pos]; 181 176 } 182 177 }
Note:
See TracChangeset
for help on using the changeset viewer.