Changeset 3627 in ntrip for trunk

Timestamp:

Jan 22, 2012, 6:26:26 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpostprocess.cpp (modified) (3 diffs)
• bncpostprocess.h (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/bncpostprocess.cpp

@@ -48 +48 @@
 ////////////////////////////////////////////////////////////////////////////
 t_postProcessing::t_postProcessing(QObject* parent) : QThread(parent) {
-
   bncSettings settings;
   _input.obsFileName  = settings.value("postObsFile").toString();
   _input.navFileName  = settings.value("postNavFile").toString();
   _input.corrFileName = settings.value("postcorrFile").toString();
-
-  _isToBeDeleted = false;
 }
 
@@ -60 +57 @@
 ////////////////////////////////////////////////////////////////////////////
 t_postProcessing::~t_postProcessing() {
-  if (isRunning()) {
-    wait();
-  }
-}
-
-// 
-////////////////////////////////////////////////////////////////////////////
-void t_postProcessing::terminate() {
-  _isToBeDeleted = true;
-  if (!isRunning()) {
-    delete this;
-  }
+  cout << "~t_postProcessing" << endl;
 }
 
@@ -82 +68 @@
   cout << "corrFile: " << _input.corrFileName.toAscii().data() << endl;
 
-  int MAXI = 10;
+  int MAXI = 5;
   for (int ii = 1; ii < MAXI; ii++) {
     cout << "ii = " << ii << endl;
     sleep(1);
   }
+
+  emit finished();
 }

trunk/BNC/bncpostprocess.h

@@ -49 +49 @@
    
  public:
-  void terminate();
   virtual void run();
  
  private:
   t_postInput _input;
-  bool        _isToBeDeleted;
 };
 

trunk/BNC/bncwindow.cpp

@@ -2255 +2255 @@
 
   t_postProcessing* postProcessing = new t_postProcessing(this);
-  connect(postProcessing, SLOT(finished()), this, SIGNAL(slotFinishedPostProcessing));
+  connect(postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessing()));
 
   postProcessing->start();