Changeset 3625 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpostprocess.cpp

@@ -41 +41 @@
 #include <iostream>
 #include "bncpostprocess.h"
+#include "bncsettings.h"
 
 using namespace std;
@@ -46 +47 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_irc postProcessing(const t_postInput& input) {
+t_irc postProcessingInit(t_postInput& input) {
+  bncSettings settings;
+  input.obsFileName  = settings.value("postObsFile").toString();
+  input.navFileName  = settings.value("postNavFile").toString();
+  input.corrFileName = settings.value("postcorrFile").toString();
+
+  return success;
+}
+
+// 
+////////////////////////////////////////////////////////////////////////////
+t_irc postProcessingRun(const t_postInput& input) {
 
   cout << "obsFile: "  << input.obsFileName.toAscii().data()  << endl;

trunk/BNC/bncpostprocess.h

@@ -36 +36 @@
 };
 
-t_irc postProcessing(const t_postInput& input);
+t_irc postProcessingInit(t_postInput& input);
+t_irc postProcessingRun(const t_postInput& input);
 
 #endif

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();

trunk/BNC/bncwindow.h

@@ -76 +76 @@
     void slotAddMountPoints();
     void slotGetData();
-    void slotPostProcessing();
+    void slotStartPostProcessing();
+    void slotFinishedPostProcessing();
     void slotStop();
     void slotNewMountPoints(QStringList* mountPoints);
@@ -163 +164 @@
     QLabel*        _postProgressLabel;
     QLineEdit*     _postOutLineEdit;
+    QFutureWatcher<t_irc>* _postWatcher;
+    QFuture<t_irc>         _postFuture;
 
     QCheckBox* _rnxV3CheckBox;