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

Timestamp:

Jun 27, 2022, 5:09:40 PM (22 months ago)

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/pppRun.cpp

@@ -185 +185 @@
         +  country;
   }
-  bool v2filenames = settings.value("PPP/v2filenames").toBool();
   QString logFileSkl = settings.value("PPP/logPath").toString();
   int l = logFileSkl.length();
@@ -195 +194 @@
       logFileSkl += QDir::separator();
     }
-    if (!v2filenames) {
-      logFileSkl = logFileSkl + ID9 + "${V3PROD}" + distStr + ".ppp";
-    }
-    else {
-      logFileSkl = logFileSkl + ID4 + "${GPSWD}" + distStr + ".ppp";
-    }
+
+    logFileSkl = logFileSkl + ID9 + "${V3PROD}" + distStr + ".ppp";
+
     _logFile = new bncoutf(logFileSkl, intr, sampl);
   }
@@ -213 +209 @@
       nmeaFileSkl += QDir::separator();
     }
-    if (!v2filenames) {
-      nmeaFileSkl = nmeaFileSkl + ID9 + "${V3PROD}" + distStr + ".nmea";
-    }
-    else {
-      nmeaFileSkl = nmeaFileSkl + ID4 + "${GPSWD}" + distStr + ".nmea";
-    }
+    nmeaFileSkl = nmeaFileSkl + ID9 + "${V3PROD}" + distStr + ".nmea";
+
     _nmeaFile = new bncoutf(nmeaFileSkl, intr, sampl);
   }
@@ -230 +222 @@
       snxtroFileSkl += QDir::separator();
     }
-    if (!v2filenames) {
-      snxtroFileSkl = snxtroFileSkl + ID9 + "${V3PROD}" + distStr + ".tra";
-    }
-    else {
-      snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro";
-    }
+    snxtroFileSkl = snxtroFileSkl + ID9 + "${V3PROD}" + distStr + ".tra";
     sampl = settings.value("PPP/snxtroSampl").toString().split("sec").first().toInt();
     intr  = settings.value("PPP/snxtroIntr").toString();
@@ -350 +337 @@
     // Process the front epoch
     // -----------------------
-
     if (_opt->_corrWaitTime == 0 ||
         (_epoData.front()->_time - _lastClkCorrTime) < _opt->_corrWaitTime) {
 
-      if (fabs(_epoData.front()->_time - _lastClkCorrTime) > 60.0) {
+      if (_opt->_corrWaitTime != 0 && (fabs(_epoData.front()->_time - _lastClkCorrTime) > 60.0)) {
         delete _epoData.front();
         _epoData.pop_front();
@@ -563 +549 @@
   if (!_opt->_corrFile.empty()) {
     _corrFile = new t_corrFile(QString(_opt->_corrFile.c_str()));
-
     if (_opt->_ionoFile.empty()) {
       connect(_corrFile, SIGNAL(newTec(t_vTec)), this, SLOT(slotNewTec(t_vTec)));