Changeset 5779 in ntrip for trunk/BNC/src/PPP

Timestamp:

Aug 4, 2014, 1:46:47 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppClient.cpp (modified) (3 diffs)
• pppClient.h (modified) (1 diff)
• pppThread.cpp (modified) (2 diffs)

trunk/BNC/src/PPP/pppClient.cpp

@@ -128 +128 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::putOrbCorrections(const vector<t_orbCorr>& corr) {
+void t_pppClient::putOrbCorrections(const vector<t_orbCorr*>& corr) {
   for (unsigned ii = 0; ii < corr.size(); ii++) {
-    _ephPool->putOrbCorrection(new t_orbCorr(corr[ii]));
+    _ephPool->putOrbCorrection(new t_orbCorr(*corr[ii]));
   }
   LOG << OPT->_roverName <<  " putOrbCorrections " << corr.size() << endl;
@@ -137 +137 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::putClkCorrections(const vector<t_clkCorr>& corr) {
+void t_pppClient::putClkCorrections(const vector<t_clkCorr*>& corr) {
   for (unsigned ii = 0; ii < corr.size(); ii++) {
-    _ephPool->putClkCorrection(new t_clkCorr(corr[ii]));
+    _ephPool->putClkCorrection(new t_clkCorr(*corr[ii]));
   }
   LOG << OPT->_roverName <<  " putClkCorrections " << corr.size() << endl;
@@ -146 +146 @@
 // 
 //////////////////////////////////////////////////////////////////////////////
-void t_pppClient::putBiases(const vector<t_satBiases>& biases) {
+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_satBias(*biases[ii]));
   }
   LOG << OPT->_roverName <<  " putBiases " << biases.size() << endl;

trunk/BNC/src/PPP/pppClient.h

@@ -24 +24 @@
 
   void putEphemeris(const t_eph* eph);                  
-  void putOrbCorrections(const std::vector<t_orbCorr>& corr); 
-  void putClkCorrections(const std::vector<t_clkCorr>& corr); 
-  void putBiases(const std::vector<t_satBiases>& biases);   
+  void putOrbCorrections(const std::vector<t_orbCorr*>& corr); 
+  void putClkCorrections(const std::vector<t_clkCorr*>& corr); 
+  void putBiases(const std::vector<t_satBiases*>& biases);   
   void processEpoch(const std::vector<t_pppSatObs*>& pppSatObs, t_output* output);
 

trunk/BNC/src/PPP/pppThread.cpp

@@ -154 +154 @@
   }
 
-  // _pppClient->putOrbCorrections(const std::vector<t_orbCorr>& corr); 
-  // _pppClient->putClkCorrections(const std::vector<t_clkCorr>& corr); 
-  // _pppClient->putBiases(const std::vector<t_satBiases>& biases);   
+  // _pppClient->putOrbCorrections(const std::vector<t_orbCorr*>& corr); 
+  // _pppClient->putClkCorrections(const std::vector<t_clkCorr*>& corr); 
+  // _pppClient->putBiases(const std::vector<t_satBiases*>& biases);   
 }
 //
@@ -176 +176 @@
   _pppClient->processEpoch(satObs, &output);
 
+  for (unsigned ii = 0; ii < satObs.size(); ii++) {
+    delete satObs[ii];
+  }
+  satObs.clear();
+
   emit newMessage(QByteArray(output._log.c_str()), true);
 }