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

Timestamp:

Jan 13, 2022, 5:05:06 PM (2 years ago)

Author:

stuerze

Message:

additional iono mountpoint added for ppp

File:

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

trunk/BNC/src/pppRun.cpp

@@ -130 +130 @@
     _rnxNavFile = 0;
     _corrFile   = 0;
+    _ionoFile   = 0;
     _speed      = settings.value("PPP/mapSpeedSlider").toInt();
     connect(this, SIGNAL(progressRnxPPP(int)), BNC_CORE, SIGNAL(progressRnxPPP(int)));
@@ -422 +423 @@
 
   if (_opt->_realTime) {
-    if (_opt->_corrMount.empty() || _opt->_corrMount != vTec._staID) {
-      return;
-    }
-  }
-
+    if (_opt->_ionoMount.empty() && _opt->_corrMount.empty()) {
+      return;
+    }
+    if ( _opt->_ionoMount.empty() &&
+        !_opt->_corrMount.empty() && _opt->_corrMount != vTec._staID) {
+      return;
+    }
+    if (!_opt->_ionoMount.empty() && _opt->_ionoMount != vTec._staID) {
+      return;
+    }
+  }
   _pppClient->putTec(&vTec);
 }
@@ -555 +562 @@
   }
 
+  if (!_opt->_ionoFile.empty()) {
+    _ionoFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
+    connect(_ionoFile, SIGNAL(newTec(t_vTec)),
+            this, SLOT(slotNewTec(t_vTec)));
+  }
+
   // Read/Process Observations
   // -------------------------
@@ -583 +596 @@
       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;
       }