Changeset 5823 in ntrip for trunk/BNC/src/PPP/pppClient.cpp

Timestamp:

Aug 6, 2014, 1:14:39 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/PPP/pppClient.cpp (modified) (4 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -150 +150 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-t_irc t_pppClient::prepareObs(const vector<t_satObs*>& pppSatObs,
+t_irc t_pppClient::prepareObs(const vector<t_satObs*>& satObs,
                               vector<t_pppSatObs*>& obsVector, bncTime& epoTime) {
   // Default 
@@ -159 +159 @@
   // -----------------------------------
   int numValidGPS = 0;
-  for (unsigned ii = 0; ii < pppSatObs.size(); ii++) {
-    char system = pppSatObs[ii]->_prn.system();
+  for (unsigned ii = 0; ii < satObs.size(); ii++) {
+    char system = satObs[ii]->_prn.system();
     if (system == 'G' || (system == 'R' && OPT->useGlonass())) {
-      t_pppSatObs* satObs = new t_pppSatObs(*pppSatObs[ii]);
-      if (satObs->isValid()) {
-        obsVector.push_back(satObs);
-        if (satObs->prn().system() == 'G') {
+      t_pppSatObs* pppSatObs = new t_pppSatObs(*satObs[ii]);
+      if (pppSatObs->isValid()) {
+        obsVector.push_back(pppSatObs);
+        if (pppSatObs->prn().system() == 'G') {
           ++numValidGPS;
         }
       }
       else {
-        delete satObs;
+        delete pppSatObs;
       }
     }
@@ -402 +402 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::processEpoch(const vector<t_satObs*>& pppSatObs, t_output* output) {
+void t_pppClient::processEpoch(const vector<t_satObs*>& satObs, t_output* output) {
 
   try {
@@ -409 +409 @@
     // Prepare Observations of the Rover
     // ---------------------------------    
-    if (prepareObs(pppSatObs, _obsRover, _epoTimeRover) != success) {
+    if (prepareObs(satObs, _obsRover, _epoTimeRover) != success) {
       return finish(failure);
     }