Changeset 5378 in ntrip


Ignore:
Timestamp:
Aug 30, 2013, 5:14:22 PM (8 years ago)
Author:
mervart
Message:
 
File:
1 edited

Legend:

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

    r5072 r5378  
    4444#include "bncsettings.h"
    4545#include "bncutils.h"
     46#include "rnxobsfile.h"
     47#include "rnxnavfile.h"
    4648
    4749using namespace std;
    48 
    49 const double rnxV2 = 2.11;
    50 const double rnxV3 = 3.01;
    5150
    5251// Constructor
     
    6564  int version     = settings.value("reqcRnxVersion").toInt();
    6665  if (version < 3) {
    67     _rnxVersion = rnxV2;
     66    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion2;
    6867  }
    6968  else {
    70     _rnxVersion = rnxV3;
     69    _rnxVersion = t_rnxObsHeader::defaultRnxObsVersion3;
    7170  }
    7271  _samplingRate   = settings.value("reqcSampling").toInt();
     
    424423  outNavFile.setGlonass(haveGlonass);
    425424
    426   if (haveGPS && haveGlonass) {
    427     outNavFile.setVersion(rnxV3);
     425  if ( (haveGPS && haveGlonass) || _rnxVersion >= 3.0) {
     426    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion3);
    428427  }
    429428  else {
    430     outNavFile.setVersion(_rnxVersion);
     429    outNavFile.setVersion(t_rnxNavFile::defaultRnxNavVersion2);
    431430  }
    432431
Note: See TracChangeset for help on using the changeset viewer.