Changeset 2919 in ntrip

Timestamp:

Jan 27, 2011, 5:56:05 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/combination

Files:

• bnccomb.cpp (modified) (4 diffs)
• bnccomb.h (modified) (1 diff)

trunk/BNC/combination/bnccomb.cpp

@@ -93 +93 @@
 
   if (newEpoch->corr.find(newCorr->prn) != newEpoch->corr.end()) {
-    delete newEpoch->corr[newCorr->prn];     
+    newEpoch->corr[newCorr->prn]->readLine(line); // merge (multiple messages)
   }
-  newEpoch->corr[newCorr->prn] = newCorr;
+  else {
+    newEpoch->corr[newCorr->prn] = newCorr;
+  }
 
   processEpochsBefore(newCorr->tt);
@@ -104 +106 @@
 void bncComb::processEpochsBefore(const bncTime& time) {
 
-  const double waitTime = 10.0; // wait 10 seconds
+  const double waitTime = 20.0; // wait 10 seconds
+
+  bool corrProcessed = false;
 
   QMapIterator<QString, cmbAC*> itAC(_ACs);
@@ -122 +126 @@
           itCorr.next();
           t_corr* corr = itCorr.value();
-          cout << AC->name.toAscii().data() << " " 
-               << AC->mountPoint.toAscii().data() << " "
-               << corr->prn.toAscii().data() << " "
-               << corr->tt.datestr() << " " << corr->tt.timestr() << " "
-               << corr->iod << " " << corr->dClk << endl;
+          processSingleCorr(AC, corr);
+          corrProcessed = true;
         }
       }
@@ -136 +137 @@
     }
   }
+
+  if (corrProcessed) {
+    printResults();
+  }
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncComb::processSingleCorr(const cmbAC* AC, const t_corr* corr) {
+  cout << AC->name.toAscii().data() << " " 
+       << AC->mountPoint.toAscii().data() << " "
+       << corr->prn.toAscii().data() << " "
+       << corr->tt.datestr() << " " << corr->tt.timestr() << " "
+       << corr->iod << " " << corr->dClk << endl;
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncComb::printResults() const {
+
+  cout << "Corrections processed" << endl << endl;
+
+}

trunk/BNC/combination/bnccomb.h

@@ -49 +49 @@
 
   void processEpochsBefore(const bncTime& time);
+  void processSingleCorr(const cmbAC* AC, const t_corr* corr);
+  void printResults() const;
 
   QMap<QString, cmbAC*> _ACs;   // Analytical Centers (key is mountpoint)