Changeset 5818 in ntrip for trunk/BNC

Timestamp:

Aug 6, 2014, 12:28:26 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (1 diff)
• pppObsPool.cpp (modified) (1 diff)
• pppObsPool.h (modified) (2 diffs)
• pppSatBias.cpp (modified) (3 diffs)
• pppSatBias.h (modified) (1 diff)
• satobs.cpp (modified) (1 diff)

trunk/BNC/src/PPP/pppClient.cpp

@@ -144 +144 @@
 void t_pppClient::putBiases(const vector<t_satBiases*>& biases) {
   for (unsigned ii = 0; ii < biases.size(); ii++) {
-    _obsPool->putBiases(new t_satBias(*biases[ii]));
+    _obsPool->putBiases(new t_pppSatBias(*biases[ii]));
   }
 }

trunk/BNC/src/PPP/pppObsPool.cpp

@@ -84 +84 @@
 //
 /////////////////////////////////////////////////////////////////////////////
-void t_pppObsPool::putBiases(t_satBias* satBias) {
+void t_pppObsPool::putBiases(t_pppSatBias* satBias) {
   int iPrn = satBias->prn().toInt();
   delete _satBiases[iPrn];

trunk/BNC/src/PPP/pppObsPool.h

@@ -27 +27 @@
   t_pppObsPool();
   ~t_pppObsPool();
-  void putBiases(t_satBias* satBias);
+  void putBiases(t_pppSatBias* satBias);
 
   void putEpoch(const bncTime& epoTime, std::vector<t_satObs*>& obsVector);
 
-  const t_satBias* satBias(const t_prn& prn) const {  
+  const t_pppSatBias* satBias(const t_prn& prn) const {  
     return _satBiases[prn.toInt()];
   }
@@ -44 +44 @@
 
  private:
-  t_satBias*           _satBiases[t_prn::MAXPRN+1];
+  t_pppSatBias*        _satBiases[t_prn::MAXPRN+1];
   std::deque<t_epoch*> _epochs;
 };

trunk/BNC/src/PPP/pppSatBias.cpp

@@ -27 +27 @@
  * -------------------------------------------------------------------------
  *
- * Class:      t_pppMain
+ * Class:      t_pppSatBias
  *
  * Purpose:    Satellite-specific biases
@@ -46 +46 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_satBias::t_satBias(const t_satBiases& satBiases) {
+t_pppSatBias::t_pppSatBias(const t_satBiases& satBiases) {
   _prn        = satBiases._prn;
   _time       = satBiases._time;
@@ -52 +52 @@
   _jumpCount  = satBiases._jumpCount;
   for (unsigned ii = 0; ii < satBiases._biases.size(); ii++) { 
-    const t_bias& bias = satBiases._biases[ii];
-    t_biasType biasType   = string(bias._rnxType3ch).substr(0,3);
-    _biases[biasType]     = bias._value;
+    const t_bias& bias  = satBiases._biases[ii];
+    t_biasType biasType = string(bias._rnxType3ch).substr(0,3);
+    _biases[biasType]   = bias._value;
   }
 }

trunk/BNC/src/PPP/pppSatBias.h

@@ -10 +10 @@
 typedef std::string t_biasType;
 
-class t_satBias {
+class t_pppSatBias {
  public:
-  t_satBias(const t_satBiases& satBiases);
-  ~t_satBias() {}
+  t_pppSatBias(const t_satBiases& satBiases);
+  ~t_pppSatBias() {}
   const t_prn& prn() const {return _prn;}
   const std::map<t_biasType, double>& biases() const {return _biases;}

trunk/BNC/src/PPP/satobs.cpp

@@ -245 +245 @@
   bool biasL1flg = false;
   bool biasL2flg = false;
-  const t_satBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
+  const t_pppSatBias* satBias = PPP_CLIENT->obsPool()->satBias(_prn);
   if (satBias) { 
     map<t_biasType, double>::const_iterator it;