Changeset 9021 in ntrip

Timestamp:

Aug 18, 2020, 10:20:02 PM (4 years ago)

Author:

stuerze

Message:

revert last changes

Location:

branches/BNC_2.12/src

Files:

• bnccaster.cpp (modified) (3 diffs)
• bnccaster.h (modified) (2 diffs)

branches/BNC_2.12/src/bnccaster.cpp

@@ -164 +164 @@
     obs._staID = staID.data();
 
-    // Update/Set Slip Counters
-    // ------------------------
-    setSlipCounters(obs);
-    
     // Output into the socket
     // ----------------------
@@ -203 +199 @@
       _lastDumpTime = obs._time - 1.0;
     }
-    
+
     // An old observation - throw it away
     // ----------------------------------
@@ -564 +560 @@
                    .arg(_miscSockets->size()).toAscii(), true) );
 }
-
-// Set/Update Slip Counters 
-////////////////////////////////////////////////////////////////////////////
-void bncCaster::setSlipCounters(t_satObs& obs) {
-
-  double minLockTime = -1.0;
-  for (unsigned ii = 0; ii < obs._obs.size(); ii++) {
-    const t_frqObs* frqObs = obs._obs[ii];
-    if (frqObs->_lockTimeValid) {
-      if (minLockTime == -1.0 || minLockTime < frqObs->_lockTime) {
-        minLockTime = frqObs->_lockTime;
-      }
-    }
-  }
-
-  if (minLockTime == -1.0) {
-    return;
-  }
-
-  QMap<t_prn, double>& hlpMap = _lockTimeMap[obs._staID];
-  QMap<t_prn, double>::const_iterator it = hlpMap.find(obs._prn);
-  if (it == hlpMap.end()) {
-    hlpMap[obs._prn] = minLockTime;
-    for (unsigned ii = 0; ii < obs._obs.size(); ii++) {
-      t_frqObs* frqObs = obs._obs[ii];
-      frqObs->_slipCounter = 0;
-    }
-  }
-  else {
-    if (hlpMap[obs._prn] < minLockTime) {
-      hlpMap[obs._prn] = minLockTime;
-      for (unsigned ii = 0; ii < obs._obs.size(); ii++) {
-        t_frqObs* frqObs = obs._obs[ii];
-        frqObs->_slipCounter += 1;
-        if (frqObs->_slipCounter > 9999) {
-          frqObs->_slipCounter = 0;
-        }
-      }
-    }
-  }
-}

branches/BNC_2.12/src/bnccaster.h

@@ -64 +64 @@
    static int myWrite(QTcpSocket* sock, const char* buf, int bufLen);
    void reopenOutFile();
-   void setSlipCounters(t_satObs& obs);
 
    QFile*                          _outFile;
@@ -85 +84 @@
    QTcpServer*                     _miscServer;
    QList<QTcpSocket*>*             _miscSockets;
-   QMap<std::string, QMap<t_prn, double> > _lockTimeMap;
 };