Index: trunk/BNC/RTCM3/RTCM3Decoder.cpp =================================================================== --- trunk/BNC/RTCM3/RTCM3Decoder.cpp (revision 2526) +++ trunk/BNC/RTCM3/RTCM3Decoder.cpp (revision 2527) @@ -65,21 +65,12 @@ // Constructor //////////////////////////////////////////////////////////////////////////// -RTCM3Decoder::RTCM3Decoder(const QString& staID, bool inputFromFile) : +RTCM3Decoder::RTCM3Decoder(const QString& staID, bncRawFile* rawFile) : GPSDecoder() { - _staID = staID; - _inputFromFile = inputFromFile; + _staID = staID; + _rawFile = rawFile; bncSettings settings; _checkMountPoint = settings.value("miscMount").toString(); - - // Ensure, that the Decoder uses the "old" convention for the data structure for Rinex2. Perlt - _Parser.rinex3 = 0; - - memset(&_Parser, 0, sizeof(_Parser)); - - double secGPS; - currentGPSWeeks(_Parser.GPSWeek, secGPS); - _Parser.GPSTOW = int(secGPS); connect(this, SIGNAL(newGPSEph(gpsephemeris*)), @@ -121,5 +112,5 @@ if ( _coDecoder->Decode(buffer, bufLen, errmsg) == success ) { decoded = true; - if (!_inputFromFile && _mode == unknown) { + if (!_rawFile && _mode == unknown) { _mode = corrections; } @@ -127,4 +118,25 @@ } + // Find the corresponding parser + // ----------------------------- + QByteArray staID("default"); + if (_rawFile) { + staID = _rawFile->staID(); + } + + bool newParser = !_parsers.contains(staID); + + RTCM3ParserData& parser = _parsers[staID]; + + // Initialize a new parser + // ----------------------- + if (newParser) { + parser.rinex3 = 0; + memset(&parser, 0, sizeof(parser)); + double secGPS; + currentGPSWeeks(parser.GPSWeek, secGPS); + parser.GPSTOW = int(secGPS); + } + // Remaining part decodes the Observations // --------------------------------------- @@ -132,13 +144,13 @@ for (int ii = 0; ii < bufLen; ii++) { - _Parser.Message[_Parser.MessageSize++] = buffer[ii]; - - if (_Parser.MessageSize >= _Parser.NeedBytes) { - - while(int rr = RTCM3Parser(&_Parser)) { + parser.Message[parser.MessageSize++] = buffer[ii]; + + if (parser.MessageSize >= parser.NeedBytes) { + + while(int rr = RTCM3Parser(&parser)) { // RTCMv3 message types // -------------------- - _typeList.push_back(_Parser.blocktype); + _typeList.push_back(parser.blocktype); // RTCMv3 antenna descriptor @@ -146,5 +158,5 @@ if(rr == 1007 || rr == 1008 || rr == 1033) { - _antType.push_back(_Parser.antenna); /* correct ? */ + _antType.push_back(parser.antenna); /* correct ? */ } @@ -155,13 +167,13 @@ _antList.push_back(t_antInfo()); _antList.back().type = t_antInfo::ARP; - _antList.back().xx = _Parser.antX * 1e-4; - _antList.back().yy = _Parser.antY * 1e-4; - _antList.back().zz = _Parser.antZ * 1e-4; + _antList.back().xx = parser.antX * 1e-4; + _antList.back().yy = parser.antY * 1e-4; + _antList.back().zz = parser.antZ * 1e-4; _antList.back().message = rr; // Remember station position for 1003 message decoding - _antXYZ[0] = _Parser.antX * 1e-4; - _antXYZ[1] = _Parser.antY * 1e-4; - _antXYZ[2] = _Parser.antZ * 1e-4; + _antXYZ[0] = parser.antX * 1e-4; + _antXYZ[1] = parser.antY * 1e-4; + _antXYZ[2] = parser.antZ * 1e-4; } @@ -172,15 +184,15 @@ _antList.push_back(t_antInfo()); _antList.back().type = t_antInfo::ARP; - _antList.back().xx = _Parser.antX * 1e-4; - _antList.back().yy = _Parser.antY * 1e-4; - _antList.back().zz = _Parser.antZ * 1e-4; - _antList.back().height = _Parser.antH * 1e-4; + _antList.back().xx = parser.antX * 1e-4; + _antList.back().yy = parser.antY * 1e-4; + _antList.back().zz = parser.antZ * 1e-4; + _antList.back().height = parser.antH * 1e-4; _antList.back().height_f = true; _antList.back().message = rr; // Remember station position for 1003 message decoding - _antXYZ[0] = _Parser.antX * 1e-4; - _antXYZ[1] = _Parser.antY * 1e-4; - _antXYZ[2] = _Parser.antZ * 1e-4; + _antXYZ[0] = parser.antX * 1e-4; + _antXYZ[1] = parser.antY * 1e-4; + _antXYZ[2] = parser.antZ * 1e-4; } @@ -190,7 +202,7 @@ decoded = true; - if (!_Parser.init) { - HandleHeader(&_Parser); - _Parser.init = 1; + if (!parser.init) { + HandleHeader(&parser); + parser.init = 1; } @@ -205,22 +217,22 @@ } - for (int ii = 0; ii < _Parser.Data.numsats; ii++) { + 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) { + if (parser.Data.satellites[ii] <= PRN_GPS_END) { obs->_o.satSys = 'G'; - obs->_o.satNum = _Parser.Data.satellites[ii]; + obs->_o.satNum = parser.Data.satellites[ii]; } - else if (_Parser.Data.satellites[ii] <= PRN_GLONASS_END) { + else if (parser.Data.satellites[ii] <= PRN_GLONASS_END) { obs->_o.satSys = 'R'; - obs->_o.satNum = _Parser.Data.satellites[ii] - PRN_GLONASS_START + 1; - obs->_o.slot = _Parser.Data.channels[ii]; + obs->_o.satNum = parser.Data.satellites[ii] - PRN_GLONASS_START + 1; + obs->_o.slot = parser.Data.channels[ii]; } else { obs->_o.satSys = 'S'; - obs->_o.satNum = _Parser.Data.satellites[ii] - PRN_WAAS_START + 20; + obs->_o.satNum = parser.Data.satellites[ii] - PRN_WAAS_START + 20; } - obs->_o.GPSWeek = _Parser.Data.week; - obs->_o.GPSWeeks = _Parser.Data.timeofweek / 1000.0; + obs->_o.GPSWeek = parser.Data.week; + obs->_o.GPSWeeks = parser.Data.timeofweek / 1000.0; // Estimate "GPS Integer L1 Pseudorange Modulus Ambiguity" @@ -261,22 +273,22 @@ // Loop over all data types // ------------------------ - for (int jj = 0; jj < _Parser.numdatatypesGPS; jj++) { + for (int jj = 0; jj < parser.numdatatypesGPS; jj++) { int v = 0; // sepearated declaration and initalization of df and pos. Perlt int df; int pos; - df = _Parser.dataflag[jj]; - pos = _Parser.datapos[jj]; - if ( (_Parser.Data.dataflags[ii] & df) - && !isnan(_Parser.Data.measdata[ii][pos]) - && !isinf(_Parser.Data.measdata[ii][pos])) { + df = parser.dataflag[jj]; + pos = parser.datapos[jj]; + if ( (parser.Data.dataflags[ii] & df) + && !isnan(parser.Data.measdata[ii][pos]) + && !isinf(parser.Data.measdata[ii][pos])) { v = 1; } else { - df = _Parser.dataflagGPS[jj]; - pos = _Parser.dataposGPS[jj]; - if ( (_Parser.Data.dataflags[ii] & df) - && !isnan(_Parser.Data.measdata[ii][pos]) - && !isinf(_Parser.Data.measdata[ii][pos])) { + df = parser.dataflagGPS[jj]; + pos = parser.dataposGPS[jj]; + if ( (parser.Data.dataflags[ii] & df) + && !isnan(parser.Data.measdata[ii][pos]) + && !isinf(parser.Data.measdata[ii][pos])) { v = 1; } @@ -287,36 +299,36 @@ else { - int isat = (_Parser.Data.satellites[ii] < 120 - ? _Parser.Data.satellites[ii] - : _Parser.Data.satellites[ii] - 80); + int isat = (parser.Data.satellites[ii] < 120 + ? parser.Data.satellites[ii] + : parser.Data.satellites[ii] - 80); // variables df and pos are used consequently. Perlt if (df & GNSSDF_C1DATA) { - obs->_o.C1 = _Parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.C1 = parser.Data.measdata[ii][pos] + modulusAmb; } else if (df & GNSSDF_C2DATA) { - obs->_o.C2 = _Parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.C2 = parser.Data.measdata[ii][pos] + modulusAmb; } else if (df & GNSSDF_P1DATA) { - obs->_o.P1 = _Parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.P1 = parser.Data.measdata[ii][pos] + modulusAmb; } else if (df & GNSSDF_P2DATA) { - obs->_o.P2 = _Parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.P2 = parser.Data.measdata[ii][pos] + modulusAmb; } else if (df & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) { - obs->_o.L1 = _Parser.Data.measdata[ii][pos] + modulusAmb; - obs->_o.SNR1 = _Parser.Data.snrL1[ii]; - obs->_o.lock_timei_L1 = _Parser.lastlockGPSl1[isat]; + obs->_o.L1 = parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.SNR1 = parser.Data.snrL1[ii]; + obs->_o.lock_timei_L1 = parser.lastlockGPSl1[isat]; } else if (df & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) { - obs->_o.L2 = _Parser.Data.measdata[ii][pos] + modulusAmb; - obs->_o.SNR2 = _Parser.Data.snrL2[ii]; - obs->_o.lock_timei_L2 = _Parser.lastlockGPSl2[isat]; + obs->_o.L2 = parser.Data.measdata[ii][pos] + modulusAmb; + obs->_o.SNR2 = parser.Data.snrL2[ii]; + obs->_o.lock_timei_L2 = parser.lastlockGPSl2[isat]; } else if (df & (GNSSDF_S1CDATA|GNSSDF_S1PDATA)) { - obs->_o.S1 = _Parser.Data.measdata[ii][pos]; + obs->_o.S1 = parser.Data.measdata[ii][pos]; } else if (df & (GNSSDF_S2CDATA|GNSSDF_S2PDATA)) { - obs->_o.S2 = _Parser.Data.measdata[ii][pos]; + obs->_o.S2 = parser.Data.measdata[ii][pos]; } } @@ -329,5 +341,5 @@ else if (rr == 1019) { decoded = true; - gpsephemeris* ep = new gpsephemeris(_Parser.ephemerisGPS); + gpsephemeris* ep = new gpsephemeris(parser.ephemerisGPS); emit newGPSEph(ep); } @@ -337,5 +349,5 @@ else if (rr == 1020) { decoded = true; - glonassephemeris* ep = new glonassephemeris(_Parser.ephemerisGLONASS); + glonassephemeris* ep = new glonassephemeris(parser.ephemerisGLONASS); emit newGlonassEph(ep); } @@ -343,5 +355,5 @@ } } - if (!_inputFromFile && _mode == unknown && decoded) { + if (!_rawFile && _mode == unknown && decoded) { _mode = observations; } Index: trunk/BNC/RTCM3/RTCM3Decoder.h =================================================================== --- trunk/BNC/RTCM3/RTCM3Decoder.h (revision 2526) +++ trunk/BNC/RTCM3/RTCM3Decoder.h (revision 2527) @@ -33,4 +33,5 @@ #include "RTCM3coDecoder.h" #include "ephemeris.h" +#include "bncrawfile.h" extern "C" { @@ -41,5 +42,5 @@ Q_OBJECT public: - RTCM3Decoder(const QString& staID, bool inputFromFile); + RTCM3Decoder(const QString& staID, bncRawFile* rawFile); virtual ~RTCM3Decoder(); virtual t_irc Decode(char* buffer, int bufLen, std::vector& errmsg); @@ -61,5 +62,5 @@ QString _staID; QString _checkMountPoint; - struct RTCM3ParserData _Parser; + QMap _parsers; RTCM3coDecoder* _coDecoder; t_mode _mode; @@ -67,5 +68,5 @@ std::map _ephList; double _antXYZ[3]; - bool _inputFromFile; + bncRawFile* _rawFile; }; Index: trunk/BNC/bncgetthread.cpp =================================================================== --- trunk/BNC/bncgetthread.cpp (revision 2526) +++ trunk/BNC/bncgetthread.cpp (revision 2527) @@ -300,5 +300,5 @@ _format.indexOf("RTCM 3") != -1 ) { emit(newMessage(_staID + ": Get data in RTCM 3.x format", true)); - _decoder = new RTCM3Decoder(_staID, bool(_rawFile != 0)); + _decoder = new RTCM3Decoder(_staID, _rawFile); connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)), this, SIGNAL(newMessage(QByteArray,bool))); @@ -387,7 +387,5 @@ } else if (_rawFile) { - QByteArray currStaID; - QByteArray currFormat; - data = _rawFile->readChunk(currStaID, currFormat); + data = _rawFile->readChunk(); if (data.isEmpty()) { Index: trunk/BNC/bncrawfile.cpp =================================================================== --- trunk/BNC/bncrawfile.cpp (revision 2526) +++ trunk/BNC/bncrawfile.cpp (revision 2527) @@ -105,5 +105,5 @@ // Raw Input //////////////////////////////////////////////////////////////////////////// -QByteArray bncRawFile::readChunk(QByteArray& currStaID, QByteArray& currFormat){ +QByteArray bncRawFile::readChunk(){ QByteArray data; @@ -113,6 +113,6 @@ QStringList lst = line.split(' '); - currStaID = lst.value(0).toAscii(); - currFormat = lst.value(1).toAscii(); + _staID = lst.value(0).toAscii(); + _format = lst.value(1).toAscii(); int nBytes = lst.value(2).toInt(); Index: trunk/BNC/bncrawfile.h =================================================================== --- trunk/BNC/bncrawfile.h (revision 2526) +++ trunk/BNC/bncrawfile.h (revision 2527) @@ -30,5 +30,4 @@ #include "bnccaster.h" -#include "RTCM3/RTCM3Decoder.h" class bncRawFile { @@ -43,5 +42,5 @@ QByteArray format() const {return _format;} QByteArray staID() const {return _staID;} - QByteArray readChunk(QByteArray& currStaID, QByteArray& currFormat); + QByteArray readChunk(); void writeRawData(const QByteArray& data, const QByteArray& staID, const QByteArray& format);