Changeset 5889 in ntrip

Timestamp:

Aug 8, 2014, 4:40:40 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/PPP

Files:

• pppRun.cpp (modified) (5 diffs)
• pppRun.h (modified) (2 diffs)

trunk/BNC/src/PPP/pppRun.cpp

@@ -92 +92 @@
   }
   else {
+    _rnxObsFile = 0;
+    _rnxNavFile = 0;
+    _corrFile   = 0;
+    _maxSpeed   = 0;
+    _speed      = 0;
     processFiles();
   }
@@ -343 +348 @@
 
   try {
-    _rnxObsFile = new t_rnxObsFile(_opt->obsFileName, t_rnxObsFile::input);
+    _rnxObsFile = new t_rnxObsFile(QString(_opt->_rinexObs.c_str()), t_rnxObsFile::input);
   }
   catch (...) {
@@ -351 +356 @@
   }
 
-  _rnxNavFile = new t_rnxNavFile(_opt->navFileName, t_rnxNavFile::input);
-  _pppClient  = new bncPPPclient("POST", _opt, false);
-
-  if (!_opt->corrFileName.isEmpty()) {
-    _corrFile = new t_corrFile(_opt->corrFileName);
+  _rnxNavFile = new t_rnxNavFile(QString(_opt->_rinexNav.c_str()), t_rnxNavFile::input);
+
+  if (!_opt->_corrFile.empty()) {
+    _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
     connect(_corrFile, SIGNAL(newCorrections(QStringList)),
-            _pppClient, SLOT(slotNewCorrections(QStringList)));
+            this, SLOT(slotNewCorrections(QStringList)));
   }
 
@@ -371 +375 @@
       if (_speed < _maxSpeed) {
         double sleepTime = 0.02 * _maxSpeed / _speed;
-        msleep(sleepTime*1.e3);
+        //// msleep(sleepTime*1.e3);
       }
     }
@@ -386 +390 @@
     const QMap<QString, int>* corrIODs = _corrFile ? &_corrFile->corrIODs() : 0;
     while ( (eph = _rnxNavFile->getNextEph(epo->tt, corrIODs)) != 0 ) {
-      if (_pppClient->putNewEph(eph) != success) {
-        delete eph; eph = 0;
-      }
+      _pppClient->putEphemeris(eph);
+      delete eph; eph = 0;
     }
 
     for (unsigned iObs = 0; iObs < epo->rnxSat.size(); iObs++) {
-
-      if (_isToBeDeleted) {
-        QThread::exit(0);
-        return;
-      }
-
       const t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iObs];
     

trunk/BNC/src/PPP/pppRun.h

@@ -28 +28 @@
   void newPosition(bncTime time, QVector<double> xx);
   void newNMEAstr(QByteArray str);
+  void progress(int);
+  void finished();
 
  public slots:
@@ -35 +37 @@
   void slotNewCorrections(QStringList corrList);
   void slotNewObs(QByteArray staID, QList<t_obs> obsList);
+  void slotSetSpeed(int speed);
 
  private: