Changeset 8798 in ntrip for trunk/BNC/src

Timestamp:

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

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/rinex

Files:

• reqcedit.cpp (modified) (2 diffs)
• rnxobsfile.cpp (modified) (2 diffs)
• rnxobsfile.h (modified) (4 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -522 +522 @@
     }
   }
+  // TODO: enable user decision 
   qStableSort(ephs.begin(), ephs.end(), t_eph::earlierTime);
+  //qStableSort(ephs.begin(), ephs.end(), t_eph::prnSort); 
 }
 
@@ -653 +655 @@
 void t_reqcEdit::appendEphemerides(const QString& fileName,
                                    QVector<t_eph*>& ephs) {
-
   t_rnxNavFile rnxNavFile(fileName, t_rnxNavFile::input);
   for (unsigned ii = 0; ii < rnxNavFile.ephs().size(); ii++) {

trunk/BNC/src/rinex/rnxobsfile.cpp

@@ -360 +360 @@
                    << "C8Q" << "L8Q" << "S8Q"
                    << "C8X" << "L8X" << "S8X";
-                   
+
     _obsTypes['S'] << "C1C" << "L1C" << "S1C"
                    << "C5I" << "L5I" << "S5I"
@@ -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) {

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);