Changeset 3782 in ntrip for trunk/BNC

Timestamp:

Apr 5, 2012, 11:52:26 AM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncwindow.cpp (modified) (18 diffs)
• bncwindow.h (modified) (5 diffs)
• rinex/bncpostprocess.cpp (modified) (1 diff)

trunk/BNC/bncwindow.cpp

@@ -79 +79 @@
   _bncFigureLate = new bncFigureLate(this);
   _bncFigurePPP = new bncFigurePPP(this);
-  _postProcessingRunningPPP  = false;
-  _postProcessingRunningTeqc = false;
+  _runningRealTime           = false;
+  _runningPostProcessingPPP  = false;
+  _runningPostProcessingTeqc = false;
 
   int ww = QFontMetrics(this->font()).width('w');
@@ -120 +121 @@
   _actDeleteMountPoints->setEnabled(false);
 
-  _actGetData = new QAction(tr("Sta&rt"),this);
-  connect(_actGetData, SIGNAL(triggered()), SLOT(slotGetData()));
-
-  _actPostProcessing = new QAction(tr("Start PPP/Teqc"),this);
-  connect(_actPostProcessing, SIGNAL(triggered()), SLOT(slotStartPostProcessing()));
+  _actStart = new QAction(tr("Sta&rt"),this);
+  connect(_actStart, SIGNAL(triggered()), SLOT(slotStart()));
 
   _actStop = new QAction(tr("Sto&p"),this);
@@ -609 +607 @@
   _aogroup->addTab(uploadgroup,tr("Upload (clk)"));
   _aogroup->addTab(uploadEphgroup,tr("Upload (eph)"));
-
-  connect(_aogroup, SIGNAL(currentChanged(int)), 
-          this, SLOT(slotEnablePostProcessing()));
 
   // Log Tab
@@ -1213 +1208 @@
   // ----------
   if ( Qt::CheckState(settings.value("autoStart").toInt()) == Qt::Checked) {
-    slotGetData();
+    slotStart();
   }
 }
@@ -1236 +1231 @@
   QListIterator<QString> it(settings.value("mountPoints").toStringList());
   if (!it.hasNext()) {
-    _actGetData->setEnabled(false);
+    _actStart->setEnabled(false);
   }
   int iRow = 0;
@@ -1390 +1385 @@
 
   if (_mountPointsTable->rowCount() == 0) {
-    _actGetData->setEnabled(false);
+    _actStart->setEnabled(false);
   }
 }
@@ -1457 +1452 @@
   _mountPointsTable->sortItems(1);
   if (mountPoints->count() > 0 && !_actStop->isEnabled()) {
-    _actGetData->setEnabled(true);
+    _actStart->setEnabled(true);
   }
   delete mountPoints;
@@ -1657 +1652 @@
   delete _caster;    _caster    = 0;
   delete _casterEph; _casterEph = 0;
-  _actGetData->setEnabled(true);
+  _actStart->setEnabled(true);
   _actStop->setEnabled(false);
 }
@@ -1663 +1658 @@
 // Retrieve Data
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotGetData() {
+void bncWindow::slotStart() {
   slotSaveOptions();
 
@@ -1669 +1664 @@
 
   _actDeleteMountPoints->setEnabled(false);
-  _actGetData->setEnabled(false);
+  _actStart->setEnabled(false);
   _actStop->setEnabled(true);
 
@@ -1733 +1728 @@
     delete _caster;    _caster    = 0;
     delete _casterEph; _casterEph = 0;
-    _actGetData->setEnabled(true);
+    _actStart->setEnabled(true);
     _actStop->setEnabled(false);
   }
@@ -1897 +1892 @@
   toolBar->addAction(_actAddMountPoints);
   toolBar->addAction(_actDeleteMountPoints);
-  toolBar->addAction(_actGetData);
+  toolBar->addAction(_actStart);
   toolBar->addAction(_actStop);
-  toolBar->addAction(_actPostProcessing);
   toolBar->addWidget(new QLabel("                                           "));
   toolBar->addAction(_actwhatsthis);
@@ -2140 +2134 @@
     enableWidget(!enable10, _teqcNavFileChooser);
     enableWidget(!enable10, _teqcOutLineEdit);
-  }
-
-  slotEnablePostProcessing();
-}
-
-// Enable/Disable Post-Processing Action
-////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotEnablePostProcessing() {
-  if (_actPostProcessing) {
-    if (_postProcessingRunningPPP || _postProcessingRunningTeqc) {
-      _actPostProcessing->setEnabled(false);
-    }
-    else {
-      if      (_aogroup->currentIndex() == _tabIndexPPP1 ||
-               _aogroup->currentIndex() == _tabIndexPPP2) {
-        _actPostProcessing->setText("Start PPP");
-        bool enable = _pppSPPComboBox->currentText() == "Post-Processing";
-        _actPostProcessing->setEnabled(enable);
-      }
-      else if (_aogroup->currentIndex() == _tabIndexTeqc) {
-        _actPostProcessing->setText("Start Teqc");
-        _actPostProcessing->setEnabled(true);
-      }
-      else {
-        _actPostProcessing->setText("Start PPP/Teqc");
-        _actPostProcessing->setEnabled(false);
-      }
-    }
   }
 }
@@ -2346 +2312 @@
 }
 
-// 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
-  _postProcessingRunningPPP = true;
-  slotEnablePostProcessing();
-  _actPostProcessing->setText("0 Epochs");
+  _runningPostProcessingPPP = true;
+  _actStart->setText("0 Epochs");
 
   slotSaveOptions();
@@ -2382 +2335 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotFinishedPostProcessingPPP() {
-  _postProcessingRunningPPP = false;
+  _runningPostProcessingPPP = false;
   QMessageBox::information(this, "Information",
                            "Post-Processing Thread Finished");
-  slotEnablePostProcessing();
 }
 
@@ -2391 +2343 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotPostProgress(int nEpo) {
-  if (_actPostProcessing) {
-    _actPostProcessing->setText(QString("%1 Epochs").arg(nEpo));
+  if (_actStart) {
+    _actStart->setText(QString("%1 Epochs").arg(nEpo));
   }
 }
@@ -2399 +2351 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::startPostProcessingTeqc() {
-  _postProcessingRunningTeqc = false;  // TODO
+  _runningPostProcessingTeqc = false;  // TODO
   QMessageBox::information(this, "Information",
                            "Teqc-Processing Not Yet Implemented");
-  slotEnablePostProcessing();
 }
 
@@ -2408 +2359 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotFinishedPostProcessingTeqc() {
-  _postProcessingRunningTeqc = false;
+  _runningPostProcessingTeqc = false;
   QMessageBox::information(this, "Information",
                            "Teqc-Processing Thread Finished");
-  slotEnablePostProcessing();
 }
 

trunk/BNC/bncwindow.h

@@ -76 +76 @@
     void slotSaveOptions();
     void slotAddMountPoints();
-    void slotGetData();
-    void slotStartPostProcessing();
+    void slotStart();
     void slotFinishedPostProcessingPPP();
     void slotFinishedPostProcessingTeqc();
@@ -91 +90 @@
     void slotDelUploadRow();
     void slotSetUploadTrafo();
-    void slotEnablePostProcessing();
     void slotTeqcEditOption();
 
@@ -102 +100 @@
     void populateUploadTable();
     void enableWidget(bool enable, QWidget* widget);
+    void startRealTime();
     void startPostProcessingPPP();
     void startPostProcessingTeqc();
@@ -114 +113 @@
     QAction*   _actSaveOpt;
     QAction*   _actQuit; 
-    QAction*   _actGetData;
-    QAction*   _actPostProcessing;
+    QAction*   _actStart;
     QAction*   _actStop;
     QAction*   _actAddMountPoints;
@@ -248 +246 @@
     int _tabIndexPPP2;
     int _tabIndexTeqc;
-    bool _postProcessingRunningPPP;
-    bool _postProcessingRunningTeqc;
+    bool _realTimeRunning;
+    bool _runningRealTime;
+    bool _runningPostProcessingPPP;
+    bool _runningPostProcessingTeqc;
 };
 #endif

trunk/BNC/rinex/bncpostprocess.cpp

@@ -158 +158 @@
       obs.GPSWeek  = epo->tt.gpsw();
       obs.GPSWeeks = epo->tt.gpssec();
+      //// TODO: check RINEX Version 3 types
       for (int iType = 0; iType < _rnxObsFile->nTypes(obs.satSys); iType++) {
         QByteArray type = _rnxObsFile->obsType(obs.satSys,iType).toAscii();