Changeset 3625 in ntrip for trunk/BNC/bncwindow.cpp

Timestamp:

Jan 22, 2012, 5:35:15 PM (12 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/bncwindow.cpp (modified) (3 diffs)

trunk/BNC/bncwindow.cpp

@@ -119 +119 @@
 
   _actPostProcessing = new QAction(tr("Start PP"),this);
-  connect(_actPostProcessing, SIGNAL(triggered()), SLOT(slotPostProcessing()));
+  connect(_actPostProcessing, SIGNAL(triggered()), SLOT(slotStartPostProcessing()));
 
   _postProgressBar = new QProgressBar;
@@ -1144 +1144 @@
     slotGetData();
   }
+
+  // Post-Processing Watcher
+  // -----------------------
+  _postWatcher = 0;
 }
 
@@ -2242 +2246 @@
 }
 
-// Post-Processing
-////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotPostProcessing() {
+// Start Post-Processing
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::slotStartPostProcessing() {
+
+  slotSaveOptions();
+
   _actPostProcessing->setEnabled(false);
-  slotSaveOptions();
   _postProgressBar->reset();
   _postProgressBar->show();
   enableWidget(true, _postProgressLabel);
 
-  bncSettings settings;
-
   t_postInput input;
-  input.obsFileName  = settings.value("postObsFile").toString();
-  input.navFileName  = settings.value("postNavFile").toString();
-  input.corrFileName = settings.value("postcorrFile").toString();
-
-  QFuture<void> future = QtConcurrent::run(postProcessing, input);
-
+  postProcessingInit(input);
+
+  _postWatcher = new QFutureWatcher<t_irc>;
+  connect(_postWatcher, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessing()));
+
+  _postFuture = QtConcurrent::run(postProcessingRun, input);
+  _postWatcher->setFuture(_postFuture);
+}
+
+// Post-Processing Finished
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::slotFinishedPostProcessing() {
+  cout << "slotFinishedPostProcessing" << endl;
+  delete _postWatcher;
+  _postWatcher = 0;
   enableWidget(false, _postProgressLabel);
   _postProgressBar->hide();