Changeset 8641 in ntrip for branches/BNC_2.12

Timestamp:

Mar 25, 2019, 10:37:46 AM (6 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src

Files:

• bncrinex.cpp (modified) (1 diff)
• rinex/rnxobsfile.cpp (modified) (3 diffs)

branches/BNC_2.12/src/bncrinex.cpp

@@ -170 +170 @@
   }
   if (!sklDir.isEmpty() && sklDir != "none") {
-    QUrl url(sklDir + "/" + _mountPoint.path().mid(1,4).toLower() + ".skl");
+    QString mtp;
+    if (_rnxV3) {
+      mtp = _mountPoint.path().mid(1,9).toUpper() + ".skl";
+    }
+    else {
+      mtp = _mountPoint.path().mid(1,4).toLower() + ".skl";
+    }
+    QUrl url(sklDir + "/" + mtp);
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {

branches/BNC_2.12/src/rinex/rnxobsfile.cpp

@@ -96 +96 @@
     }
     else if (key == "MARKER NAME") {
-      _markerName = value;
+      if (_version < 3.0) {
+        _markerName = line.mid(0,4).trimmed();
+      }
+      else {
+        _markerName = line.mid(0,9).trimmed();
+      }
     }
     else if (key == "MARKER TYPE") {
@@ -525 +530 @@
         double shift = hlp1.first().toDouble();
         hlp1.removeFirst();
+        QString satStr = hlp1.join(" ");
+        hlp1 = satStr.split(" ");
         QStringList &satList = hlp1;
         QMap<QString, QPair<double, QStringList> >::iterator it = _phaseShifts.find(type);
@@ -903 +910 @@
   QMap<QString, QPair<double, QStringList> >::const_iterator it =  _phaseShifts.begin();
   while (it != _phaseShifts.end()) {
-    strList.append(QString("%1_%2:%3").arg(it.key(), 3).arg(it.value().first, 9, 'f', 3).arg(it.value().second.join("")));
+    strList.append(QString("%1_%2:%3").arg(it.key(), 3).arg(it.value().first, 9, 'f', 3).arg(it.value().second.join(" ")));
     it++;
   }