Changeset 5238 in ntrip for trunk

Timestamp:

Jun 17, 2013, 9:06:09 AM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncwindow.cpp (modified) (1 diff)
• rinex/bncpostprocess.cpp (modified) (4 diffs)
• rinex/bncpostprocess.h (modified) (2 diffs)

trunk/BNC/src/bncwindow.cpp

@@ -2114 +2114 @@
   }
 
+  if (_postProcessing) {
+    _postProcessing->terminate();
+  }
+
   QMainWindow::closeEvent(event);
 }

trunk/BNC/src/rinex/bncpostprocess.cpp

@@ -61 +61 @@
   _corrFile   = 0;
   _pppClient  = 0;
+  _isToBeDeleted = false;
 
   bncSettings settings;
@@ -81 +82 @@
 ////////////////////////////////////////////////////////////////////////////
 t_postProcessing::~t_postProcessing() {
+  qDebug() << "~t_postProcessing";
   delete _pppClient;
   delete _rnxNavFile;
@@ -135 +137 @@
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_postProcessing::terminate() {
+  _isToBeDeleted = true;
+  if (!isRunning()) {
+    delete this;
+  }
+}
+
 //  
 ////////////////////////////////////////////////////////////////////////////
@@ -193 +204 @@
 
     for (unsigned iObs = 0; iObs < epo->rnxSat.size(); iObs++) {
+      if (_isToBeDeleted) {
+        QThread::exit(0);
+        this->deleteLater();
+        return;
+      }
 
       const t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iObs];

trunk/BNC/src/rinex/bncpostprocess.h

@@ -61 +61 @@
  public:
   virtual void run();
+  void terminate();
  
  private:
@@ -70 +71 @@
   QFile*        _outFile;
   QTextStream*  _outStream;
+  bool          _isToBeDeleted;
 };