Changeset 6443 in ntrip for trunk/BNC/src/combination

Timestamp:

Dec 26, 2014, 12:47:27 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/combination

Files:

• bnccomb.cpp (modified) (5 diffs)
• bnccomb.h (modified) (3 diffs)

trunk/BNC/src/combination/bnccomb.cpp

@@ -127 +127 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncComb::bncComb() : bncEphUser(true) {
+bncComb::bncComb() : _ephUser(true) {
 
   bncSettings settings;
@@ -382 +382 @@
     // Check the Ephemeris
     //--------------------
-    if (_eph.find(prn) == _eph.end()) {
+    const t_eph* ephLast = _ephUser.ephLast(prn);
+    const t_eph* ephPrev = _ephUser.ephPrev(prn);
+    if (ephLast == 0) {
       emit newMessage("bncComb: eph not found "  + prn.toAscii(), true);
       delete newCorr;
@@ -388 +390 @@
     }
     else {
-      t_eph* lastEph = _eph[prn]->last;
-      t_eph* prevEph = _eph[prn]->prev;
-      if      (lastEph && lastEph->IOD() == newCorr->_iod) {
-        newCorr->_eph = lastEph;
-      }
-      else if (lastEph && prevEph && prevEph->IOD() == newCorr->_iod) {
-        newCorr->_eph = prevEph;
-        switchToLastEph(lastEph, newCorr);
+      if      (ephLast->IOD() == newCorr->_iod) {
+        newCorr->_eph = ephLast;
+      }
+      else if (ephPrev && ephPrev->IOD() == newCorr->_iod) {
+        newCorr->_eph = ephPrev;
+        switchToLastEph(ephLast, newCorr);
       }
       else {
@@ -1051 +1051 @@
     cmbCorr* corr = im.next();
     QString  prn  = corr->_prn;
-    if      (_eph.find(prn) == _eph.end()) {
+
+    const t_eph* ephLast = _ephUser.ephLast(prn);
+    const t_eph* ephPrev = _ephUser.ephPrev(prn);
+
+    if      (ephLast == 0) {
       out << "checkOrbit: missing eph (not found) " << corr->_prn << endl;
       delete corr;
@@ -1062 +1066 @@
     }
     else {
-      if ( corr->_eph == _eph[prn]->last || corr->_eph == _eph[prn]->prev ) {
-        switchToLastEph(_eph[prn]->last, corr);
+      if ( corr->_eph == ephLast || corr->_eph == ephPrev ) {
+        switchToLastEph(ephLast, corr);
       }
       else {

trunk/BNC/src/combination/bnccomb.h

@@ -12 +12 @@
 class bncAntex;
 
-class bncComb : public bncEphUser  {
+class bncComb : public QObject {
  Q_OBJECT
  public:
@@ -108 +108 @@
   QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
 
+  QMutex                                 _mutex;
   QList<cmbAC*>                          _ACs;
   bncTime                                _resTime;
@@ -123 +124 @@
   int                                    _cmbSampl;
   QMap<QString, QMap<t_prn, t_orbCorr> > _orbCorrections;
+  bncEphUser                             _ephUser;
 };