Changeset 3485 in ntrip


Ignore:
Timestamp:
Oct 30, 2011, 3:04:05 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/combination
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/combination/bnccomb.cpp

    r3484 r3485  
    6363  eph    = 0;
    6464
    65   if      (type == offAC) {
     65  if      (type == offACgps) {
     66    epoSpec = true;
     67    sig0    = sig0_offAC;
     68    sigP    = sig0;
     69  }
     70  else if (type == offACglo) {
    6671    epoSpec = true;
    6772    sig0    = sig0_offAC;
     
    8994double cmbParam::partial(const QString& AC_, const QString& prn_) {
    9095 
    91   if      (type == offAC) {
    92     if (AC == AC_) {
     96  if      (type == offACgps) {
     97    if (AC == AC_ && prn_[0] == 'G') {
     98      return 1.0;
     99    }
     100  }
     101  else if (type == offACglo) {
     102    if (AC == AC_ && prn_[0] == 'R') {
    93103      return 1.0;
    94104    }
     
    114124  QString outStr;
    115125 
    116   if      (type == offAC) {
    117     outStr = "AC offset " + AC;
     126  if      (type == offACgps) {
     127    outStr = "AC offset GPS " + AC;
     128  }
     129  else if (type == offACglo) {
     130    outStr = "AC offset GLO " + AC;
    118131  }
    119132  else if (type == offACSat) {
     
    182195    while (it.hasNext()) {
    183196      cmbAC* AC = it.next();
    184       _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC->name, ""));
     197      _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC->name, ""));
    185198      for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
    186199        QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
     
    189202      }
    190203      if (_useGlonass) {
     204        _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC->name, ""));
    191205        for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
    192206          QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
     
    901915      int            numObs = itAC.value();
    902916      if (AC != _masterOrbitAC && numObs > 0) {
    903         _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC, ""));
     917        _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC, ""));
     918        if (_useGlonass) {
     919          _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC, ""));
     920        }
    904921      }
    905922    }
  • trunk/BNC/combination/bnccomb.h

    r3483 r3485  
    1313class cmbParam {
    1414 public:
    15   enum parType {offAC, offACSat, clkSat};
     15  enum parType {offACgps, offACglo, offACSat, clkSat};
    1616  cmbParam(parType type_, int index_, const QString& ac_, const QString& prn_);
    1717  ~cmbParam();
Note: See TracChangeset for help on using the changeset viewer.