Changeset 8798 in ntrip for trunk/BNC/src/rinex/rnxobsfile.h

Timestamp:

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

Author:

stuerze

Message:

minor changes

File:

• trunk/BNC/src/rinex/rnxobsfile.h (modified) (4 diffs)

trunk/BNC/src/rinex/rnxobsfile.h

@@ -46 +46 @@
 
  public:
-  static const QString defaultSystems;
 
   t_rnxObsHeader();
@@ -124 +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;}
   };
 
@@ -221 +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;
             }
@@ -228 +229 @@
       }
     }
+    std::stable_sort(epoLocal.rnxSat.begin(), epoLocal.rnxSat.end(), t_rnxSat::prnSort);
+
     if (header.version() >= 3.0) {
       writeEpochV3(stream, header, &epoLocal);