Changeset 3400 in ntrip for trunk/BNC

Timestamp:

Sep 1, 2011, 5:55:28 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncmodel.cpp (modified) (4 diffs)
• bncmodel.h (modified) (1 diff)

trunk/BNC/bncmodel.cpp

@@ -1152 +1152 @@
 // 
 ///////////////////////////////////////////////////////////////////////////
-void bncModel::printRes(int iPhase, const ColumnVector& vv, 
-                        ostringstream& str, t_satData* satData) {
+QByteArray bncModel::printRes(int iPhase, const ColumnVector& vv, 
+                              const QMap<QString, t_satData*>& satDataMap) {
+
   Tracer tracer("bncModel::printRes");
 
-  if (satData->obsIndex != 0) {
-    str << _time.timestr(1)
-        << " RES " << satData->prn.toAscii().data() 
-        << (iPhase ? "   L3 " : "   P3 ")
-        << setw(9) << setprecision(4) << vv(satData->obsIndex) << endl;
-  }
+  ostringstream str;
+  str.setf(ios::fixed);
+        
+  QMapIterator<QString, t_satData*> it(satDataMap);
+  while (it.hasNext()) {
+    it.next();
+    t_satData* satData = it.value();
+    if (satData->obsIndex != 0) {
+      str << _time.timestr(1)
+          << " RES " << satData->prn.toAscii().data() 
+          << (iPhase ? "   L3 " : "   P3 ")
+          << setw(9) << setprecision(4) << vv(satData->obsIndex) << endl;
+    }
+  }
+
+  return QByteArray(str.str().c_str());
 }
 
@@ -1236 +1247 @@
         continue;
       }
+
+      QByteArray strResCode;
+      QByteArray strResPhase;
 
       // First update using code observations, then phase observations
@@ -1279 +1293 @@
         ColumnVector vv = ll - AA * dx;
         
+        // Print Residuals
+        // ---------------
+        if (iPhase == 0) {
+          strResCode  = printRes(iPhase, vv, epoData->satData);
+        }
+        else {
+          strResPhase = printRes(iPhase, vv, epoData->satData);
+        }
+
         // Check the residuals
         // -------------------
@@ -1308 +1331 @@
           }
 
-          // Print Residuals
-          // ---------------
-          ostringstream str;
-          str.setf(ios::fixed);
-        
-          QMapIterator<QString, t_satData*> it(epoData->satData);
-          while (it.hasNext()) {
-            it.next();
-            t_satData* satData = it.value();
-            if (iPhase == 1 || satData->system() != 'R') {
-              printRes(iPhase, vv, str, satData);
-            }
-          }
-          _log += str.str().c_str();
+          _log += strResCode + strResPhase;
         
           return success;

trunk/BNC/bncmodel.h

@@ -100 +100 @@
   void   addObs(int iPhase, unsigned& iObs, t_satData* satData,
                 Matrix& AA, ColumnVector& ll, DiagonalMatrix& PP);
-  void   printRes(int iPhase, const ColumnVector& vv, 
-                  std::ostringstream& str, t_satData* satData);
+  QByteArray printRes(int iPhase, const ColumnVector& vv, 
+                      const QMap<QString, t_satData*>& satDataMap);
   void   findMaxRes(const ColumnVector& vv,
                     const QMap<QString, t_satData*>& satData,