Changeset 6118 in ntrip for trunk/BNC

Timestamp:

Sep 11, 2014, 12:32:27 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

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

trunk/BNC/src/rinex/reqcedit.cpp

@@ -216 +216 @@
   t_rnxObsFile outObsFile(_outObsFileName, t_rnxObsFile::output);
   
+  // Select observation types
+  // ------------------------
+  bncSettings settings;
+  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
+
   // Loop over all input observation files
   // -------------------------------------
@@ -226 +231 @@
     }
     if (ii == 0) {
-      outObsFile.setHeader(obsFile->header(), _rnxVersion);
+      outObsFile.setHeader(obsFile->header(), _rnxVersion, useObsTypes);
       if (_begTime.valid() && _begTime > outObsFile.startTime()) {
         outObsFile.setStartTime(_begTime);

trunk/BNC/src/rinex/rnxobsfile.h

@@ -139 +139 @@
 
   const t_rnxObsHeader& header() const {return _header;}
-  void setHeader(const t_rnxObsHeader& header, double version);
+  void setHeader(const t_rnxObsHeader& header, double version, const QStringList& useObsTypes);
   void checkNewHeader(const t_rnxObsHeader& header);
   void writeEpoch(const t_rnxEpo* epo);
@@ -154 +154 @@
 
  private:
-  enum e_trafo {trafoNone, trafo2to3, trafo3to2};
+  enum e_trafo {trafoNone, trafo2to2, trafo3to3, trafo2to3, trafo3to2};
 
   t_rnxObsFile() {};
@@ -165 +165 @@
   t_rnxEpo* nextEpochV3();
   void handleEpochFlag(int flag, const QString& line, bool& headerReRead);
+  bool useType(const QStringList& useObsTypes, const QString& type);
 
+  QMap<int, int>              _indexMap2to2;
+  QMap<char, QMap<int, int> > _indexMap3to3;
   QMap<char, QMap<int, int> > _indexMap2to3;
   QMap<char, QMap<int, int> > _indexMap3to2;