Changeset 3015 in ntrip for trunk/BNC

Timestamp:

Feb 22, 2011, 7:51:10 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (3 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -478 +478 @@
   }
 
-  printResults(out, resCorr);
+  printResults(out, resTime, resCorr);
   dumpResults(resTime, resCorr);
 
@@ -486 +486 @@
 // Print results to caster
 ////////////////////////////////////////////////////////////////////////////
-void bncComb::printResults(QTextStream& out,
+void bncComb::printResults(QTextStream& out, const bncTime& resTime,
                            const QMap<QString, t_corr*>& resCorr) {
 
@@ -493 +493 @@
     it.next();
     t_corr* corr = it.value();
-    out << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
-    out.setFieldWidth(3);
-    out << "Full Clock " << corr->prn << " " << corr->iod << " ";
-    out.setFieldWidth(8);
-    out << corr->dClk * t_CST::c << endl;
-  }
-}
+    t_eph* eph = corr->eph;
+    if (eph) {
+      double xx, yy, zz, cc;
+      eph->position(resTime.gpsw(), resTime.gpssec(), xx, yy, zz, cc);
+
+      out << currentDateAndTimeGPS().toString("yy-MM-dd hh:mm:ss ").toAscii().data();
+      out.setFieldWidth(3);
+      out << "Full Clock " << corr->prn << " " << corr->iod << " ";
+      out.setFieldWidth(14);
+      out << (cc + corr->dClk) * t_CST::c << endl;
+    }
+    else {
+      out << "bncComb::printResuls bug" << endl;
+    }
+  }
+}

trunk/BNC/combination/bnccomb.h

@@ -69 +69 @@
   void dumpResults(const bncTime& resTime, 
                    const QMap<QString, t_corr*>& resCorr);
-  void printResults(QTextStream& out,
+  void printResults(QTextStream& out, const bncTime& resTime,
                     const QMap<QString, t_corr*>& resCorr);
   void switchToLastEph(const t_eph* lastEph, const t_eph* prevEph,