Changeset 3685 in ntrip

Timestamp:

Feb 12, 2012, 1:07:29 PM (12 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

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

trunk/BNC/bncpostprocess.cpp

@@ -102 +102 @@
   }
 
-  // Read Observations
-  // -----------------
+  // Read/Process Observations
+  // -------------------------
+  int   nEpo = 0;
   const t_rnxObsFile::t_epo* epo = 0;
   while ( (epo = _rnxObsFile->nextEpoch()) != 0 ) {
+    ++nEpo;
     for (int iObs = 0; iObs < epo->satObs.size(); iObs++) {
       const t_rnxObsFile::t_satObs& satObs = epo->satObs[iObs];
@@ -138 +140 @@
       _pppClient->putNewObs(obs);
     }
+    if (nEpo % 10 == 0) {
+      emit progress(nEpo);
+    }
   }
-
-//  ///// beg test
-//  int MAXI = 5;
-//  for (int ii = 1; ii < MAXI; ii++) {
-//    cout << "ii = " << ii << endl;
-//    emit progress(float(ii)/float(MAXI));
-//    sleep(1);
-//  }
-//  //// end test
 
   emit finished();

trunk/BNC/bncpostprocess.h

@@ -47 +47 @@
 
  signals:
-  void progress(float);
+  void progress(int);
   void finished();
   void newEphGPS(gpsephemeris gpseph);

trunk/BNC/bncwindow.cpp

@@ -120 +120 @@
   _actPostProcessing = new QAction(tr("Start PP"),this);
   connect(_actPostProcessing, SIGNAL(triggered()), SLOT(slotStartPostProcessing()));
-
-  _postProgressBar = new QProgressBar;
-  _postProgressBar->setMinimum(0);
-  _postProgressBar->setMaximum(100);
-  _postProgressBar->setMinimumWidth(15*ww);
-  _postProgressBar->setMaximumWidth(15*ww);
 
   _actStop = new QAction(tr("Sto&p"),this);
@@ -1816 +1810 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::AddToolbar() {
-  // Tool (Command) Bar
-  // ------------------
   QToolBar* toolBar = new QToolBar;
   addToolBar(Qt::BottomToolBarArea, toolBar); 
@@ -1826 +1818 @@
   toolBar->addAction(_actStop);
   toolBar->addAction(_actPostProcessing);
-  _postProgressLabel = new QLabel("  Progress");
+  _postProgressLabel = new QLabel("0 Epochs");
   toolBar->addWidget(_postProgressLabel);
-  toolBar->addWidget(_postProgressBar);
   enableWidget(false, _postProgressLabel);
   toolBar->addWidget(new QLabel("                                           "));
@@ -2249 +2240 @@
   slotSaveOptions();
 
-  _postProgressBar->reset();
+  _postProgressLabel->setText("0 Epochs");
   enableWidget(true, _postProgressLabel);
 
   t_postProcessing* postProcessing = new t_postProcessing(this);
   connect(postProcessing, SIGNAL(finished()), this, SLOT(slotFinishedPostProcessing()));
-  connect(postProcessing, SIGNAL(progress(float)), this, SLOT(slotPostProgress(float)));
+  connect(postProcessing, SIGNAL(progress(int)), this, SLOT(slotPostProgress(int)));
 
   postProcessing->start();
@@ -2265 +2256 @@
                            "Post-Processing Thread Finished");
   enableWidget(false, _postProgressLabel);
-  _postProgressBar->reset();
   _actPostProcessing->setEnabled(true);
 }
@@ -2271 +2261 @@
 // Progress Bar Change
 ////////////////////////////////////////////////////////////////////////////
-void bncWindow::slotPostProgress(float progress) {
-  if (_postProgressBar) {
-    _postProgressBar->setValue(int(progress*100.0));
-  }
-}
+void bncWindow::slotPostProgress(int nEpo) {
+  if (_postProgressLabel) {
+    _postProgressLabel->setText(QString("%1 Epochs").arg(nEpo));
+  }
+}

trunk/BNC/bncwindow.h

@@ -66 +66 @@
     void slotMountPointsRead(QList<bncGetThread*>);
     void slotBncTextChanged();
-    void slotPostProgress(float);
+    void slotPostProgress(int);
 
   private slots:
@@ -162 +162 @@
     qtFileChooser* _postNavFileChooser;
     qtFileChooser* _postCorrFileChooser;
-    QProgressBar*  _postProgressBar;
     QLabel*        _postProgressLabel;
     QLineEdit*     _postOutLineEdit;