Changeset 3483 in ntrip

Timestamp:

Oct 30, 2011, 2:19:33 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

@@ -39 +39 @@
 const double sigObs        =   0.05;
 
-const int MAXPRN_GPS = 32;
+const int MAXPRN_GPS     = 32;
+const int MAXPRN_GLONASS = 24;
 
 using namespace std;
@@ -178 +179 @@
                                        AC->name, prn));
       }
+      if (_useGlonass) {
+        for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
+          QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
+          _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
+                                         AC->name, prn));
+        }
+      }
     }
     for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
       QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
       _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
+    }
+    if (_useGlonass) {
+      for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
+        QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
+        _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
+      }
     }
     
@@ -213 +227 @@
     _MAXRES = 999.0;
   }
+
+  // Use Glonass
+  // -----------
+  if ( Qt::CheckState(settings.value("pppGLONASS").toInt()) == Qt::Checked) {
+    _useGlonass = true;
+  }
+  else {
+    _useGlonass = false;
+  }
 }
 
@@ -260 +283 @@
     delete newCorr;
     return;
+  }
+
+  // Check Glonass
+  // -------------
+  if (!_useGlonass) {
+    if (newCorr->prn[0] == 'R') {
+      delete newCorr;
+      return;
+    }
   }
 
@@ -719 +751 @@
   }
 
-  const int nCon = (_method == filter) ? 1 + MAXPRN_GPS : 0;
+  int MAXPRN = MAXPRN_GPS;
+  if (_useGlonass) {
+    MAXPRN = MAXPRN_GPS + MAXPRN_GLONASS;
+  }
+
+  const int nCon = (_method == filter) ? 1 + MAXPRN : 0;
 
   AA.ReSize(nObs+nCon, nPar);  AA = 0.0;
@@ -769 +806 @@
              pp->prn == prn) {
           AA(nObs+iCond, iPar) = 1.0;
+        }
+      }
+    }
+    if (_useGlonass) {
+      for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
+        QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
+        ++iCond;
+        PP(nObs+iCond) = Ph;
+        for (int iPar = 1; iPar <= _params.size(); iPar++) {
+          cmbParam* pp = _params[iPar-1];
+          if ( AA.Column(iPar).maximum_absolute_value() > 0.0 &&
+               pp->type == cmbParam::offACSat                 && 
+               pp->prn == prn) {
+            AA(nObs+iCond, iPar) = 1.0;
+          }
         }
       }

trunk/BNC/combination/bnccomb.h

@@ -102 +102 @@
   unsigned                _masterMissingEpochs;
   e_method                _method;
+  bool                    _useGlonass;
 };