Changeset 6068 in ntrip for trunk/BNC/src/PPP_free

Timestamp:

Sep 7, 2014, 10:13:42 AM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP_free

Files:

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

trunk/BNC/src/PPP_free/bncpppclient.cpp

@@ -84 +84 @@
 //
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::putNewObs(const t_obs& obs) {
+void bncPPPclient::putNewObs(const t_obs& obs, t_output* output) {
   QMutexLocker locker(&_mutex);
 
@@ -132 +132 @@
   }
   else if (satData->tt != _epoData.back()->tt) {
-    processEpochs();
+    processEpochs(output);
     _epoData.push(new t_epoData());
     _epoData.back()->tt = satData->tt;
@@ -407 +407 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::processFrontEpoch() {
+void bncPPPclient::processFrontEpoch(t_output* output) {
 
 #ifdef BNC_DEBUG
@@ -475 +475 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-void bncPPPclient::processEpochs() {
+void bncPPPclient::processEpochs(t_output* output) {
 
   // Make sure the buffer does not grow beyond any limit
@@ -500 +500 @@
     // -----------------------
     if (_opt->_corrWaitTime == 0.0 || frontEpoData->tt - _corr_tt >= _opt->_corrWaitTime) {
-      processFrontEpoch();
+      processFrontEpoch(output);
       delete _epoData.front();
       _epoData.pop();

trunk/BNC/src/PPP_free/bncpppclient.h

@@ -37 +37 @@
 class t_satData;
 class t_epoData;
+class t_output;
 
 class bncPPPclient : public bncEphUser {
@@ -42 +43 @@
   bncPPPclient(QByteArray staID, const t_pppOptions* opt);
   ~bncPPPclient();
-  void                putNewObs(const t_obs& pp);
+  void                putNewObs(const t_obs& pp, t_output* output);
   void                putNewCorrections(QList<QString> corrList);
   QByteArray          staID() const {return _staID;}
@@ -62 +63 @@
 
   t_irc getSatPos(const bncTime& tt, const QString& prn, ColumnVector& xc, ColumnVector& vv);
-  void processEpochs();
-  void processFrontEpoch();
+  void processEpochs(t_output* output);
+  void processFrontEpoch(t_output* output);
   t_irc cmpToT(t_satData* satData);
   static t_irc applyCorr(const bncTime& tt, const t_corr* cc, ColumnVector& xc, ColumnVector& vv);