Changeset 6118 in ntrip for trunk/BNC


Ignore:
Timestamp:
Sep 11, 2014, 12:32:27 PM (10 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src/rinex
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/rinex/reqcedit.cpp

    r5378 r6118  
    216216  t_rnxObsFile outObsFile(_outObsFileName, t_rnxObsFile::output);
    217217 
     218  // Select observation types
     219  // ------------------------
     220  bncSettings settings;
     221  QStringList useObsTypes = settings.value("reqcUseObsTypes").toString().split(" ", QString::SkipEmptyParts);
     222
    218223  // Loop over all input observation files
    219224  // -------------------------------------
     
    226231    }
    227232    if (ii == 0) {
    228       outObsFile.setHeader(obsFile->header(), _rnxVersion);
     233      outObsFile.setHeader(obsFile->header(), _rnxVersion, useObsTypes);
    229234      if (_begTime.valid() && _begTime > outObsFile.startTime()) {
    230235        outObsFile.setStartTime(_begTime);
  • trunk/BNC/src/rinex/rnxobsfile.h

    r5932 r6118  
    139139
    140140  const t_rnxObsHeader& header() const {return _header;}
    141   void setHeader(const t_rnxObsHeader& header, double version);
     141  void setHeader(const t_rnxObsHeader& header, double version, const QStringList& useObsTypes);
    142142  void checkNewHeader(const t_rnxObsHeader& header);
    143143  void writeEpoch(const t_rnxEpo* epo);
     
    154154
    155155 private:
    156   enum e_trafo {trafoNone, trafo2to3, trafo3to2};
     156  enum e_trafo {trafoNone, trafo2to2, trafo3to3, trafo2to3, trafo3to2};
    157157
    158158  t_rnxObsFile() {};
     
    165165  t_rnxEpo* nextEpochV3();
    166166  void handleEpochFlag(int flag, const QString& line, bool& headerReRead);
     167  bool useType(const QStringList& useObsTypes, const QString& type);
    167168
     169  QMap<int, int>              _indexMap2to2;
     170  QMap<char, QMap<int, int> > _indexMap3to3;
    168171  QMap<char, QMap<int, int> > _indexMap2to3;
    169172  QMap<char, QMap<int, int> > _indexMap3to2;
Note: See TracChangeset for help on using the changeset viewer.