Changeset 8802 in ntrip

Timestamp:

Sep 20, 2019, 2:50:50 PM (5 years ago)

Author:

stuerze

Message:

minor changes

Location:

branches/BNC_2.12/src/rinex

Files:

• reqcedit.cpp (modified) (1 diff)
• rnxobsfile.cpp (modified) (1 diff)
• rnxobsfile.h (modified) (3 diffs)

branches/BNC_2.12/src/rinex/reqcedit.cpp

@@ -521 +521 @@
     }
   }
+  // TODO: enable user decision 
   qStableSort(ephs.begin(), ephs.end(), t_eph::earlierTime);
+  //qStableSort(ephs.begin(), ephs.end(), t_eph::prnSort); 
 }
 

branches/BNC_2.12/src/rinex/rnxobsfile.cpp

@@ -1315 +1315 @@
     const t_rnxSat& rnxSat = epo->rnxSat[ii];
     if (_header._obsTypes[rnxSat.prn.system()].size() > 0) {
+      if (_header.version() < 3.0) { // exclude new GNSS such as BDS, QZSS, IRNSS, etc.
+          if (rnxSat.prn.system() != 'G' && rnxSat.prn.system() != 'R' &&
+              rnxSat.prn.system() != 'E' && rnxSat.prn.system() != 'S' &&
+              rnxSat.prn.system() != 'I') {
+            continue;
+          }
+      }
       epoLocal.rnxSat.push_back(rnxSat);
     }
   }
-
+  std::stable_sort(epoLocal.rnxSat.begin(), epoLocal.rnxSat.end(), t_rnxSat::prnSort);
+  
   if (version() < 3.0) {
     return writeEpochV2(_stream, _header, &epoLocal);

branches/BNC_2.12/src/rinex/rnxobsfile.h

@@ -123 +123 @@
     t_prn                   prn;
     QMap<QString, t_rnxObs> obs;
+    static bool prnSort(const t_rnxSat rnxSat1, const t_rnxSat rnxSat2) {return rnxSat1.prn < rnxSat2.prn;}    
   };
 
@@ -220 +221 @@
         if (header.version() < 3.0) { // exclude new GNSS such as BDS, QZSS, IRNSS, etc.
             if (rnxSat.prn.system() != 'G' && rnxSat.prn.system() != 'R' &&
-                rnxSat.prn.system() != 'E' && rnxSat.prn.system() != 'S') {
+                rnxSat.prn.system() != 'E' && rnxSat.prn.system() != 'S' &&
+                rnxSat.prn.system() != 'I') {
               continue;
             }
@@ -227 +229 @@
       }
     }
+    std::stable_sort(epoLocal.rnxSat.begin(), epoLocal.rnxSat.end(), t_rnxSat::prnSort);    
+    
     if (header.version() >= 3.0) {
       writeEpochV3(stream, header, &epoLocal);