Changeset 3401 in ntrip for trunk

Timestamp:

Sep 1, 2011, 6:05:43 PM (13 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncmodel.cpp (modified) (5 diffs)

trunk/BNC/bncmodel.cpp

@@ -912 +912 @@
   findMaxRes(vv, satData, prn, maxRes);
 
-  if ( maxRes > (iPhase == 1 ? MAXRES_PHASE : MAXRES_CODE) ) {
-    _log += "Outlier " + prn + " " 
+  if      (iPhase == 1 && maxRes > MAXRES_PHASE) {
+    _log += "Outlier Phase " + prn + " " 
+          + QByteArray::number(maxRes, 'f', 3) + "\n"; 
+    return true;
+  }
+  else if (iPhase == 0 && maxRes > MAXRES_CODE) {
+    _log += "Outlier Code  " + prn + " " 
           + QByteArray::number(maxRes, 'f', 3) + "\n"; 
     return true;
@@ -1230 +1235 @@
     do {
 
+      QByteArray strResCode;
+      QByteArray strResPhase;
+      QString    strNeglected;
+
       // Remove Neglected Satellites from epoData
       // ----------------------------------------
@@ -1236 +1245 @@
         if ( !findInVector(usedPrns, prn) ) {
           epoData->satData.remove(prn);
+          strNeglected += prn + " ";
         }
       }
@@ -1247 +1257 @@
         continue;
       }
-
-      QByteArray strResCode;
-      QByteArray strResPhase;
 
       // First update using code observations, then phase observations
@@ -1321 +1328 @@
           // --------------------
           if (nNeglected > 0) {
-            _log += "Neglected PRNs: ";
-            for (unsigned ip = 0; ip < allPrns.size(); ip++) {
-              QString prn = allPrns[ip];
-              if ( !findInVector(usedPrns, prn) ) {
-                _log += prn + " ";
-              }
-            }
-            _log += '\n';
+            _log += "Neglected PRNs: " + strNeglected + '\n';
           }