Changeset 8000 in ntrip for branches

Timestamp:

Aug 8, 2016, 5:11:40 PM (8 years ago)

Author:

stuerze

Message:

some informations about the data source of RINEX navigation files is added into the RINEX header

Location:

branches/BNC_2.12/src

Files:

• bnccore.cpp (modified) (4 diffs)
• rinex/reqcedit.cpp (modified) (3 diffs)
• rinex/rnxnavfile.cpp (modified) (1 diff)
• rinex/rnxnavfile.h (modified) (2 diffs)

branches/BNC_2.12/src/bnccore.cpp

@@ -259 +259 @@
 
   bncSettings settings;
+    QStringList comments;
+
+  QListIterator<QString> it(settings.value("mountPoints").toStringList());
+  while (it.hasNext()) {
+    QStringList hlp = it.next().split(" ");
+    if (hlp.size() < 7)
+      continue;
+    QUrl url(hlp[0]);
+    QString decoder = hlp[1];
+    comments.append("Source: " + decoder +
+                    " " + url.encodedHost() +
+                    "/" + url.path().mid(1).toAscii());
+  }
 
   // Initialization
@@ -384 +397 @@
                        << "PGM / RUN BY / DATE" << endl;
 
+        QStringListIterator it(comments);
+        while (it.hasNext()) {
+          *_ephStreamGPS << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
+        }
+        
         line.sprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
@@ -406 +424 @@
                        << "PGM / RUN BY / DATE" << endl;
 
+        QStringListIterator it(comments);
+        while (it.hasNext()) {
+          *_ephStreamGPS << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
+        }
+        
         line.sprintf("%60sEND OF HEADER\n", "");
         *_ephStreamGPS << line;
@@ -422 +445 @@
                            << hlp.toAscii().data()
                            << "PGM / RUN BY / DATE" << endl;
+
+        QStringListIterator it(comments);
+        while (it.hasNext()) {
+          *_ephStreamGlonass << it.next().trimmed().left(60).leftJustified(60) << "COMMENT\n";
+        }
 
         line.sprintf("%60sEND OF HEADER\n", "");

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

@@ -533 +533 @@
     return;
   }
-
+  
+  // Concatenate all comments
+  // ------------------------
+  QStringList comments;
+  bncSettings settings;
+  QString comment = settings.value("reqcComment").toString();
+  if (!comment.isEmpty()) {
+    comments.append(comment);
+  }
+  QStringListIterator it(_navFileNames);
+  while (it.hasNext()) {
+    QString fileName = it.next();
+    t_rnxNavFile rnxNavFile(fileName, t_rnxNavFile::input);
+    QStringListIterator itCmnt(rnxNavFile.comments());
+    while (itCmnt.hasNext()) {
+      comments.append(itCmnt.next());
+    }
+  }
+  comments.removeDuplicates();
+  
   // Read Ephemerides
   // ----------------
@@ -565 +584 @@
   }
 
-  bncSettings settings;
   QMap<QString, QString> txtMap;
   QString runBy = settings.value("reqcRunBy").toString();
@@ -571 +589 @@
     txtMap["RUN BY"]  = runBy;
   }
-  QString comment = settings.value("reqcComment").toString();
-  if (!comment.isEmpty()) {
-    txtMap["COMMENT"]  = comment;
+  if (!comments.isEmpty()) {
+    txtMap["COMMENT"]  = comments.join("\\n");
   }
 

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

@@ -79 +79 @@
         _glonass = true;
       }
+    }
+    else if (key == "COMMENT") {
+      _comments.append(value.trimmed());
     }
   }

branches/BNC_2.12/src/rinex/rnxnavfile.h

@@ -50 +50 @@
     double _version;
     bool   _glonass;
+    QStringList _comments;
   };
  
@@ -60 +61 @@
   void   setVersion(double version) {_header._version = version;}
   bool   glonass() const {return _header._glonass;}
+  QStringList comments() const {return _header._comments;}
   void   setGlonass(bool glo) {_header._glonass = glo;} 
   void   writeHeader(const QMap<QString, QString>* txtMap = 0);