Changeset 8659 in ntrip for trunk/BNC

Timestamp:

Apr 4, 2019, 10:08:16 AM (6 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src

Files:

• bncephuser.cpp (modified) (3 diffs)
• bncrinex.cpp (modified) (2 diffs)
• rinex/rnxobsfile.cpp (modified) (2 diffs)

trunk/BNC/src/bncephuser.cpp

@@ -152 +152 @@
 
   const t_eph* ephOld = ephLast(prn);
+
+  if (ephOld &&
+      (ephOld->checkState() == t_eph::bad ||
+       ephOld->checkState() == t_eph::outdated)) {
+    ephOld = 0;
+  }
 
   if ((ephOld == 0 || newEph->isNewerThan(ephOld)) &&
@@ -220 +226 @@
       return;
     }
-    else if (eph->type() == t_eph::GLONASS && timeDiff > 1 * 3600) { // updated every 30 minutes
+    else if (eph->type() == t_eph::GLONASS && timeDiff > 2 * 3600) { // updated every 30 minutes
       eph->setCheckState(t_eph::outdated);
       return;
@@ -266 +272 @@
       return;
     }
-    else if (eph->type() == t_eph::GLONASS && dt > 1*3600) {
+    else if (eph->type() == t_eph::GLONASS && dt > 2*3600) {
       ephL->setCheckState(t_eph::outdated);
       return;

trunk/BNC/src/bncrinex.cpp

@@ -170 +170 @@
   }
   if (!sklDir.isEmpty() && sklDir != "none") {
-    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);
+    QString staID;
+    int stIdLength = _mountPoint.path().length()-2;
+    staID = _mountPoint.path().mid(1,stIdLength).toUpper() + ".skl";
+    QUrl url(sklDir  + staID);
     if (url.port() == -1) {
       if (sklDir.contains("https", Qt::CaseInsensitive)) {
@@ -335 +331 @@
 
   int statIDlength = _statID.size() -1;
-  QString ID;
-  if (_rnxV3) {
-    ID = _statID.left(9);
-  }
-  else {
-    ID = _statID.left(4);
-  }
+  QString ID = _statID.left(statIDlength);
   ID = ID.toUpper();
 

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -96 +96 @@
     }
     else if (key == "MARKER NAME") {
-      if (_version < 3.0) {
-        _markerName = line.mid(0,4).trimmed();
-      }
-      else {
-        _markerName = line.mid(0,9).trimmed();
-      }
+      _markerName = value;
     }
     else if (key == "MARKER TYPE") {
@@ -613 +608 @@
     *stream << itCmnt.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
   }
-
+  QString markerName = _markerName.left(9);
+  if (_version < 3.0) {
+    markerName = _markerName.left(4);
+  }
   *stream << QString("%1")
-    .arg(_markerName, -60)
+    .arg(markerName, -60)
     .leftJustified(60)
            << "MARKER NAME\n";
+
 
   if (!_markerNumber.isEmpty()) {