Changeset 3588 in ntrip for trunk

Timestamp:

Jan 19, 2012, 5:44:10 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

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

trunk/BNC/combination/bnccomb.cpp

@@ -262 +262 @@
     _buffer.remove(epoTime);
   }
+  QMapIterator<QString, cmbCorr*> itOrbCorr(_orbitCorrs);
+  while (itOrbCorr.hasNext()) {
+    itOrbCorr.next();
+    delete itOrbCorr.value();
+  }
 }
 
@@ -302 +307 @@
   }
 
+  // Save Orbit-Only Corrections
+  // ---------------------------
+  if (newCorr->raoSet && !newCorr->dClkSet) {
+    QString corrID = newCorr->ID();
+    if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) {
+      delete _orbitCorrs[corrID];
+    }
+    _orbitCorrs[corrID] = new cmbCorr(*newCorr);
+  }
+
   // Check Modulo Time
   // -----------------
@@ -314 +329 @@
     delete newCorr;
     return;
+  }
+
+  // Merge with saved orbit correction
+  // ---------------------------------
+  if (newCorr->dClkSet && !newCorr->raoSet) {
+    QString corrID = newCorr->ID();
+    if (_orbitCorrs.find(corrID) != _orbitCorrs.end()) {
+      mergeOrbitCorr(_orbitCorrs[corrID], newCorr);
+    }
   }
 
@@ -362 +386 @@
   }
   if (existingCorr) {
-    delete newCorr;
+    delete newCorr; newCorr = 0;
     existingCorr->readLine(line); // merge (multiple messages)
+   
   }
   else {
@@ -1119 +1144 @@
   return success;
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+t_irc bncComb::mergeOrbitCorr(const cmbCorr* orbitCorr, cmbCorr* clkCorr) {
+
+
+  return success;
+}

trunk/BNC/combination/bnccomb.h

@@ -62 +62 @@
     QString      acName;
     ColumnVector diffRao;
+    QString ID() {return acName + "_" + prn;}
   };
 
@@ -92 +93 @@
   QVector<cmbCorr*>& corrs() {return _buffer[_resTime].corrs;}
 
+  t_irc mergeOrbitCorr(const cmbCorr* orbitCorr, cmbCorr* clkCorr);
+
   QList<cmbAC*>           _ACs;
   bncTime                 _resTime;
@@ -105 +108 @@
   e_method                _method;
   bool                    _useGlonass;
+  QMap<QString, cmbCorr*> _orbitCorrs;
 };