Index: /trunk/BNC/src/bncsettings.cpp =================================================================== --- /trunk/BNC/src/bncsettings.cpp (revision 5867) +++ /trunk/BNC/src/bncsettings.cpp (revision 5868) @@ -128,42 +128,4 @@ setValue_p("scanRTCM", "0"); setValue_p("miscPort", ""); - // PPP - setValue_p("pppSPP", ""); - setValue_p("pppMount", ""); - setValue_p("pppCorrMount", ""); - setValue_p("pppRefCrdX", ""); - setValue_p("pppRefCrdY", ""); - setValue_p("pppRefCrdZ", ""); - setValue_p("pppRefdN", ""); - setValue_p("pppRefdE", ""); - setValue_p("pppRefdU", ""); - setValue_p("nmeaFile", ""); - setValue_p("nmeaPort", ""); - setValue_p("pppPlotCoordinates", ""); - setValue_p("useOsmMap", false); - setValue_p("mapWinDotSize", ""); - setValue_p("mapWinDotColor", "red"); - setValue_p("mapSpeed", 0); - setValue_p("postObsFile", ""); - setValue_p("postNavFile", ""); - setValue_p("postCorrFile", ""); - setValue_p("postOutFile", ""); - setValue_p("pppAntenna", ""); - setValue_p("pppAntex", ""); - setValue_p("pppUsePhase", ""); - setValue_p("pppEstTropo", ""); - setValue_p("pppGLONASS", ""); - setValue_p("pppGalileo", ""); - setValue_p("pppSync", ""); - setValue_p("pppAverage", ""); - setValue_p("pppQuickStart", ""); - setValue_p("pppMaxSolGap", ""); - setValue_p("pppAudioResponse", ""); - setValue_p("pppSigmaCode", "10.0"); - setValue_p("pppSigmaPhase", "0.02"); - setValue_p("pppSigCrd0", "100.0"); - setValue_p("pppSigCrdP", "100.0"); - setValue_p("pppSigTrp0", "0.1"); - setValue_p("pppSigTrpP", "3e-6"); // Reqc setValue_p("reqcAction", ""); Index: unk/BNC/src/pppopt.cpp =================================================================== --- /trunk/BNC/src/pppopt.cpp (revision 5867) +++ (revision ) @@ -1,145 +1,0 @@ -// Part of BNC, a utility for retrieving decoding and -// converting GNSS data streams from NTRIP broadcasters. -// -// Copyright (C) 2007 -// German Federal Agency for Cartography and Geodesy (BKG) -// http://www.bkg.bund.de -// Czech Technical University Prague, Department of 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. - -/* ------------------------------------------------------------------------- - * BKG NTRIP Client - * ------------------------------------------------------------------------- - * - * Class: t_pppOpt - * - * Purpose: Options for Precise Point Positioning - * - * Author: L. Mervart - * - * Created: 22-Jan-2012 - * - * Changes: - * - * -----------------------------------------------------------------------*/ - -#include -#include "pppopt.h" -#include "bncsettings.h" - -using namespace std; - -// Constructor -//////////////////////////////////////////////////////////////////////////// -t_pppOpt::t_pppOpt() { - bncSettings settings; - - sigP3 = settingsToDouble("pppSigmaCode", 5.0); - sigL3 = settingsToDouble("pppSigmaPhase", 0.02); - sigCrd0 = settingsToDouble("pppSigCrd0", 100.0); - sigCrdP = settingsToDouble("pppSigCrdP", 100.0); - sigTrp0 = settingsToDouble("pppSigTrp0", 0.1); - sigTrpP = settingsToDouble("pppSigTrpP", 1e-6); - refCrd[0] = settingsToDouble("pppRefCrdX"); - refCrd[1] = settingsToDouble("pppRefCrdY"); - refCrd[2] = settingsToDouble("pppRefCrdZ"); - antEccNEU[0] = settingsToDouble("pppRefdN"); - antEccNEU[1] = settingsToDouble("pppRefdE"); - antEccNEU[2] = settingsToDouble("pppRefdU"); - maxSolGap = settingsToDouble("pppMaxSolGap"); - quickStart = settingsToDouble("pppQuickStart"); - corrSync = settingsToDouble("pppSync"); - pppAverage = settingsToDouble("pppAverage") * 60.0; - if (pppAverage < 0.0) { - pppAverage = 0.0; - } - else if (pppAverage > 86400.0) { - pppAverage = 86400.0; - } - - pppCorrMount = settings.value("pppCorrMount").toString(); - nmeaFile = settings.value("nmeaFile").toString(); - antexFile = settings.value("pppAntex").toString(); - antennaName = settings.value("pppAntenna").toString(); - obsFileName = settings.value("postObsFile").toString(); - navFileName = settings.value("postNavFile").toString(); - corrFileName = settings.value("postCorrFile").toString(); - - if (settings.value("pppSPP").toString() == "Post-Processing") { - corrSync = 0.0; - pppCorrMount = ""; - if (corrFileName.isEmpty()) { - pppMode = false; - } - else { - pppMode = true; - } - } - else if (settings.value("pppSPP").toString() == "Realtime-PPP") { - pppMode = true; - } - else { - pppMode = false; - } - - rnxAppend = settingsChecked("rnxAppend"); - usePhase = settingsChecked("pppUsePhase"); - estTropo = settingsChecked("pppEstTropo"); - useGlonass = settingsChecked("pppGLONASS"); - useGalileo = settingsChecked("pppGalileo"); - - if (!refCrdSet()) quickStart = 0.0; - if (!pppMode) corrSync = 0.0; - - sigGlonassOffset0 = 1000.0; - sigGlonassOffsetP = 0.0; - sigGalileoOffset0 = 1000.0; - sigGalileoOffsetP = 0.0; - sigClk0 = 1000.0; - sigAmb0 = 1000.0; -} - -// Destructor -//////////////////////////////////////////////////////////////////////////// -t_pppOpt::~t_pppOpt() { -} - -// Settings Value with Default -//////////////////////////////////////////////////////////////////////////// -double t_pppOpt::settingsToDouble(const QByteArray& keyName, - double defaultValue) const { - bncSettings settings; - if (settings.value(keyName).toString().isEmpty()) { - return defaultValue; - } - else { - return settings.value(keyName).toDouble(); - } -} - -// Settings Checked -//////////////////////////////////////////////////////////////////////////// -bool t_pppOpt::settingsChecked(const QByteArray& keyName) const { - bncSettings settings; - if (Qt::CheckState(settings.value(keyName).toInt()) == Qt::Checked) { - return true; - } - else { - return false; - } -} Index: unk/BNC/src/pppopt.h =================================================================== --- /trunk/BNC/src/pppopt.h (revision 5867) +++ (revision ) @@ -1,76 +1,0 @@ -// Part of BNC, a utility for retrieving decoding and -// converting GNSS data streams from NTRIP broadcasters. -// -// Copyright (C) 2007 -// German Federal Agency for Cartography and Geodesy (BKG) -// http://www.bkg.bund.de -// Czech Technical University Prague, Department of 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 PPPOPT_H -#define PPPOPT_H - -#include - -class t_pppOpt { - public: - t_pppOpt(); - ~t_pppOpt(); - bool refCrdSet() const { - return refCrd[0] != 0.0 || refCrd[1] != 0 || refCrd[2] != 0.0; - } - bool antEccSet() const { - return antEccNEU[0] != 0.0 || antEccNEU[1] != 0.0 || antEccNEU[2] != 0.0; - } - double sigL3; - double sigP3; - double sigCrd0; - double sigCrdP; - double sigTrp0; - double sigTrpP; - double refCrd[3]; - double antEccNEU[3]; - double maxSolGap; - double quickStart; - double corrSync; - double pppAverage; - QString pppCorrMount; - QString nmeaFile; - QString antexFile; - QString antennaName; - QString obsFileName; - QString navFileName; - QString corrFileName; - bool pppMode; - bool rnxAppend; - bool usePhase; - bool estTropo; - bool useGlonass; - bool useGalileo; - double sigGlonassOffset0; - double sigGlonassOffsetP; - double sigGalileoOffset0; - double sigGalileoOffsetP; - double sigAmb0; - double sigClk0; - private: - double settingsToDouble(const QByteArray& keyName, double defaultValue = 0.0) const; - bool settingsChecked(const QByteArray& keyName) const; -}; - -#endif Index: /trunk/BNC/src/src.pri =================================================================== --- /trunk/BNC/src/src.pri (revision 5867) +++ /trunk/BNC/src/src.pri (revision 5868) @@ -42,5 +42,5 @@ bncnetqueryrtp.h bncsettings.h latencychecker.h \ bncipport.h bncnetqueryv0.h bncnetqueryudp.h \ - bncnetqueryudp0.h bncudpport.h bnctime.h pppopt.h \ + bncnetqueryudp0.h bncudpport.h bnctime.h \ bncserialport.h bncnetquerys.h bncfigure.h \ bncfigurelate.h bncversion.h \ @@ -74,5 +74,5 @@ bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp \ bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp \ - bncnetqueryudp0.cpp bncudpport.cpp pppopt.cpp \ + bncnetqueryudp0.cpp bncudpport.cpp \ bncserialport.cpp bncnetquerys.cpp bncfigure.cpp \ bncfigurelate.cpp bnctime.cpp \