Changeset 3633 in ntrip for trunk

Timestamp:

Jan 22, 2012, 7:55:39 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bnc.pro (modified) (2 diffs)
• pppopt.cpp (modified) (4 diffs)
• pppopt.h (modified) (2 diffs)

trunk/BNC/bnc.pro

@@ -40 +40 @@
           bncnetqueryrtp.h bncsettings.h latencychecker.h             \
           bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \ 
-          bncnetqueryudp0.h bncudpport.h bnctime.h                    \ 
+          bncnetqueryudp0.h bncudpport.h bnctime.h pppopt.h           \ 
           bncserialport.h bncnetquerys.h bncfigure.h                  \ 
           bncfigurelate.h bncpppclient.h bncversion.h                 \ 
@@ -72 +72 @@
           bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp       \
           bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp          \
-          bncnetqueryudp0.cpp bncudpport.cpp                          \
+          bncnetqueryudp0.cpp bncudpport.cpp pppopt.cpp               \
           bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
           bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \

trunk/BNC/pppopt.cpp

@@ -40 +40 @@
 
 #include <iostream>
-#include "bncopt.h"
+#include "pppopt.h"
 #include "bncsettings.h"
 
@@ -64 +64 @@
   maxSolGap    = settingsToDouble("pppMaxSolGap");
   quickStart   = settingsToDouble("pppQuickStart"); if (!refCrdSet()) quickStart = 0.0;
-  corrSync     = settingsToDouble("pppSync");       if (!pppMode) corrSynC = 0.0;
+  corrSync     = settingsToDouble("pppSync");       if (!pppMode) corrSync = 0.0;
 
-  pppCorrMount = setting.value("pppCorrMount").toString();
-  nmeaFile     = setting.value("nmeaFile").toString();
-  antexFile    = setting.value("pppAntex").toString();
-  antennaName  = setting.value("pppAntenna").toString();
+  pppCorrMount = settings.value("pppCorrMount").toString();
+  nmeaFile     = settings.value("nmeaFile").toString();
+  antexFile    = settings.value("pppAntex").toString();
+  antennaName  = settings.value("pppAntenna").toString();
 
   pppMode      = settings.value("pppSPP").toString() == "PPP";
@@ -89 +89 @@
                                   double defaultValue) const {
   bncSettings settings;
-
   if (settings.value(keyName).toString().isEmpty()) {
     return defaultValue;
@@ -101 +100 @@
 ////////////////////////////////////////////////////////////////////////////
 bool t_pppOpt::settingsChecked(const QByteArray& keyName) const {
+  bncSettings settings;
   if (Qt::CheckState(settings.value(keyName).toInt()) == Qt::Checked) {
     return true;

trunk/BNC/pppopt.h

@@ -26 +26 @@
 #define PPPOPT_H
 
+#include <QtCore>
+
 class t_pppOpt {
  public:
@@ -41 +43 @@
   double  refCrd[3];
   double  antEccNEU[3];
-  double  pppCorrMount;
   double  maxSolGap;
   double  quickStart;
   double  corrSync;
+  QString pppCorrMount;
   QString nmeaFile;
   QString antexFile;