Changeset 7278 in ntrip for trunk/BNC/src/pppRun.cpp

Timestamp:

Sep 15, 2015, 4:48:34 AM (9 years ago)

Author:

stuerze

Message:

some memory leaks fixed

File:

• trunk/BNC/src/pppRun.cpp (modified) (23 diffs)

trunk/BNC/src/pppRun.cpp

@@ -36 +36 @@
  * Created:    29-Jul-2014
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -67 +67 @@
   _opt = opt;
 
-  connect(this, SIGNAL(newMessage(QByteArray,bool)), 
+  connect(this, SIGNAL(newMessage(QByteArray,bool)),
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
@@ -91 +91 @@
     connect(BNC_CORE, SIGNAL(newGPSEph(t_ephGPS)),
             this, SLOT(slotNewGPSEph(t_ephGPS)),conType);
-  
+
     connect(BNC_CORE, SIGNAL(newGlonassEph(t_ephGlo)),
             this, SLOT(slotNewGlonassEph(t_ephGlo)),conType);
-  
+
     connect(BNC_CORE, SIGNAL(newGalileoEph(t_ephGal)),
             this, SLOT(slotNewGalileoEph(t_ephGal)),conType);
@@ -120 +120 @@
     connect(this, SIGNAL(progressRnxPPP(int)), BNC_CORE, SIGNAL(progressRnxPPP(int)));
     connect(this, SIGNAL(finishedRnxPPP()),    BNC_CORE, SIGNAL(finishedRnxPPP()));
-    connect(BNC_CORE, SIGNAL(mapSpeedSliderChanged(int)),    
+    connect(BNC_CORE, SIGNAL(mapSpeedSliderChanged(int)),
             this, SLOT(slotSetSpeed(int)));
     connect(BNC_CORE, SIGNAL(stopRinexPPP()), this, SLOT(slotSetStopFlag()));
   }
- 
+
   _stopFlag = false;
 
@@ -183 +183 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewGPSEph(t_ephGPS eph) {
@@ -190 +190 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewGlonassEph(t_ephGlo eph) {
@@ -196 +196 @@
   _pppClient->putEphemeris(&eph);
 }
-  
-// 
+
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewGalileoEph(t_ephGal eph) {
@@ -220 +220 @@
   }
 
-  // Loop over all obsevations (possible different epochs)
+  // Loop over all observations (possible different epochs)
   // -----------------------------------------------------
   QListIterator<t_satObs> it(obsList);
@@ -276 +276 @@
 
     delete _epoData.front(); _epoData.pop_front();
-    
+
     ostringstream log;
     if (output._error) {
@@ -295 +295 @@
 
     if (_logFile && output._epoTime.valid()) {
-      _logFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(), 
-                      QString(output._log.c_str())); 
+      _logFile->write(output._epoTime.gpsw(), output._epoTime.gpssec(),
+                      QString(output._log.c_str()));
     }
 
@@ -335 +335 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewOrbCorrections(QList<t_orbCorr> orbCorr) {
@@ -352 +352 @@
   }
 
-  _pppClient->putOrbCorrections(corrections); 
-}
-
-// 
+  _pppClient->putOrbCorrections(corrections);
+
+  for (unsigned ii = 0; ii < corrections.size(); ii++) {
+    delete corrections[ii];
+  }
+}
+
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewClkCorrections(QList<t_clkCorr> clkCorr) {
@@ -372 +376 @@
     _lastClkCorrTime = clkCorr[ii]._time;
   }
-  _pppClient->putClkCorrections(corrections); 
-}
-
-// 
+  _pppClient->putClkCorrections(corrections);
+
+  for (unsigned ii = 0; ii < corrections.size(); ii++) {
+    delete corrections[ii];
+  }
+}
+
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotNewCodeBiases(QList<t_satCodeBias> codeBiases) {
@@ -392 +400 @@
   }
 
-  _pppClient->putCodeBiases(biases); 
-}
-
-// 
+  _pppClient->putCodeBiases(biases);
+
+  for (unsigned ii = 0; ii < biases.size(); ii++) {
+    delete biases[ii];
+  }
+}
+
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::processFiles() {
@@ -468 +480 @@
     for (unsigned iObs = 0; iObs < epo->rnxSat.size(); iObs++) {
       const t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iObs];
-    
+
       t_satObs obs;
       t_rnxObsFile::setObsFromRnx(_rnxObsFile, epo, rnxSat, obs);
@@ -479 +491 @@
       emit progressRnxPPP(nEpo);
     }
-  
+
     QCoreApplication::processEvents();
   }
@@ -493 +505 @@
 }
 
-//  
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotSetSpeed(int speed) {
@@ -500 +512 @@
 }
 
-//  
+//
 ////////////////////////////////////////////////////////////////////////////
 void t_pppRun::slotSetStopFlag() {
@@ -507 +519 @@
 }
 
-//  
+//
 ////////////////////////////////////////////////////////////////////////////
 QString t_pppRun::nmeaString(char strType, const t_output& output) {
 
-  double ell[3]; 
+  double ell[3];
   xyz2ell(output._xyzRover, ell);
   double phiDeg = ell[0] * 180 / M_PI;
@@ -520 +532 @@
     phiDeg = -phiDeg;
     phiCh  =  'S';
-  }   
+  }
   char lamCh = 'E';
   if (lamDeg < 0) {
     lamDeg = -lamDeg;
     lamCh  =  'W';
-  }   
+  }
 
   ostringstream out;
@@ -532 +544 @@
   if      (strType == 'R') {
     string datestr = output._epoTime.datestr(0); // yyyymmdd
-    out << "GPRMC," 
+    out << "GPRMC,"
         << output._epoTime.timestr(0,0) << ",A,"
-        << setw(2) << setfill('0') << int(phiDeg) 
-        << setw(6) << setprecision(3) << setfill('0') 
+        << setw(2) << setfill('0') << int(phiDeg)
+        << setw(6) << setprecision(3) << setfill('0')
         << fmod(60*phiDeg,60) << ',' << phiCh << ','
-        << setw(3) << setfill('0') << int(lamDeg) 
-        << setw(6) << setprecision(3) << setfill('0') 
+        << setw(3) << setfill('0') << int(lamDeg)
+        << setw(6) << setprecision(3) << setfill('0')
         << fmod(60*lamDeg,60) << ',' << lamCh << ",,,"
         << datestr[6] << datestr[7] << datestr[4] << datestr[5]
@@ -544 +556 @@
   }
   else if (strType == 'G') {
-    out << "GPGGA," 
+    out << "GPGGA,"
         << output._epoTime.timestr(0,0) << ','
-        << setw(2) << setfill('0') << int(phiDeg) 
-        << setw(10) << setprecision(7) << setfill('0') 
+        << setw(2) << setfill('0') << int(phiDeg)
+        << setw(10) << setprecision(7) << setfill('0')
         << fmod(60*phiDeg,60) << ',' << phiCh << ','
-        << setw(3) << setfill('0') << int(lamDeg) 
-        << setw(10) << setprecision(7) << setfill('0') 
-        << fmod(60*lamDeg,60) << ',' << lamCh 
+        << setw(3) << setfill('0') << int(lamDeg)
+        << setw(10) << setprecision(7) << setfill('0')
+        << fmod(60*lamDeg,60) << ',' << lamCh
         << ",1," << setw(2) << setfill('0') << output._numSat << ','
         << setw(3) << setprecision(1) << output._pDop << ','
@@ -569 +581 @@
 }
 
-//  
+//
 ////////////////////////////////////////////////////////////////////////////
 bool t_pppRun::waitForCorr(const bncTime& epoTime) const {