Changeset 3434 in ntrip for trunk/BNC/combination/bnccomb.cpp

Timestamp:

Sep 21, 2011, 6:34:08 PM (13 years ago)

Author:

mervart

Message:

 

File:

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

trunk/BNC/combination/bnccomb.cpp

@@ -196 +196 @@
     delete _params[iPar-1];
   }
-  QVectorIterator<cmbCorr*> itCorr(_corrs);
+  QVectorIterator<cmbCorr*> itCorr(corrs());
   while (itCorr.hasNext()) {
     delete itCorr.next();
@@ -281 +281 @@
   // ---------------------------
   cmbCorr* existingCorr = 0;
-  QVectorIterator<cmbCorr*> itCorr(_corrs);
+  QVectorIterator<cmbCorr*> itCorr(corrs());
   while (itCorr.hasNext()) {
     cmbCorr* hlp = itCorr.next();
@@ -294 +294 @@
   }
   else {
-    _corrs.append(newCorr);
+    corrs().append(newCorr);
   }
 }
@@ -344 +344 @@
 
   int nPar = _params.size();
-  int nObs = _corrs.size(); 
+  int nObs = corrs().size(); 
 
   if (nObs == 0) {
@@ -363 +363 @@
     cmbAC* AC = icAC.next();
     AC->numObs = 0;
-    QVectorIterator<cmbCorr*> itCorr(_corrs);
+    QVectorIterator<cmbCorr*> itCorr(corrs());
     while (itCorr.hasNext()) {
       cmbCorr* corr = itCorr.next();
@@ -395 +395 @@
   QMap<QString, t_corr*> resCorr;
 
-  QVectorIterator<cmbCorr*> itCorr(_corrs);
+  QVectorIterator<cmbCorr*> itCorr(corrs());
   while (itCorr.hasNext()) {
     cmbCorr* corr = itCorr.next();
@@ -457 +457 @@
     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;
 
     if (maxRes > _MAXRES) {
@@ -463 +463 @@
         cmbParam* pp = _params[iPar-1];
         if (pp->type == cmbParam::offACSat            && 
-            pp->AC   == _corrs[maxResIndex-1]->acName &&
-            pp->prn  == _corrs[maxResIndex-1]->prn) { 
+            pp->AC   == corrs()[maxResIndex-1]->acName &&
+            pp->prn  == corrs()[maxResIndex-1]->prn) { 
           QQ_sav.Row(iPar)    = 0.0;
           QQ_sav.Column(iPar) = 0.0;
@@ -511 +511 @@
   // Delete Data
   // -----------
-  QVectorIterator<cmbCorr*> it(_corrs);
-  while (it.hasNext()) {
-    delete it.next();
-  }
-  _corrs.clear();
+  _buffer.remove(_resTime);
 }