Index: trunk/BNC/bnc.pro =================================================================== --- trunk/BNC/bnc.pro (revision 3180) +++ trunk/BNC/bnc.pro (revision 3181) @@ -42,7 +42,6 @@ bancroft.h bncmodel.h bncfigureppp.h bncrawfile.h \ bnctides.h bncmap.h bncmapview.h bncantex.h \ - bncephuser.h bncoutf.h \ + bncephuser.h bncoutf.h bncclockrinex.h bncsp3.h \ upload/bncrtnetdecoder.h upload/bncuploadcaster.h \ - upload/bncclockrinex.h upload/bncsp3.h \ RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h \ RTCM/RTCM2_2021.h RTCM/rtcm_utils.h \ @@ -75,7 +74,6 @@ bancroft.cpp bncmodel.cpp bncfigureppp.cpp bncrawfile.cpp \ bnctides.cpp bncmap.cpp bncmapview.cpp bncantex.cpp \ - bncephuser.cpp bncoutf.cpp \ + bncephuser.cpp bncoutf.cpp bncclockrinex.cpp bncsp3.cpp \ upload/bncrtnetdecoder.cpp upload/bncuploadcaster.cpp \ - upload/bncclockrinex.cpp upload/bncsp3.cpp \ RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp \ RTCM/RTCM2_2021.cpp RTCM/rtcm_utils.cpp \ @@ -106,10 +104,6 @@ exists(combination/bnccomb.h) { DEFINES += USE_COMBINATION - HEADERS += combination/bnccomb.h combination/cmbcaster.h \ - combination/bnssp3.h combination/bnsoutf.h \ - combination/bnsutils.h - SOURCES += combination/bnccomb.cpp combination/cmbcaster.cpp \ - combination/bnssp3.cpp combination/bnsoutf.cpp \ - combination/bnsutils.cpp + HEADERS += combination/bnccomb.h combination/cmbcaster.h + SOURCES += combination/bnccomb.cpp combination/cmbcaster.cpp } Index: trunk/BNC/bncclockrinex.cpp =================================================================== --- trunk/BNC/bncclockrinex.cpp (revision 3181) +++ trunk/BNC/bncclockrinex.cpp (revision 3181) @@ -0,0 +1,80 @@ + +/* ------------------------------------------------------------------------- + * BKG NTRIP Server + * ------------------------------------------------------------------------- + * + * Class: bncClockRinex + * + * Purpose: writes RINEX Clock files + * + * Author: L. Mervart + * + * Created: 29-Mar-2011 + * + * Changes: + * + * -----------------------------------------------------------------------*/ + +#include +#include + +#include "bncclockrinex.h" +#include "bncsettings.h" + +using namespace std; + +// Constructor +//////////////////////////////////////////////////////////////////////////// +bncClockRinex::bncClockRinex(const QString& prep, const QString& ext, const QString& path, + const QString& intr, int sampl) + : bncoutf(prep, ext, path, intr, sampl) { + bncSettings settings; + _append = Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked; +} + +// Destructor +//////////////////////////////////////////////////////////////////////////// +bncClockRinex::~bncClockRinex() { +} + +// Write One Epoch +//////////////////////////////////////////////////////////////////////////// +t_irc bncClockRinex::write(int GPSweek, double GPSweeks, const QString& prn, + const ColumnVector& xx) { + + if (bncoutf::write(GPSweek, GPSweeks, prn, xx, _append) == success) { + + QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks); + double sec = fmod(GPSweeks, 60.0); + + _out << "AS " << prn.toAscii().data() + << datTim.toString(" yyyy MM dd hh mm").toAscii().data() + << fixed << setw(10) << setprecision(6) << sec + << " 1 " + << scientific << setw(19) << setprecision(12) << xx(4) << endl; + + return success; + } + else { + return failure; + } +} + +// Write Header +//////////////////////////////////////////////////////////////////////////// +void bncClockRinex::writeHeader(const QDateTime& datTim) { + + _out << " 3.00 C " + << "RINEX VERSION / TYPE" << endl; + + _out << "BNC " + << datTim.toString("yyyyMMdd hhmmss").leftJustified(20, ' ', true).toAscii().data() + << "PGM / RUN BY / DATE" << endl; + + _out << " 1 AS " + << "# / TYPES OF DATA" << endl; + + _out << " " + << "END OF HEADER" << endl; +} + Index: trunk/BNC/bncclockrinex.h =================================================================== --- trunk/BNC/bncclockrinex.h (revision 3181) +++ trunk/BNC/bncclockrinex.h (revision 3181) @@ -0,0 +1,23 @@ +#ifndef BNCCLOCKRINEX_H +#define BNCCLOCKRINEX_H + +#include +#include +#include + +#include "bncoutf.h" + +class bncClockRinex : public bncoutf { + public: + bncClockRinex(const QString& prep, const QString& ext, const QString& path, + const QString& intr, int sampl); + virtual ~bncClockRinex(); + virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, + const ColumnVector& xx); + + private: + virtual void writeHeader(const QDateTime& datTim); + bool _append; +}; + +#endif Index: trunk/BNC/bncsp3.cpp =================================================================== --- trunk/BNC/bncsp3.cpp (revision 3181) +++ trunk/BNC/bncsp3.cpp (revision 3181) @@ -0,0 +1,124 @@ + +/* ------------------------------------------------------------------------- + * BKG NTRIP Server + * ------------------------------------------------------------------------- + * + * Class: bncSP3 + * + * Purpose: writes SP3 files + * + * Author: L. Mervart + * + * Created: 25-Apr-2008 + * + * Changes: + * + * -----------------------------------------------------------------------*/ + +#include +#include + +#include "bncsp3.h" +#include "bncutils.h" + +using namespace std; + +// Constructor +//////////////////////////////////////////////////////////////////////////// +bncSP3::bncSP3(const QString& prep, const QString& ext, const QString& path, + const QString& intr, int sampl) + : bncoutf(prep, ext, path, intr, sampl) { + + _lastGPSweek = 0; + _lastGPSweeks = 0.0; +} + +// Destructor +//////////////////////////////////////////////////////////////////////////// +bncSP3::~bncSP3() { +} + +// Write One Epoch +//////////////////////////////////////////////////////////////////////////// +t_irc bncSP3::write(int GPSweek, double GPSweeks, const QString& prn, + const ColumnVector& xx, bool append) { + + if ( bncoutf::write(GPSweek, GPSweeks, prn, xx, append) == success) { + + if (_lastGPSweek != GPSweek || _lastGPSweeks != GPSweeks) { + _lastGPSweek = GPSweek; + _lastGPSweeks = GPSweeks; + + QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks); + double sec = fmod(GPSweeks, 60.0); + + _out << datTim.toString("* yyyy MM dd hh mm").toAscii().data() + << setw(12) << setprecision(8) << sec << endl; + } + _out << "P" << prn.toAscii().data() + << setw(14) << setprecision(6) << xx(1) / 1000.0 + << setw(14) << setprecision(6) << xx(2) / 1000.0 + << setw(14) << setprecision(6) << xx(3) / 1000.0 + << setw(14) << setprecision(6) << xx(4) * 1e6 << endl; + + return success; + } + else { + return failure; + } +} + +// Close File (write last line) +//////////////////////////////////////////////////////////////////////////// +void bncSP3::closeFile() { + _out << "EOF" << endl; + bncoutf::closeFile(); +} + +// Write Header +//////////////////////////////////////////////////////////////////////////// +void bncSP3::writeHeader(const QDateTime& datTim) { + + int GPSWeek; + double GPSWeeks; + GPSweekFromDateAndTime(datTim, GPSWeek, GPSWeeks); + + double sec = fmod(GPSWeeks, 60.0); + + int mjd; + double dayfrac; + mjdFromDateAndTime(datTim, mjd, dayfrac); + + _out << "#aP" << datTim.toString("yyyy MM dd hh mm").toAscii().data() + << setw(12) << setprecision(8) << sec + << " 96 ORBIT IGS05 HLM IGS" << endl; + + _out << "## " + << setw(4) << GPSWeek + << setw(16) << setprecision(8) << GPSWeeks + << setw(15) << setprecision(8) << double(_sampl) + << setw(6) << mjd + << setw(16) << setprecision(13) << dayfrac << endl; + + _out << "+ 32 G01G02G03G04G05G06G07G08G09G10G11G12G13G14G15G16G17\n" + << "+ G18G19G20G21G22G23G24G25G26G27G28G29G30G31G32 0 0\n" + << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" + << "%c cc cc ccc ccc cccc cccc cccc cccc ccccc ccccc ccccc ccccc\n" + << "%c cc cc ccc ccc cccc cccc cccc cccc ccccc ccccc ccccc ccccc\n" + << "%f 0.0000000 0.000000000 0.00000000000 0.000000000000000\n" + << "%f 0.0000000 0.000000000 0.00000000000 0.000000000000000\n" + << "%i 0 0 0 0 0 0 0 0 0\n" + << "%i 0 0 0 0 0 0 0 0 0\n" + << "/* \n" + << "/* \n" + << "/* \n" + << "/* \n"; +} + Index: trunk/BNC/bncsp3.h =================================================================== --- trunk/BNC/bncsp3.h (revision 3181) +++ trunk/BNC/bncsp3.h (revision 3181) @@ -0,0 +1,25 @@ +#ifndef BNCSP3_H +#define BNCSP3_H + +#include +#include +#include + +#include "bncoutf.h" + +class bncSP3 : public bncoutf { + public: + bncSP3(const QString& prep, const QString& ext, const QString& path, + const QString& intr, int sampl); + virtual ~bncSP3(); + virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, + const ColumnVector& xx, bool append); + + private: + virtual void writeHeader(const QDateTime& datTim); + virtual void closeFile(); + int _lastGPSweek; + double _lastGPSweeks; +}; + +#endif Index: trunk/BNC/combination/bnccomb.cpp =================================================================== --- trunk/BNC/combination/bnccomb.cpp (revision 3180) +++ trunk/BNC/combination/bnccomb.cpp (revision 3181) @@ -25,5 +25,5 @@ #include "bncutils.h" #include "bncpppclient.h" -#include "bnssp3.h" +#include "bncsp3.h" #include "bncantex.h" #include "bnctides.h" @@ -185,5 +185,5 @@ QString interval = ""; int sampl = 0; - _sp3 = new bnsSP3(prep, ext, path, interval, sampl); + _sp3 = new bncSP3(prep, ext, path, interval, sampl); } Index: trunk/BNC/combination/bnccomb.h =================================================================== --- trunk/BNC/combination/bnccomb.h (revision 3180) +++ trunk/BNC/combination/bnccomb.h (revision 3181) @@ -8,5 +8,5 @@ class cmbCaster; -class bnsSP3; +class bncSP3; class bncAntex; @@ -89,5 +89,5 @@ QString _outName; std::ofstream* _out; - bnsSP3* _sp3; + bncSP3* _sp3; bool _append; bncAntex* _antex; Index: trunk/BNC/upload/bncclockrinex.cpp =================================================================== --- trunk/BNC/upload/bncclockrinex.cpp (revision 3180) +++ (revision ) @@ -1,80 +1,0 @@ - -/* ------------------------------------------------------------------------- - * BKG NTRIP Server - * ------------------------------------------------------------------------- - * - * Class: bncClockRinex - * - * Purpose: writes RINEX Clock files - * - * Author: L. Mervart - * - * Created: 29-Mar-2011 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include - -#include "bncclockrinex.h" -#include "bncsettings.h" - -using namespace std; - -// Constructor -//////////////////////////////////////////////////////////////////////////// -bncClockRinex::bncClockRinex(const QString& prep, const QString& ext, const QString& path, - const QString& intr, int sampl) - : bncoutf(prep, ext, path, intr, sampl) { - bncSettings settings; - _append = Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked; -} - -// Destructor -//////////////////////////////////////////////////////////////////////////// -bncClockRinex::~bncClockRinex() { -} - -// Write One Epoch -//////////////////////////////////////////////////////////////////////////// -t_irc bncClockRinex::write(int GPSweek, double GPSweeks, const QString& prn, - const ColumnVector& xx) { - - if (bncoutf::write(GPSweek, GPSweeks, prn, xx, _append) == success) { - - QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks); - double sec = fmod(GPSweeks, 60.0); - - _out << "AS " << prn.toAscii().data() - << datTim.toString(" yyyy MM dd hh mm").toAscii().data() - << fixed << setw(10) << setprecision(6) << sec - << " 1 " - << scientific << setw(19) << setprecision(12) << xx(4) << endl; - - return success; - } - else { - return failure; - } -} - -// Write Header -//////////////////////////////////////////////////////////////////////////// -void bncClockRinex::writeHeader(const QDateTime& datTim) { - - _out << " 3.00 C " - << "RINEX VERSION / TYPE" << endl; - - _out << "BNC " - << datTim.toString("yyyyMMdd hhmmss").leftJustified(20, ' ', true).toAscii().data() - << "PGM / RUN BY / DATE" << endl; - - _out << " 1 AS " - << "# / TYPES OF DATA" << endl; - - _out << " " - << "END OF HEADER" << endl; -} - Index: trunk/BNC/upload/bncclockrinex.h =================================================================== --- trunk/BNC/upload/bncclockrinex.h (revision 3180) +++ (revision ) @@ -1,23 +1,0 @@ -#ifndef BNCCLOCKRINEX_H -#define BNCCLOCKRINEX_H - -#include -#include -#include - -#include "bncoutf.h" - -class bncClockRinex : public bncoutf { - public: - bncClockRinex(const QString& prep, const QString& ext, const QString& path, - const QString& intr, int sampl); - virtual ~bncClockRinex(); - virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, - const ColumnVector& xx); - - private: - virtual void writeHeader(const QDateTime& datTim); - bool _append; -}; - -#endif Index: trunk/BNC/upload/bncsp3.cpp =================================================================== --- trunk/BNC/upload/bncsp3.cpp (revision 3180) +++ (revision ) @@ -1,124 +1,0 @@ - -/* ------------------------------------------------------------------------- - * BKG NTRIP Server - * ------------------------------------------------------------------------- - * - * Class: bncSP3 - * - * Purpose: writes SP3 files - * - * Author: L. Mervart - * - * Created: 25-Apr-2008 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include - -#include "bncsp3.h" -#include "bncutils.h" - -using namespace std; - -// Constructor -//////////////////////////////////////////////////////////////////////////// -bncSP3::bncSP3(const QString& prep, const QString& ext, const QString& path, - const QString& intr, int sampl) - : bncoutf(prep, ext, path, intr, sampl) { - - _lastGPSweek = 0; - _lastGPSweeks = 0.0; -} - -// Destructor -//////////////////////////////////////////////////////////////////////////// -bncSP3::~bncSP3() { -} - -// Write One Epoch -//////////////////////////////////////////////////////////////////////////// -t_irc bncSP3::write(int GPSweek, double GPSweeks, const QString& prn, - const ColumnVector& xx, bool append) { - - if ( bncoutf::write(GPSweek, GPSweeks, prn, xx, append) == success) { - - if (_lastGPSweek != GPSweek || _lastGPSweeks != GPSweeks) { - _lastGPSweek = GPSweek; - _lastGPSweeks = GPSweeks; - - QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks); - double sec = fmod(GPSweeks, 60.0); - - _out << datTim.toString("* yyyy MM dd hh mm").toAscii().data() - << setw(12) << setprecision(8) << sec << endl; - } - _out << "P" << prn.toAscii().data() - << setw(14) << setprecision(6) << xx(1) / 1000.0 - << setw(14) << setprecision(6) << xx(2) / 1000.0 - << setw(14) << setprecision(6) << xx(3) / 1000.0 - << setw(14) << setprecision(6) << xx(4) * 1e6 << endl; - - return success; - } - else { - return failure; - } -} - -// Close File (write last line) -//////////////////////////////////////////////////////////////////////////// -void bncSP3::closeFile() { - _out << "EOF" << endl; - bncoutf::closeFile(); -} - -// Write Header -//////////////////////////////////////////////////////////////////////////// -void bncSP3::writeHeader(const QDateTime& datTim) { - - int GPSWeek; - double GPSWeeks; - GPSweekFromDateAndTime(datTim, GPSWeek, GPSWeeks); - - double sec = fmod(GPSWeeks, 60.0); - - int mjd; - double dayfrac; - mjdFromDateAndTime(datTim, mjd, dayfrac); - - _out << "#aP" << datTim.toString("yyyy MM dd hh mm").toAscii().data() - << setw(12) << setprecision(8) << sec - << " 96 ORBIT IGS05 HLM IGS" << endl; - - _out << "## " - << setw(4) << GPSWeek - << setw(16) << setprecision(8) << GPSWeeks - << setw(15) << setprecision(8) << double(_sampl) - << setw(6) << mjd - << setw(16) << setprecision(13) << dayfrac << endl; - - _out << "+ 32 G01G02G03G04G05G06G07G08G09G10G11G12G13G14G15G16G17\n" - << "+ G18G19G20G21G22G23G24G25G26G27G28G29G30G31G32 0 0\n" - << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "+ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "++ 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\n" - << "%c cc cc ccc ccc cccc cccc cccc cccc ccccc ccccc ccccc ccccc\n" - << "%c cc cc ccc ccc cccc cccc cccc cccc ccccc ccccc ccccc ccccc\n" - << "%f 0.0000000 0.000000000 0.00000000000 0.000000000000000\n" - << "%f 0.0000000 0.000000000 0.00000000000 0.000000000000000\n" - << "%i 0 0 0 0 0 0 0 0 0\n" - << "%i 0 0 0 0 0 0 0 0 0\n" - << "/* \n" - << "/* \n" - << "/* \n" - << "/* \n"; -} - Index: trunk/BNC/upload/bncsp3.h =================================================================== --- trunk/BNC/upload/bncsp3.h (revision 3180) +++ (revision ) @@ -1,25 +1,0 @@ -#ifndef BNCSP3_H -#define BNCSP3_H - -#include -#include -#include - -#include "bncoutf.h" - -class bncSP3 : public bncoutf { - public: - bncSP3(const QString& prep, const QString& ext, const QString& path, - const QString& intr, int sampl); - virtual ~bncSP3(); - virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, - const ColumnVector& xx, bool append); - - private: - virtual void writeHeader(const QDateTime& datTim); - virtual void closeFile(); - int _lastGPSweek; - double _lastGPSweeks; -}; - -#endif