Changeset 10791 in ntrip for trunk/BNC/src/pppRun.cpp

Timestamp:

Dec 3, 2025, 5:37:16 PM (3 weeks ago)

Author:

mervart

Message:

BNC Multifrequency and PPPAR Client (initial version)

File:

• trunk/BNC/src/pppRun.cpp (modified) (7 diffs)

trunk/BNC/src/pppRun.cpp

@@ -133 +133 @@
     _rnxNavFile = 0;
     _corrFile   = 0;
+    _biasFile   = 0;
     _ionoFile   = 0;
     _speed      = settings.value("PPP/mapSpeedSlider").toInt();
@@ -274 +275 @@
   QMutexLocker locker(&_mutex);
 
+  //// beg test
+  // if (obsList.size() > 0) {
+  //   const double sampling = 5.0;
+  //   const bncTime& tt = obsList[0]._time;
+  //   double mod = remainder(tt.gpssec(), sampling);
+  //   if (fabs(mod) > 0.05) {
+  //     return;
+  //   }
+  // }
+  //// end test
+
   if (string(staID.data()) != _opt->_roverName) {
     return;
@@ -432 +444 @@
       return;
     }
-    if ( _opt->_ionoMount.empty() &&
-        !_opt->_corrMount.empty() && _opt->_corrMount != vTec._staID) {
-      return;
-    }
-    if (!_opt->_ionoMount.empty() && _opt->_ionoMount != vTec._staID) {
-      return;
+    if      (!_opt->_ionoMount.empty()) {
+      if (_opt->_ionoMount != vTec._staID) {
+        return;
+      }
+    }
+    else if (!_opt->_corrMount.empty()) {
+      if (_opt->_corrMount != vTec._staID) {
+        return;
+      }
     }
   }
@@ -499 +514 @@
 
   if (_opt->_realTime) {
-    if (_opt->_corrMount.empty() || _opt->_corrMount != codeBiases[0]._staID) {
+    if (_opt->_corrMount.empty() && _opt->_biasMount.empty()) {
       return;
+    }
+    if      (!_opt->_biasMount.empty()) {
+      if (_opt->_biasMount != codeBiases[0]._staID) {
+        return;
+      }
+    }
+    else if (!_opt->_corrMount.empty()) {
+      if (_opt->_corrMount != codeBiases[0]._staID) {
+        return;
+      }
     }
   }
@@ -523 +548 @@
 
   if (_opt->_realTime) {
-    if (_opt->_corrMount.empty() || _opt->_corrMount != phaseBiases[0]._staID) {
+    if (_opt->_corrMount.empty() && _opt->_biasMount.empty()) {
       return;
+    }
+    if      (!_opt->_biasMount.empty()) {
+      if (_opt->_biasMount != phaseBiases[0]._staID) {
+        return;
+      }
+    }
+    else if (!_opt->_corrMount.empty()) {
+      if (_opt->_corrMount != phaseBiases[0]._staID) {
+        return;
+      }
     }
   }
@@ -563 +598 @@
   if (!_opt->_corrFile.empty()) {
     _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
+    connect(_corrFile, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
+    connect(_corrFile, SIGNAL(newClkCorrections(QList<t_clkCorr>)), this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
+    if (_opt->_biasFile.empty()) {
+      connect(_corrFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
+      connect(_corrFile, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)), this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)));
+    }
     if (_opt->_ionoFile.empty()) {
       connect(_corrFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec)));
     }
-    connect(_corrFile, SIGNAL(newOrbCorrections(QList<t_orbCorr>)), this, SLOT(slotNewOrbCorrections(QList<t_orbCorr>)));
-    connect(_corrFile, SIGNAL(newClkCorrections(QList<t_clkCorr>)), this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)));
-    connect(_corrFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
-    connect(_corrFile, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)), this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)));
+  }
+
+  if (!_opt->_biasFile.empty()) {
+    _biasFile = new t_corrFile(QString(_opt->_biasFile.c_str()));
+    connect(_biasFile, SIGNAL(newCodeBiases(QList<t_satCodeBias>)), this, SLOT(slotNewCodeBiases(QList<t_satCodeBias>)));
+    connect(_biasFile, SIGNAL(newPhaseBiases(QList<t_satPhaseBias>)), this, SLOT(slotNewPhaseBiases(QList<t_satPhaseBias>)));
   }
 
@@ -591 +634 @@
     // Get Corrections
     // ---------------
-    if (_corrFile) {
-      try {
-        _corrFile->syncRead(epo->tt);
-      }
-      catch (const char* msg) {
-        emit newMessage(QByteArray(msg), true);
-        break;
-      }
-      catch (const string& msg) {
-        emit newMessage(QByteArray(msg.c_str()), true);
-        break;
-      }
-      catch (...) {
-        emit newMessage("unknown exceptions in corrFile", true);
-        break;
-      }
-    }
-
-    // Get Additional VTEC Informations
-    // --------------------------------
-    if (_ionoFile) {
-      try {
-        _ionoFile->syncRead(epo->tt);
-      }
-      catch (const char* msg) {
-        emit newMessage(QByteArray(msg), true);
-        break;
-      }
-      catch (const string& msg) {
-        emit newMessage(QByteArray(msg.c_str()), true);
-        break;
-      }
-      catch (...) {
-        emit newMessage("unknown exceptions in ionoFile", true);
-        break;
+    for (t_corrFile* file : {_corrFile, _biasFile, _ionoFile}) {
+      if (file) {
+        try {
+          file->syncRead(epo->tt);
+        }
+        catch (const char* msg) {
+          emit newMessage(QByteArray(msg), true);
+          break;
+        }
+        catch (const string& msg) {
+          emit newMessage(QByteArray(msg.c_str()), true);
+          break;
+        }
+        catch (...) {
+          emit newMessage("unknown exceptions in file " + file->name().toLatin1(), true);
+          break;
+        }
       }
     }