Changeset 6130 in ntrip for trunk/BNC/src/rinex/rnxobsfile.cpp

Timestamp:

Sep 11, 2014, 7:06:45 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/rnxobsfile.cpp (modified) (3 diffs)

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -342 +342 @@
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+char t_rnxObsHeader::system(int iSys) const {
+  int iSysLocal = -1;
+  QMapIterator<char, QVector<QString> > it(_obsTypes);
+  while (it.hasNext()) {
+    ++iSysLocal;
+    it.next();
+    if (iSysLocal == iSys) {
+      return it.key();
+    }
+  }
+  return ' ';
+}
+
 // Number of Observation Types (satellite-system specific)
 ////////////////////////////////////////////////////////////////////////////
@@ -1021 +1036 @@
 }
 
-// Check for Changes in Header
-////////////////////////////////////////////////////////////////////////////
-void t_rnxObsFile::checkNewHeader(const t_rnxObsHeader& header) {
-
-  t_rnxObsHeader oldHeader(_header);
-  setHeader(header, oldHeader._version, QStringList());
-
-  // Check Observation Types
-  // -----------------------
-  bool same = true;
-  QMapIterator<char, QVector<QString> > it(_header._obsTypes);
-  while (it.hasNext()) {
-    it.next();
-    char                    sys   = it.key();
-    const QVector<QString>& types = it.value();
-    if (!oldHeader._obsTypes.contains(sys) || oldHeader._obsTypes[sys] != types) {
-      same = false;
-      break;
-    }
-  }
-
-  if (!same) {
-    QStringList strLst = _header.obsTypesStrings();
-    if (_header._version < 3.0) {
-      *_stream << QString().leftJustified(26);
-    }
-    else {
-      *_stream << '>' << QString().leftJustified(28);
-    }
-    *_stream << QString("  4%1\n").arg(strLst.size(), 3)
-             << strLst.join("");
-  }
-}
-
 // Set Observations from RINEX File
 ////////////////////////////////////////////////////////////////////////////
@@ -1062 +1043 @@
                                  t_obs& obs) {
 
-  strncpy(obs.StatID, rnxObsFile->markerName().toAscii().constData(),
-          sizeof(obs.StatID));
+  strncpy(obs.StatID, rnxObsFile->markerName().toAscii().constData(), sizeof(obs.StatID));
 
   obs.satSys   = rnxSat.prn.system();