Changeset 5742 in ntrip for trunk/BNC/src/combination

Timestamp:

Aug 2, 2014, 4:23:36 PM (11 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/combination/bnccomb.cpp (modified) (8 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -29 +29 @@
 #include "bncantex.h"
 #include "bnctides.h"
+#include "t_prn.h"
 
 const double sig0_offAC    = 1000.0;
@@ -36 +37 @@
 
 const double sigObs        =   0.05;
-
-const int MAXPRN_GLONASS = 24;
 
 using namespace std;
@@ -194 +193 @@
       cmbAC* AC = it.next();
       _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC->name, ""));
-      for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+      for (int iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
         QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
         _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
@@ -201 +200 @@
       if (_useGlonass) {
         _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC->name, ""));
-        for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
+        for (int iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
           QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
           _params.push_back(new cmbParam(cmbParam::offACSat, ++nextPar, 
@@ -208 +207 @@
       }
     }
-    for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+    for (int iGps = 1; iGps <= t_prn::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++) {
+      for (int iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
         QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
         _params.push_back(new cmbParam(cmbParam::clkSat, ++nextPar, "", prn));
@@ -763 +762 @@
   }
 
-  int MAXPRN = MAXPRN_GPS;
+  int maxSat = t_prn::MAXPRN_GPS;
 //  if (_useGlonass) {
-//    MAXPRN = MAXPRN_GPS + MAXPRN_GLONASS;
+//    maxSat = t_prn::MAXPRN_GPS + t_prn::MAXPRN_GLONASS;
 //  }
 
-  const int nCon = (_method == filter) ? 1 + MAXPRN : 0;
+  const int nCon = (_method == filter) ? 1 + maxSat : 0;
 
   AA.ReSize(nObs+nCon, nPar);  AA = 0.0;
@@ -808 +807 @@
     }
     int iCond = 1;
-    for (int iGps = 1; iGps <= MAXPRN_GPS; iGps++) {
+    for (int iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
       QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
       ++iCond;
@@ -822 +821 @@
     }
 //    if (_useGlonass) {
-//      for (int iGlo = 1; iGlo <= MAXPRN_GLONASS; iGlo++) {
+//      for (int iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
 //        QString prn = QString("R%1").arg(iGlo, 2, 10, QChar('0'));
 //        ++iCond;