Changeset 6192 in ntrip for trunk

Timestamp:

Sep 14, 2014, 4:55:51 PM (10 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bncrinex.cpp (modified) (2 diffs)
• rinex/rnxobsfile.cpp (modified) (3 diffs)
• rinex/rnxobsfile.h (modified) (1 diff)

trunk/BNC/src/bncrinex.cpp

@@ -605 +605 @@
     double  obsValue = 0.0;
     char    lli      = ' ';
-    QString rnxType = t_rnxObsFile::type2to3(types[ii]);
+    QString rnxType = t_rnxObsFile::type2to3(sys, types[ii]);
     for (unsigned iFrq = 0; iFrq < obs._obs.size(); iFrq++) {
       const t_frqObs* frqObs = obs._obs[iFrq];
@@ -611 +611 @@
         QChar ch = obsKinds[ik];
         QString obsType = (ch + QString(frqObs->_rnxType2ch.c_str()));
-        obsType = t_rnxObsFile::type2to3(obsType).left(rnxType.length());
+        obsType = t_rnxObsFile::type2to3(sys, obsType).left(rnxType.length());
         if (rnxType == obsType) {
           if      (ch == 'L' && frqObs->_phaseValid) {

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -381 +381 @@
     }
     else if (int(version) == 2) {
-      return t_rnxObsFile::type3to2(origType);
+      return t_rnxObsFile::type3to2(sys, origType);
     }
     else if (int(version) == 3) {
-      return t_rnxObsFile::type2to3(origType);
+      return t_rnxObsFile::type2to3(sys, origType);
     }
   }
@@ -951 +951 @@
 // Translate Observation Type v2 --> v3
 ////////////////////////////////////////////////////////////////////////////
-QString t_rnxObsFile::type2to3(const QString& typeV2) {
+QString t_rnxObsFile::type2to3(char /* sys */, const QString& typeV2) {
   if      (typeV2 == "P1") {
     return "C1P";
@@ -963 +963 @@
 // Translate Observation Type v3 --> v2
 ////////////////////////////////////////////////////////////////////////////
-QString t_rnxObsFile::type3to2(const QString& typeV3) {
+QString t_rnxObsFile::type3to2(char /* sys */, const QString& typeV3) {
   if      (typeV3 == "C1P") {
     return "P1";

trunk/BNC/src/rinex/rnxobsfile.h

@@ -165 +165 @@
                             t_satObs& obs);
 
-  static QString type2to3(const QString& typeV2);
-  static QString type3to2(const QString& typeV3);
+  static QString type2to3(char sys, const QString& typeV2);
+  static QString type3to2(char sys, const QString& typeV3);
 
  private: