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

Timestamp:

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

Author:

stuerze

Message:

some changes regarding PPP

File:

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

trunk/BNC/src/bncoutf.cpp

@@ -48 +48 @@
 
   _append = Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked;
-  _v2filenames = settings.value("PPP/v2filenames").toBool();
 }
 
@@ -84 +83 @@
   if ( indHlp != -1) {
     int step = intStr.left(indHlp-1).toInt();
-    if (!_v2filenames) {
-      epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
-    } else {
-      epoStr +=  'A' + datTim.time().hour();
-    }
+    epoStr +=  QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0')); // H
 
     if (datTim.time().minute() >= 60-step) {
@@ -101 +96 @@
       }
     }
-
-    if (!_v2filenames) {
-      epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
-    }
+    epoStr += QString("_%1M").arg(step, 2, 10, QChar('0'));                // period
 
     _numSec = 60 * step;
@@ -110 +102 @@
   else if (intStr == "1 hour") {
     int step = intStr.left(indHlp-1).toInt();
-    if (!_v2filenames) {
-      epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
-      epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
-      epoStr += QString("_%1H").arg(step+1, 2, 10, QChar('0'));              // period
-    } else {
-      epoStr +=  'A' + datTim.time().hour();
-    }
+    epoStr += QString("%1").arg(datTim.time().hour(), 2, 10, QChar('0'));  // H
+    epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                     // M
+    epoStr += QString("_%1H").arg(step+1, 2, 10, QChar('0'));              // period
     _numSec = 3600;
   }
   else {
     int step = intStr.left(indHlp-1).toInt();
-    if (!_v2filenames) {
-      epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
-      epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
-      epoStr += QString("_%1D").arg(step+1, 2, 10, QChar('0'));             // period
-    }
+    epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // H
+    epoStr += QString("%1").arg(0, 2, 10, QChar('0'));                    // M
+    epoStr += QString("_%1D").arg(step+1, 2, 10, QChar('0'));             // period
     _numSec = 86400;
   }
 
-  if (!_v2filenames) {
-    if (sampl < 60) {
-      epoStr += QString("_%1S").arg(sampl, 2, 10, QChar('0'));
-    }
-    else {
-      sampl /= 60;
-      epoStr += QString("_%1M").arg(sampl, 2, 10, QChar('0'));
-    }
+
+  if (sampl < 60) {
+    epoStr += QString("_%1S").arg(sampl, 2, 10, QChar('0'));
+  }
+  else {
+    sampl /= 60;
+    epoStr += QString("_%1M").arg(sampl, 2, 10, QChar('0'));
   }