Changeset 6962 in ntrip for trunk/BNC

Timestamp:

Jun 25, 2015, 8:47:06 AM (9 years ago)

Author:

stuerze

Message:

minor changes in combination

File:

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

trunk/BNC/src/combination/bnccomb.cpp

@@ -385 +385 @@
     const t_eph* ephPrev = _ephUser.ephPrev(prn);
     if (ephLast == 0) {
-      emit newMessage("bncComb: eph not found "  + prn.toAscii(), true);
+      emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii(), true);
       delete newCorr;
       continue;
@@ -398 +398 @@
       }
       else {
-        emit newMessage("bncComb: eph not found "  + prn.toAscii() + 
+        emit newMessage("bncComb: eph not found "  + prn.mid(0,3).toAscii() +
                         QString(" %1").arg(newCorr->_iod).toAscii(), true);
         delete newCorr;
@@ -623 +623 @@
     out << _resTime.datestr().c_str() << " " << _resTime.timestr().c_str()
         << " Maximum Residuum " << maxRes << ' '
-        << corrs()[maxResIndex-1]->_acName << ' ' << corrs()[maxResIndex-1]->_prn;
+        << corrs()[maxResIndex-1]->_acName << ' ' << corrs()[maxResIndex-1]->_prn.mid(0,3);
     if (maxRes > _MAXRES) {
       for (int iPar = 1; iPar <= _params.size(); iPar++) {
@@ -629 +629 @@
         if (pp->type == cmbParam::offACSat            && 
             pp->AC   == corrs()[maxResIndex-1]->_acName &&
-            pp->prn  == corrs()[maxResIndex-1]->_prn) { 
+            pp->prn  == corrs()[maxResIndex-1]->_prn.mid(0,3)) {
           QQ_sav.Row(iPar)    = 0.0;
           QQ_sav.Column(iPar) = 0.0;
@@ -648 +648 @@
         out << _resTime.datestr().c_str() << ' '
             << _resTime.timestr().c_str() << " "
-            << corr->_acName << ' ' << corr->_prn;
+            << corr->_acName << ' ' << corr->_prn.mid(0,3);
         out.setFieldWidth(10);
         out <<  " res = " << vv[ii] << endl;
@@ -678 +678 @@
           << _resTime.timestr().c_str() << " ";
       out.setFieldWidth(3);
-      out << "Full Clock " << corr->_prn << " " << corr->_iod << " ";
+      out << "Full Clock " << corr->_prn.mid(0,3) << " " << corr->_iod << " ";
       out.setFieldWidth(14);
       out << (xc(4) + corr->_dClkResult) * t_CST::c << endl;
@@ -1026 +1026 @@
         out << _resTime.datestr().c_str() << ' ' 
             << _resTime.timestr().c_str() << " "
-            << corr->_acName << ' ' << corr->_prn;
+            << corr->_acName << ' ' << corr->_prn.mid(0,3);
         out.setFieldWidth(6);
         out << " res = " << vv[ii] << endl;
@@ -1056 +1056 @@
 
     if      (ephLast == 0) {
-      out << "checkOrbit: missing eph (not found) " << corr->_prn << endl;
+      out << "checkOrbit: missing eph (not found) " << corr->_prn.mid(0,3) << endl;
       delete corr;
       im.remove();
     }
     else if (corr->_eph == 0) {
-      out << "checkOrbit: missing eph (zero) " << corr->_prn << endl;
+      out << "checkOrbit: missing eph (zero) " << corr->_prn.mid(0,3) << endl;
       delete corr;
       im.remove();
@@ -1070 +1070 @@
       }
       else {
-        out << "checkOrbit: missing eph (deleted) " << corr->_prn << endl;
+        out << "checkOrbit: missing eph (deleted) " << corr->_prn.mid(0,3) << endl;
         delete corr;
         im.remove();