Changeset 4137 in ntrip

Timestamp:

May 7, 2012, 4:42:13 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/rinex

Files:

• reqcedit.cpp (modified) (1 diff)
• rnxobsfile.cpp (modified) (2 diffs)
• rnxobsfile.h (modified) (1 diff)

trunk/BNC/rinex/reqcedit.cpp

@@ -158 +158 @@
         txtMap["COMMENT"]  = comment;
       }
-      outObsFile.writeHeader(txtMap);
+      outObsFile.writeHeader(&txtMap);
     }
     else {

trunk/BNC/rinex/rnxobsfile.cpp

@@ -645 +645 @@
 // Write Header
 ////////////////////////////////////////////////////////////////////////////
-void t_rnxObsFile::writeHeader(const QMap<QString, QString>& txtMap) {
+void t_rnxObsFile::writeHeader(const QMap<QString, QString>* txtMap) {
 
   bncApp* app = (bncApp*) qApp;
@@ -652 +652 @@
   QStringList comments;
 
-  QMapIterator<QString, QString> it(txtMap);
-  while (it.hasNext()) {
-    it.next();
-    if      (it.key() == "RUN BY") {
-      runBy = it.value();
-    }
-    else if (it.key() == "COMMENT") {
-      comments = it.value().split("\\n", QString::SkipEmptyParts);
+  if (txtMap) {
+    QMapIterator<QString, QString> it(*txtMap);
+    while (it.hasNext()) {
+      it.next();
+      if      (it.key() == "RUN BY") {
+        runBy = it.value();
+      }
+      else if (it.key() == "COMMENT") {
+        comments = it.value().split("\\n", QString::SkipEmptyParts);
+      }
     }
   }

trunk/BNC/rinex/rnxobsfile.h

@@ -142 +142 @@
   void setHeader(const t_rnxObsHeader& header, double version);
   void checkNewHeader(const t_rnxObsHeader& header);
-  void writeHeader(const QMap<QString, QString>& txtMap = QMap<QString, QString>());
+  void writeHeader(const QMap<QString, QString>* txtMap = 0);
   QStringList obsTypesStrings();
   void writeEpoch(const t_rnxEpo* epo);