Changeset 8320 in ntrip for trunk/BNC

Timestamp:

Mar 29, 2018, 12:42:32 PM (7 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncoutf.cpp (modified) (1 diff)
• pppRun.cpp (modified) (7 diffs)

trunk/BNC/src/bncoutf.cpp

@@ -152 +152 @@
   baseName.replace("${GPSWD}", gpswd);
   baseName.replace("${V3}" , QString("_U_%1%2").arg(yyyy).arg(doy));
-
+  if (_extension.count(".") == 2) {_extension.replace(0,1,"_"); }
+  
   return _path + baseName + epoStr + _extension;
 }

trunk/BNC/src/pppRun.cpp

@@ -122 +122 @@
     connect(BNC_CMB, SIGNAL(newClkCorrections(QList<t_clkCorr>)),
             this, SLOT(slotNewClkCorrections(QList<t_clkCorr>)),conType);
-            
+
     connect(BNC_CORE, SIGNAL(providerIDChanged(QString)),
             this, SLOT(slotProviderIDChanged(QString)));
@@ -140 +140 @@
   _stopFlag = false;
 
-  QString roverName(_opt->_roverName.c_str()), fullRoverName("");
+  QString roverName(_opt->_roverName.c_str()), ID9("");
   QString country;
   QString monNum = "0";
@@ -146 +146 @@
   QString intr = "1 day";
   int     sampl  = 0;
+  QString distStr;
+  int num = 0;
+  int statIDlength = roverName.size() -1;
+  QString ID4 = roverName.left(4);
+  ID4 = ID4.toUpper();
   QListIterator<QString> it(settings.value("mountPoints").toStringList());
   while (it.hasNext()) {
-    QStringList hlp = it.next().split(" ");
+    QString mp = it.next();
+    if (mp.indexOf(roverName.left(statIDlength)) != -1) {
+      ++num;
+    }
+    QStringList hlp = mp.split(" ");
     if (hlp.size() < 7)
       continue;
@@ -155 +164 @@
     }
   }
-  fullRoverName = roverName.left(4) +
-                  QString("%1").arg(monNum, 1, 10) +
-                  QString("%1").arg(recNum, 1, 10) +
-                  country;
+
+  if (num > 1) {
+    distStr = "." + roverName.right(1);
+  }
+
+  ID9 = ID4 +
+        QString("%1").arg(monNum, 1, 10) +
+        QString("%1").arg(recNum, 1, 10) +
+        country;
 
   bool v3filenames = settings.value("PPP/v3filenames").toBool();
@@ -171 +185 @@
     }
     if (v3filenames) {
-      logFileSkl = logFileSkl + fullRoverName + "${V3}" + ".ppp";
+      logFileSkl = logFileSkl + ID9 + "${V3}" + distStr + ".ppp";
     }
     else {
-      logFileSkl = logFileSkl + roverName.left(4) + "${GPSWD}" + ".ppp";
+      logFileSkl = logFileSkl + ID4 + "${GPSWD}" + distStr + ".ppp";
     }
     _logFile = new bncoutf(logFileSkl, intr, sampl);
@@ -189 +203 @@
     }
     if (v3filenames) {
-      nmeaFileSkl = nmeaFileSkl + fullRoverName + "${V3}" + ".nmea";
+      nmeaFileSkl = nmeaFileSkl + ID9 + "${V3}" + distStr + ".nmea";
     }
     else {
-      nmeaFileSkl = nmeaFileSkl + roverName.left(4) + "${GPSWD}" + ".nmea";
+      nmeaFileSkl = nmeaFileSkl + ID4 + "${GPSWD}" + distStr + ".nmea";
     }
     _nmeaFile = new bncoutf(nmeaFileSkl, intr, sampl);
   }
-
   QString snxtroFileSkl = settings.value("PPP/snxtroPath").toString();
   l = snxtroFileSkl.length();
@@ -207 +220 @@
     }
     if (v3filenames) {
-      snxtroFileSkl = snxtroFileSkl + fullRoverName + "${V3}" + ".tra";
+      snxtroFileSkl = snxtroFileSkl + ID9 + "${V3}" + distStr + ".tra";
     }
     else {
-      snxtroFileSkl = snxtroFileSkl + roverName.left(4) + "${GPSWD}" + ".tro";
+      snxtroFileSkl = snxtroFileSkl + ID4 + "${GPSWD}" + distStr + ".tro";
     }
     sampl = settings.value("PPP/snxtroSampl").toInt();