Index: trunk/BNC/RTCM/GPSDecoder.h =================================================================== --- trunk/BNC/RTCM/GPSDecoder.h (revision 296) +++ trunk/BNC/RTCM/GPSDecoder.h (revision 297) @@ -1,2 +1,26 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. +// +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef GPSDECODER_H Index: trunk/BNC/RTCM/RTCM2Decoder.cpp =================================================================== --- trunk/BNC/RTCM/RTCM2Decoder.cpp (revision 296) +++ trunk/BNC/RTCM/RTCM2Decoder.cpp (revision 297) @@ -1,7 +1,26 @@ -//------------------------------------------------------------------------------ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. // -// RTCM2Decoder.cpp -// -//------------------------------------------------------------------------------ +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "../bncutils.h" Index: trunk/BNC/RTCM/RTCM2Decoder.h =================================================================== --- trunk/BNC/RTCM/RTCM2Decoder.h (revision 296) +++ trunk/BNC/RTCM/RTCM2Decoder.h (revision 297) @@ -1,7 +1,26 @@ -//------------------------------------------------------------------------------ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. // -// RTCM2Decoder.h -// -//------------------------------------------------------------------------------ +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef INC_RTCM2DECODER_H Index: trunk/BNC/RTCM3/RTCM3Decoder.cpp =================================================================== --- trunk/BNC/RTCM3/RTCM3Decoder.cpp (revision 296) +++ trunk/BNC/RTCM3/RTCM3Decoder.cpp (revision 297) @@ -1,2 +1,26 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. +// +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* ------------------------------------------------------------------------- Index: trunk/BNC/RTCM3/RTCM3Decoder.h =================================================================== --- trunk/BNC/RTCM3/RTCM3Decoder.h (revision 296) +++ trunk/BNC/RTCM3/RTCM3Decoder.h (revision 297) @@ -1,2 +1,26 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. +// +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef RTCM3DECODER_H Index: trunk/BNC/RTCM3/rtcm3.cpp =================================================================== --- trunk/BNC/RTCM3/rtcm3.cpp (revision 296) +++ (revision ) @@ -1,102 +1,0 @@ - -/* ------------------------------------------------------------------------- - * BKG NTRIP Client - * ------------------------------------------------------------------------- - * - * Class: rtcm3 - * - * Purpose: RTCM3 Decoder - * - * Author: L. Mervart - * - * Created: 24-Aug-2006 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include - -#include "rtcm3.h" -#include "bncconst.h" - -using namespace std; - -#ifndef isinf -# define isinf(x) 0 -#endif - -// Constructor -//////////////////////////////////////////////////////////////////////////// -rtcm3::rtcm3() : GPSDecoder() { - memset(&_Parser, 0, sizeof(_Parser)); - time_t tim; - tim = time(0) - ((10*365+2+5)*24*60*60 + LEAPSECONDS); - _Parser.GPSWeek = tim/(7*24*60*60); - _Parser.GPSTOW = tim%(7*24*60*60); -} - -// Destructor -//////////////////////////////////////////////////////////////////////////// -rtcm3::~rtcm3() { -} - -// -//////////////////////////////////////////////////////////////////////////// -void rtcm3::Decode(char* buffer, int bufLen) { - for (int ii = 0; ii < bufLen; ii++) { - - _Parser.Message[_Parser.MessageSize++] = buffer[ii]; - if (_Parser.MessageSize >= _Parser.NeedBytes) { - - while(int rr = RTCM3Parser(&_Parser)) { - - if (!_Parser.init) { - HandleHeader(&_Parser); - _Parser.init = 1; - } - - if (rr == 2) { - std::cerr << "No valid RINEX! All values are modulo 299792.458!\n"; - exit(1); - } - - for (int ii = 0; ii < _Parser.Data.numsats; ii++) { - Observation* obs = new Observation(); - obs->SVPRN = _Parser.Data.satellites[ii]; - obs->GPSWeek = _Parser.Data.week; - obs->GPSWeeks = _Parser.Data.timeofweek / 1000.0; - - for (int jj = 0; jj < _Parser.numdatatypes; jj++) { - - if ( !(_Parser.Data.dataflags[ii] & _Parser.dataflag[jj]) - || isnan(_Parser.Data.measdata[ii][_Parser.datapos[jj]]) - || isinf(_Parser.Data.measdata[ii][_Parser.datapos[jj]]) ) { - continue; - } - - if (_Parser.dataflag[jj] & GNSSDF_C1DATA) { - obs->C1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; - } - else if (_Parser.dataflag[jj] & GNSSDF_P1DATA) { - obs->P1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; - } - else if (_Parser.dataflag[jj] & GNSSDF_P2DATA) { - obs->P2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; - } - else if (_Parser.dataflag[jj] & (GNSSDF_L1CDATA|GNSSDF_L1PDATA)) { - obs->L1 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; - obs->SNR1 = _Parser.Data.snrL1[ii]; - } - else if (_Parser.dataflag[jj] & (GNSSDF_L2CDATA|GNSSDF_L2PDATA)) { - obs->L2 = _Parser.Data.measdata[ii][_Parser.datapos[jj]]; - obs->SNR2 = _Parser.Data.snrL2[ii]; - } - } - _obsList.push_back(obs); - } - } - } - } -} Index: trunk/BNC/RTCM3/rtcm3.h =================================================================== --- trunk/BNC/RTCM3/rtcm3.h (revision 296) +++ (revision ) @@ -1,17 +1,0 @@ - -#ifndef RTCM3_H -#define RTCM3_H - -#include "../RTCM/GPSDecoder.h" -#include "rtcm3torinex.h" - -class rtcm3 : public GPSDecoder { -public: - rtcm3(); - ~rtcm3(); - void Decode(char* buffer = 0, int bufLen = 0); -private: - struct RTCM3ParserData _Parser; -} ; - -#endif Index: trunk/BNC/RTIGS/RTIGSDecoder.cpp =================================================================== --- trunk/BNC/RTIGS/RTIGSDecoder.cpp (revision 296) +++ trunk/BNC/RTIGS/RTIGSDecoder.cpp (revision 297) @@ -1,2 +1,26 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. +// +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /* ------------------------------------------------------------------------- Index: trunk/BNC/RTIGS/RTIGSDecoder.h =================================================================== --- trunk/BNC/RTIGS/RTIGSDecoder.h (revision 296) +++ trunk/BNC/RTIGS/RTIGSDecoder.h (revision 297) @@ -1,2 +1,26 @@ +// Part of BNC, a utility for retrieving decoding and +// converting GNSS data streams from NTRIP broadcasters, +// written by Leos Mervart. +// +// Copyright (C) 2006 +// German Federal Agency for Cartography and Geodesy (BKG) +// http://www.bkg.bund.de +// Czech Technical University Prague, Department of Advanced Geodesy +// http://www.fsv.cvut.cz +// +// Email: euref-ip@bkg.bund.de +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation, version 2. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef RTIGSDECODER_H Index: trunk/BNC/bnc.pro =================================================================== --- trunk/BNC/bnc.pro (revision 296) +++ trunk/BNC/bnc.pro (revision 297) @@ -15,5 +15,5 @@ bncconst.h bnchtml.h bnctableitem.h \ RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h \ - RTCM3/rtcm3.h RTCM3/rtcm3torinex.h \ + RTCM3/RTCM3Decoder.h RTCM3/rtcm3torinex.h \ RTIGS/rtigs.h RTIGS/RTIGSDecoder.h @@ -22,5 +22,5 @@ bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp \ RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp \ - RTCM3/rtcm3.cpp RTCM3/rtcm3torinex.cpp \ + RTCM3/RTCM3Decoder.cpp RTCM3/rtcm3torinex.cpp \ RTIGS/rtigs.cpp RTIGS/RTIGSDecoder.cpp Index: trunk/BNC/bncgetthread.cpp =================================================================== --- trunk/BNC/bncgetthread.cpp (revision 296) +++ trunk/BNC/bncgetthread.cpp (revision 297) @@ -51,5 +51,5 @@ #include "RTCM/RTCM2Decoder.h" -#include "RTCM3/rtcm3.h" +#include "RTCM3/RTCM3Decoder.h" #include "RTIGS/RTIGSDecoder.h" @@ -237,5 +237,5 @@ else if (_format.indexOf("RTCM_3") != -1) { emit(newMessage("Get Data: " + _staID + " in RTCM 3.0 format")); - _decoder = new rtcm3(); + _decoder = new RTCM3Decoder(); } else if (_format.indexOf("RTIGS") != -1) { Index: trunk/BNC/todo.txt =================================================================== --- trunk/BNC/todo.txt (revision 296) +++ trunk/BNC/todo.txt (revision 297) @@ -178,4 +178,5 @@ Problem, wenn der Nutzer nach ein paar Sekunden auf dem Bildschirm nichts sieht dann glaubt er, etwas sei nicht korrekt.) +^^^^^^^^^^ DONE ^^^^^^^^^^^^^ (11 kann) Skeleton Files von EUREF einbauen, Datenfeld Nummber 8 im