Changeset 3633 in ntrip


Ignore:
Timestamp:
Jan 22, 2012, 7:55:39 PM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bnc.pro

    r3614 r3633  
    4040          bncnetqueryrtp.h bncsettings.h latencychecker.h             \
    4141          bncipport.h bncnetqueryv0.h bncnetqueryudp.h                \
    42           bncnetqueryudp0.h bncudpport.h bnctime.h                    \
     42          bncnetqueryudp0.h bncudpport.h bnctime.h pppopt.h           \
    4343          bncserialport.h bncnetquerys.h bncfigure.h                  \
    4444          bncfigurelate.h bncpppclient.h bncversion.h                 \
     
    7272          bncnetqueryrtp.cpp bncsettings.cpp latencychecker.cpp       \
    7373          bncipport.cpp bncnetqueryv0.cpp bncnetqueryudp.cpp          \
    74           bncnetqueryudp0.cpp bncudpport.cpp                          \
     74          bncnetqueryudp0.cpp bncudpport.cpp pppopt.cpp               \
    7575          bncserialport.cpp bncnetquerys.cpp bncfigure.cpp            \
    7676          bncfigurelate.cpp bncpppclient.cpp bnctime.cpp              \
  • trunk/BNC/pppopt.cpp

    r3632 r3633  
    4040
    4141#include <iostream>
    42 #include "bncopt.h"
     42#include "pppopt.h"
    4343#include "bncsettings.h"
    4444
     
    6464  maxSolGap    = settingsToDouble("pppMaxSolGap");
    6565  quickStart   = settingsToDouble("pppQuickStart"); if (!refCrdSet()) quickStart = 0.0;
    66   corrSync     = settingsToDouble("pppSync");       if (!pppMode) corrSynC = 0.0;
     66  corrSync     = settingsToDouble("pppSync");       if (!pppMode) corrSync = 0.0;
    6767
    68   pppCorrMount = setting.value("pppCorrMount").toString();
    69   nmeaFile     = setting.value("nmeaFile").toString();
    70   antexFile    = setting.value("pppAntex").toString();
    71   antennaName  = setting.value("pppAntenna").toString();
     68  pppCorrMount = settings.value("pppCorrMount").toString();
     69  nmeaFile     = settings.value("nmeaFile").toString();
     70  antexFile    = settings.value("pppAntex").toString();
     71  antennaName  = settings.value("pppAntenna").toString();
    7272
    7373  pppMode      = settings.value("pppSPP").toString() == "PPP";
     
    8989                                  double defaultValue) const {
    9090  bncSettings settings;
    91 
    9291  if (settings.value(keyName).toString().isEmpty()) {
    9392    return defaultValue;
     
    101100////////////////////////////////////////////////////////////////////////////
    102101bool t_pppOpt::settingsChecked(const QByteArray& keyName) const {
     102  bncSettings settings;
    103103  if (Qt::CheckState(settings.value(keyName).toInt()) == Qt::Checked) {
    104104    return true;
  • trunk/BNC/pppopt.h

    r3632 r3633  
    2626#define PPPOPT_H
    2727
     28#include <QtCore>
     29
    2830class t_pppOpt {
    2931 public:
     
    4143  double  refCrd[3];
    4244  double  antEccNEU[3];
    43   double  pppCorrMount;
    4445  double  maxSolGap;
    4546  double  quickStart;
    4647  double  corrSync;
     48  QString pppCorrMount;
    4749  QString nmeaFile;
    4850  QString antexFile;
Note: See TracChangeset for help on using the changeset viewer.