Changeset 5375 in ntrip


Ignore:
Timestamp:
Aug 30, 2013, 4:53:06 PM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/RTCM/GPSDecoder.cpp

    r5374 r5375  
    189189    }
    190190    else if (rnxStr[2] == 'X') {
    191       if (satSys == 'C') {
     191      if (satSys == 'C' || satSys == 'E') {
    192192        res += GNSSENTRY_TYPEC1;
    193193      }
     
    210210      res += GNSSENTRY_TYPEC2;
    211211    }
    212     else if (QString("IQ").indexOf(rnxStr[2]) != -1) {
     212    else if (rnxStr[2] == 'I') {
     213      if (satSys == 'C') {
     214        res += GNSSENTRY_TYPEC1;  // Compass: RINEX 3.01 "2I" corresponds to "1I" RINEX 3.02
     215      }
     216      else {
     217        res += GNSSENTRY_TYPEC2;
     218      }
     219    }
     220    else if (rnxStr[2] == 'Q') {
    213221      res += GNSSENTRY_TYPEC2;
    214222    }
  • trunk/BNC/src/bnccore.cpp

    r5312 r5375  
    4949#include "bncversion.h"
    5050#include "RTCM3/ephemeris.h"
     51#include "rinex/rnxobsfile.h"
     52#include "rinex/rnxnavfile.h"
    5153
    5254#ifdef USE_COMBINATION
     
    464466      if (! (appendFlagGPS & QIODevice::Append)) {
    465467        QString line;
    466         line.sprintf(
    467           "%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n", 2.10, "", "");
     468        line.sprintf("%9.2f%11sN: GPS NAV DATA%25sRINEX VERSION / TYPE\n",
     469                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
    468470        *_ephStreamGPS << line;
    469471         
     
    481483      if (! (appendFlagGlonass & QIODevice::Append)) {
    482484        QString line;
    483         line.sprintf(
    484           "%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",2.10,"","");
     485        line.sprintf("%9.2f%11sG: GLONASS NAV DATA%21sRINEX VERSION / TYPE\n",
     486                     t_rnxNavFile::defaultRnxNavVersion2, "", "");
    485487        *_ephStreamGlonass << line;
    486488       
     
    507509  eph.set(ep);
    508510
    509   QString strV2 = eph.toString(2.11);
    510   QString strV3 = eph.toString(3.01);
     511  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
     512  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
    511513
    512514  printOutput(printFile, _ephStreamGPS, strV2, strV3);
     
    515517// Print One Glonass Ephemeris
    516518////////////////////////////////////////////////////////////////////////////
    517 void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& staID) {
     519void t_bncCore::printGlonassEph(glonassephemeris* ep, bool printFile, const QString& /* staID */) {
    518520
    519521  t_ephGlo eph;
    520522  eph.set(ep);
    521523
    522   QString strV2 = eph.toString(2.11);
    523   QString strV3 = eph.toString(3.01);
     524  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
     525  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
    524526
    525527  //// beg test Dirk
     
    538540  eph.set(ep);
    539541
    540   QString strV2 = eph.toString(2.11);
    541   QString strV3 = eph.toString(3.01);
     542  QString strV2 = eph.toString(t_rnxNavFile::defaultRnxNavVersion2);
     543  QString strV3 = eph.toString(t_rnxObsHeader::defaultRnxObsVersion3);
    542544
    543545  printOutput(printFile, _ephStreamGalileo, strV2, strV3);
  • trunk/BNC/src/rinex/rnxnavfile.h

    r4229 r5375  
    3939 public:
    4040  enum e_inpOut {input, output};
     41  static const double defaultRnxNavVersion2 = 2.11;
     42  static const double defaultRnxNavVersion3 = 3.01;
    4143
    4244 private:
  • trunk/BNC/src/rinex/rnxobsfile.h

    r4540 r5375  
    4040class t_rnxObsHeader {
    4141 public:
     42  static const double defaultRnxObsVersion2 = 2.11;
     43  static const double defaultRnxObsVersion3 = 3.02;
     44
    4245  t_rnxObsHeader();
    4346  ~t_rnxObsHeader();
Note: See TracChangeset for help on using the changeset viewer.