Changeset 6556 in ntrip for trunk/BNC/src/satObs.cpp
- Timestamp:
- Jan 19, 2015, 6:57:52 PM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/BNC/src/satObs.cpp
r6515 r6556 30 30 if (!epoTime.valid()) { 31 31 epoTime = corr._time; 32 *out << "> CLOCK " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 32 *out << "> CLOCK " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 33 << corr._updateInt << " " 33 34 << corrList.size() << ' ' << corr._staID << endl; 34 35 } … … 44 45 //////////////////////////////////////////////////////////////////////////// 45 46 void t_clkCorr::readEpoch(const string& epoLine, istream& inStream, QList<t_clkCorr>& corrList) { 46 bncTime epoTime; 47 int numCorr; 48 string staID; 49 if (t_corrSSR::readEpoLine(epoLine, epoTime, numCorr, staID) != t_corrSSR::clkCorr) { 47 bncTime epoTime; 48 unsigned int updateInt; 49 int numCorr; 50 string staID; 51 if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numCorr, staID) != t_corrSSR::clkCorr) { 50 52 return; 51 53 } 52 54 for (int ii = 0; ii < numCorr; ii++) { 53 55 t_clkCorr corr; 54 corr._time = epoTime; 55 corr._staID = staID; 56 corr._time = epoTime; 57 corr._updateInt = updateInt; 58 corr._staID = staID; 56 59 57 60 string line; … … 91 94 if (!epoTime.valid()) { 92 95 epoTime = corr._time; 93 *out << "> ORBIT " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 96 *out << "> ORBIT " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 97 << corr._updateInt << " " 94 98 << corrList.size() << ' ' << corr._staID << endl; 95 99 } … … 108 112 //////////////////////////////////////////////////////////////////////////// 109 113 void t_orbCorr::readEpoch(const string& epoLine, istream& inStream, QList<t_orbCorr>& corrList) { 110 bncTime epoTime; 111 int numCorr; 112 string staID; 113 if (t_corrSSR::readEpoLine(epoLine, epoTime, numCorr, staID) != t_corrSSR::orbCorr) { 114 bncTime epoTime; 115 unsigned int updateInt; 116 int numCorr; 117 string staID; 118 if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numCorr, staID) != t_corrSSR::orbCorr) { 114 119 return; 115 120 } 116 121 for (int ii = 0; ii < numCorr; ii++) { 117 122 t_orbCorr corr; 118 corr._time = epoTime; 119 corr._staID = staID; 123 corr._time = epoTime; 124 corr._updateInt = updateInt; 125 corr._staID = staID; 120 126 121 127 string line; … … 144 150 if (!epoTime.valid()) { 145 151 epoTime = satCodeBias._time; 146 *out << "> CODE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 152 *out << "> CODE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 153 << satCodeBias._updateInt << " " 147 154 << biasList.size() << ' ' << satCodeBias._staID << endl; 148 155 } … … 161 168 //////////////////////////////////////////////////////////////////////////// 162 169 void t_satCodeBias::readEpoch(const string& epoLine, istream& inStream, QList<t_satCodeBias>& biasList) { 163 bncTime epoTime; 164 int numSat; 165 string staID; 166 if (t_corrSSR::readEpoLine(epoLine, epoTime, numSat, staID) != t_corrSSR::codeBias) { 170 bncTime epoTime; 171 unsigned int updateInt; 172 int numSat; 173 string staID; 174 if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numSat, staID) != t_corrSSR::codeBias) { 167 175 return; 168 176 } 169 177 for (int ii = 0; ii < numSat; ii++) { 170 178 t_satCodeBias satCodeBias; 171 satCodeBias._time = epoTime; 172 satCodeBias._staID = staID; 179 satCodeBias._time = epoTime; 180 satCodeBias._updateInt = updateInt; 181 satCodeBias._staID = staID; 173 182 174 183 string line; … … 203 212 if (!epoTime.valid()) { 204 213 epoTime = satPhaseBias._time; 205 *out << "> PHASE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 214 *out << "> PHASE_BIAS " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 215 << satPhaseBias._updateInt << " " 206 216 << biasList.size() << ' ' << satPhaseBias._staID << endl; 207 217 } … … 225 235 //////////////////////////////////////////////////////////////////////////// 226 236 void t_satPhaseBias::readEpoch(const string& epoLine, istream& inStream, QList<t_satPhaseBias>& biasList) { 227 bncTime epoTime; 228 int numSat; 229 string staID; 230 if (t_corrSSR::readEpoLine(epoLine, epoTime, numSat, staID) != t_corrSSR::phaseBias) { 237 bncTime epoTime; 238 unsigned int updateInt; 239 int numSat; 240 string staID; 241 if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numSat, staID) != t_corrSSR::phaseBias) { 231 242 return; 232 243 } 233 244 for (int ii = 0; ii < numSat; ii++) { 234 245 t_satPhaseBias satPhaseBias; 235 satPhaseBias._time = epoTime; 236 satPhaseBias._staID = staID; 246 satPhaseBias._time = epoTime; 247 satPhaseBias._updateInt = updateInt; 248 satPhaseBias._staID = staID; 237 249 238 250 string line; … … 264 276 out->setf(ios::fixed); 265 277 bncTime epoTime = vTec._time; 266 *out << "> VTEC " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 278 *out << "> VTEC " << epoTime.datestr(' ') << ' ' << epoTime.timestr(1,' ') << " " 279 << vTec._updateInt << " " 267 280 << vTec._layers.size() << ' ' << vTec._staID << endl; 268 281 for (unsigned ii = 0; ii < vTec._layers.size(); ii++) { … … 281 294 //////////////////////////////////////////////////////////////////////////// 282 295 void t_vTec::read(const string& epoLine, istream& inStream, t_vTec& vTec) { 283 bncTime epoTime; 284 int numLayers; 285 string staID; 286 if (t_corrSSR::readEpoLine(epoLine, epoTime, numLayers, staID) != t_corrSSR::vTec) { 296 bncTime epoTime; 297 unsigned int updateInt; 298 int numLayers; 299 string staID; 300 if (t_corrSSR::readEpoLine(epoLine, epoTime, updateInt, numLayers, staID) != t_corrSSR::vTec) { 287 301 return; 288 302 } … … 290 304 return; 291 305 } 292 vTec._time = epoTime; 293 vTec._staID = staID; 306 vTec._time = epoTime; 307 vTec._updateInt = updateInt; 308 vTec._staID = staID; 294 309 for (int ii = 0; ii < numLayers; ii++) { 295 310 t_vTecLayer layer; … … 323 338 //////////////////////////////////////////////////////////////////////////// 324 339 t_corrSSR::e_type t_corrSSR::readEpoLine(const string& line, bncTime& epoTime, 325 int& numEntries, string& staID) { 340 unsigned int& updateInt, int& numEntries, 341 string& staID) { 326 342 327 343 istringstream inLine(line.c_str()); … … 333 349 334 350 inLine >> epoChar >> typeString 335 >> year >> month >> day >> hour >> min >> sec >> numEntries >> staID;351 >> year >> month >> day >> hour >> min >> sec >> updateInt >> numEntries >> staID; 336 352 337 353 if (epoChar == '>') {
Note:
See TracChangeset
for help on using the changeset viewer.