Changeset 3485 in ntrip for trunk/BNC

Timestamp:

Oct 30, 2011, 3:04:05 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (6 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -63 +63 @@
   eph    = 0;
 
-  if      (type == offAC) {
+  if      (type == offACgps) {
+    epoSpec = true;
+    sig0    = sig0_offAC;
+    sigP    = sig0;
+  }
+  else if (type == offACglo) {
     epoSpec = true;
     sig0    = sig0_offAC;
@@ -89 +94 @@
 double cmbParam::partial(const QString& AC_, const QString& prn_) {
   
-  if      (type == offAC) {
-    if (AC == AC_) {
+  if      (type == offACgps) {
+    if (AC == AC_ && prn_[0] == 'G') {
+      return 1.0;
+    }
+  }
+  else if (type == offACglo) {
+    if (AC == AC_ && prn_[0] == 'R') {
       return 1.0;
     }
@@ -114 +124 @@
   QString outStr;
  
-  if      (type == offAC) {
-    outStr = "AC offset " + AC;
+  if      (type == offACgps) {
+    outStr = "AC offset GPS " + AC;
+  }
+  else if (type == offACglo) {
+    outStr = "AC offset GLO " + AC;
   }
   else if (type == offACSat) {
@@ -182 +195 @@
     while (it.hasNext()) {
       cmbAC* AC = it.next();
-      _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC->name, ""));
+      _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC->name, ""));
       for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
         QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
@@ -189 +202 @@
       }
       if (_useGlonass) {
+        _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC->name, ""));
         for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
           QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
@@ -901 +915 @@
       int            numObs = itAC.value();
       if (AC != _masterOrbitAC && numObs > 0) {
-        _params.push_back(new cmbParam(cmbParam::offAC, ++nextPar, AC, ""));
+        _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC, ""));
+        if (_useGlonass) {
+          _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC, ""));
+        }
       }
     } 

trunk/BNC/combination/bnccomb.h

@@ -13 +13 @@
 class cmbParam {
  public:
-  enum parType {offAC, offACSat, clkSat};
+  enum parType {offACgps, offACglo, offACSat, clkSat};
   cmbParam(parType type_, int index_, const QString& ac_, const QString& prn_);
   ~cmbParam();