Changeset 3735 in ntrip

Timestamp:

Mar 27, 2012, 6:27:15 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncwindow.cpp (modified) (7 diffs)
• bncwindow.h (modified) (4 diffs)

trunk/BNC/bncwindow.cpp

@@ -78 +78 @@
   _bncFigureLate = new bncFigureLate(this);
   _bncFigurePPP = new bncFigurePPP(this);
+  _postProcessingRunning = false;
 
   int ww = QFontMetrics(this->font()).width('w');
@@ -120 +121 @@
   connect(_actGetData, SIGNAL(triggered()), SLOT(slotGetData()));
 
-  _actPostProcessing = new QAction(tr("Start PPP"),this);
+  _actPostProcessing = new QAction(tr("Start PPP/Teqc"),this);
   connect(_actPostProcessing, SIGNAL(triggered()), SLOT(slotStartPostProcessing()));
-
-  _actTeqcProcessing = new QAction(tr("Start Teqc"),this);
-  connect(_actTeqcProcessing, SIGNAL(triggered()), SLOT(slotStartTeqcProcessing()));
 
   _actStop = new QAction(tr("Sto&p"),this);
@@ -601 +599 @@
   _aogroup->addTab(agroup,tr("Outages"));
   _aogroup->addTab(rgroup,tr("Miscellaneous"));
-  _aogroup->addTab(pppgroup,tr("PPP (1)"));
-  _aogroup->addTab(ppp2group,tr("PPP (2)"));
-  _aogroup->addTab(teqcgroup,tr("teqc"));
+  _aogroup->addTab(pppgroup,tr("PPP (1)"));  _tabIndexPPP1 = _aogroup->count() - 1;
+  _aogroup->addTab(ppp2group,tr("PPP (2)")); _tabIndexPPP2 = _aogroup->count() - 1;
+  _aogroup->addTab(teqcgroup,tr("teqc"));    _tabIndexTeqc = _aogroup->count() - 1;
 #ifdef USE_COMBINATION
   _aogroup->addTab(cmbgroup,tr("Combination"));
@@ -1886 +1884 @@
   toolBar->addAction(_actStop);
   toolBar->addAction(_actPostProcessing);
-  toolBar->addAction(_actTeqcProcessing);
   toolBar->addWidget(new QLabel("                                           "));
   toolBar->addAction(_actwhatsthis);
@@ -2300 +2297 @@
 }
 
-// Start Post-Processing
+// Start Post-Processing PPP or Teqc (slot)
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotStartPostProcessing() {
+  if      (_aogroup->currentIndex() == _tabIndexPPP1 ||
+      _aogroup->currentIndex() == _tabIndexPPP2) {
+    startPostProcessingPPP();
+  }
+  else if (_aogroup->currentIndex() == _tabIndexTeqc) {
+    startPostProcessingTeqc();
+  }
+}
+
+// Start Post-Processing PPP
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::startPostProcessingPPP() {
 #ifdef USE_POSTPROCESSING
   _actPostProcessing->setEnabled(false);
@@ -2320 +2329 @@
 }
 
-// Post-Processing Finished
+// Post-Processing PPP Finished
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotFinishedPostProcessing() {
@@ -2337 +2346 @@
 }
 
-// Start Teqc
-////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotStartTeqcProcessing() {
+// Start Post-Processing Teqc
+////////////////////////////////////////////////////////////////////////////
+void bncWindow::startPostProcessingTeqc() {
   QMessageBox::information(this, "Information",
                            "Teqc-Processing Not Yet Implemented");
 }
 
-// Teqc-Processing Finished
+// Post-Processing Teqc Finished
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotFinishedTeqcProcessing() {
   QMessageBox::information(this, "Information",
                            "Teqc-Processing Thread Finished");
-  _actTeqcProcessing->setText("Start Teqc-Processing");
-  _actTeqcProcessing->setEnabled(true);
-}
+}

trunk/BNC/bncwindow.h

@@ -78 +78 @@
     void slotGetData();
     void slotStartPostProcessing();
-    void slotStartTeqcProcessing();
     void slotFinishedPostProcessing();
     void slotFinishedTeqcProcessing();
@@ -101 +100 @@
     void populateUploadTable();
     void enableWidget(bool enable, QWidget* widget);
+    void startPostProcessingPPP();
+    void startPostProcessingTeqc();
+    void enablePostProcessing();
 
     QMenu*     _menuHlp;
@@ -113 +115 @@
     QAction*   _actGetData;
     QAction*   _actPostProcessing;
-    QAction*   _actTeqcProcessing;
     QAction*   _actStop;
     QAction*   _actAddMountPoints;
@@ -242 +243 @@
 
     bncEphUploadCaster* _casterEph;
+
+    int _tabIndexPPP1;
+    int _tabIndexPPP2;
+    int _tabIndexTeqc;
+    bool _postProcessingRunning;
 };
 #endif