Changeset 5808 in ntrip for trunk/BNC/src/combination/bnccomb.cpp

Timestamp:

Aug 6, 2014, 11:16:40 AM (10 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/src/combination/bnccomb.cpp

@@ -192 +192 @@
       cmbAC* AC = it.next();
       _params.push_back(new cmbParam(cmbParam::offACgps, ++nextPar, AC->name, ""));
-      for (int iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
+      for (unsigned 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, 
@@ -199 +199 @@
       if (_useGlonass) {
         _params.push_back(new cmbParam(cmbParam::offACglo, ++nextPar, AC->name, ""));
-        for (int iGlo = 1; iGlo <= t_prn::MAXPRN_GLONASS; iGlo++) {
+        for (unsigned 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, 
@@ -206 +206 @@
       }
     }
-    for (int iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
+    for (unsigned 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 <= t_prn::MAXPRN_GLONASS; iGlo++) {
+      for (unsigned 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));
@@ -594 +594 @@
     }
 
-    bncModel::kalman(AA, ll, PP, _QQ, dx);
+    kalman(AA, ll, PP, _QQ, dx);
     ColumnVector vv = ll - AA * dx;
 
@@ -806 +806 @@
     }
     int iCond = 1;
-    for (int iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
+    for (unsigned iGps = 1; iGps <= t_prn::MAXPRN_GPS; iGps++) {
       QString prn = QString("G%1").arg(iGps, 2, 10, QChar('0'));
       ++iCond;