Changeset 6130 in ntrip for trunk

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (3 diffs)
• rnxobsfile.cpp (modified) (3 diffs)
• rnxobsfile.h (modified) (3 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -221 +221 @@
   QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
 
+  // Put together all observation types
+  // ----------------------------------
+  if (_rnxObsFiles.size() > 1 && useObsTypes.size() == 0) {
+    for (int ii = 0; ii < _rnxObsFiles.size(); ii++) {
+      t_rnxObsFile* obsFile = _rnxObsFiles[ii];
+      for (int iSys = 0; iSys < obsFile->numSys(); iSys++) {
+        char sys = obsFile->system(iSys);
+        if (sys != ' ') {
+        }
+      }
+    }
+  }
+
   // Loop over all input observation files
   // -------------------------------------
@@ -251 +264 @@
       outObsFile.header().write(outObsFile.stream(), &txtMap);
     }
-    else {
-      outObsFile.checkNewHeader(obsFile->header());
-    }
     t_rnxObsFile::t_rnxEpo* epo = 0;
     try {
@@ -280 +290 @@
       else {
         qDebug() << str;    
+      }
+      return;
+    }
+    catch (...) {
+      if (_log) {
+        *_log << "Exception unknown" << endl;
+      }
+      else {
+        qDebug() << "Exception unknown";
       }
       return;

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();

trunk/BNC/src/rinex/rnxobsfile.h

@@ -53 +53 @@
   t_irc       read(QTextStream* stream, int maxLines = 0);
   int         numSys() const;
+  char        system(int iSys) const;
   int         nTypes(char sys) const;
   QString     obsType(char sys, int index, double version = 0.0) const;
@@ -122 +123 @@
   double         interval() const {return _header._interval;}
   int            numSys() const {return _header.numSys();}
+  char           system(int iSys) const {return _header.system(iSys);}
   int            nTypes(char sys) const {return _header.nTypes(sys);}
   const QString& fileName() const {return _fileName;}
@@ -154 +156 @@
   const t_rnxObsHeader& header() const {return _header;}
   void setHeader(const t_rnxObsHeader& header, double version, const QStringList& useObsTypes);
-  void checkNewHeader(const t_rnxObsHeader& header);
   void writeEpoch(const t_rnxEpo* epo);