Changeset 7218 in ntrip for trunk/BNC/src

Timestamp:

Aug 18, 2015, 10:28:08 AM (9 years ago)

Author:

stuerze

Message:

minor re-organisation of PPP parts

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (6 diffs)
• pppClient.h (modified) (3 diffs)
• pppUtils.cpp (added)
• pppUtils.h (added)

trunk/BNC/src/PPP/pppClient.cpp

@@ -44 +44 @@
 
 #include "pppClient.h"
+#include "pppUtils.h"
 #include "bncephuser.h"
 #include "bncutils.h"
@@ -53 +54 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppClient::t_pppClient(const t_pppOptions* opt) {
-
-  _opt     = new t_pppOptions(*opt);
-  _filter  = new t_pppFilter(this);
-  _epoData = new t_epoData();
-  _log     = new ostringstream();
-  _ephUser = new bncEphUser(false);
-
-  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
-    _satCodeBiases[ii] = 0;
-  }
-
+  _opt      = new t_pppOptions(*opt);
+  _filter   = new t_pppFilter(this);
+  _epoData  = new t_epoData();
+  _log      = new ostringstream();
+  _ephUser  = new bncEphUser(false);
+  _pppUtils = new t_pppUtils();
 }
 
@@ -69 +65 @@
 ////////////////////////////////////////////////////////////////////////////
 t_pppClient::~t_pppClient() {
-
-  for (unsigned ii = 0; ii <= t_prn::MAXPRN; ii++) {
-    delete _satCodeBiases[ii];
-  }
-
   delete _filter;
   delete _epoData;
@@ -112 +103 @@
       t_frqObs* frqObs = obs->_obs[ifrq];
       double cb = 0.0;
-      const t_satCodeBias* satCB = satCodeBias(prn);
+      const t_satCodeBias* satCB = _pppUtils->satCodeBias(prn);
       if (satCB && satCB->_bias.size()) {
         for (unsigned ii = 0; ii < satCB->_bias.size(); ii++) {
@@ -337 +328 @@
 void t_pppClient::putCodeBiases(const std::vector<t_satCodeBias*>& satCodeBias) {
   for (unsigned ii = 0; ii < satCodeBias.size(); ii++) {
-    putCodeBias(new t_satCodeBias(*satCodeBias[ii]));
+    _pppUtils->putCodeBias(new t_satCodeBias(*satCodeBias[ii]));
   }
 }
@@ -412 +403 @@
   return failure;
 }
-
-void t_pppClient::putCodeBias(t_satCodeBias* satCodeBias) {
-  int iPrn = satCodeBias->_prn.toInt();
-  delete _satCodeBiases[iPrn];
-  _satCodeBiases[iPrn] = satCodeBias;
-}

trunk/BNC/src/PPP/pppClient.h

@@ -32 +32 @@
 #include "pppOptions.h"
 #include "pppFilter.h"
+#include "pppUtils.h"
 
 class bncEphUser;
@@ -49 +50 @@
   std::ostringstream& log() {return *_log;}
   const t_pppOptions* opt() const {return _opt;}
-  void putCodeBias(t_satCodeBias* satCodeBias);
-  const t_satCodeBias* satCodeBias(const t_prn& prn) const {
-    return _satCodeBiases[prn.toInt()];
-  }
+  //void putCodeBias(t_satCodeBias* satCodeBias);
+  //const t_satCodeBias* satCodeBias(const t_prn& prn) const {
+  //  return _satCodeBiases[prn.toInt()];
+  //}
  private:
   t_irc getSatPos(const bncTime& tt, const QString& prn, ColumnVector& xc, ColumnVector& vv);
@@ -58 +59 @@
   t_irc cmpToT(t_satData* satData);
 
-  t_satCodeBias*       _satCodeBiases[t_prn::MAXPRN+1];
+//  t_satCodeBias*       _satCodeBiases[t_prn::MAXPRN+1];
   bncEphUser*         _ephUser;
   t_pppOptions*       _opt;
   t_epoData*          _epoData;
   t_pppFilter*        _filter;
+  t_pppUtils*         _pppUtils;
   std::ostringstream* _log; 
 };