Changeset 6121 in ntrip for trunk/BNC/src

Timestamp:

Sep 11, 2014, 2:22:25 PM (10 years ago)

Author:

mervart

Message:

 

File:

• trunk/BNC/src/rinex/reqcedit.cpp (modified) (2 diffs)

trunk/BNC/src/rinex/reqcedit.cpp

@@ -331 +331 @@
   for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) {
     const t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iSat];
-    char                          sys    = rnxSat.satSys;
-    QString prn = QString("%1%2").arg(sys).arg(rnxSat.satNum,2,10,QChar('0'));
+    char    sys = rnxSat.prn.system();
+    QString prn(rnxSat.prn.toString().c_str());
 
     for (int iType = 0; iType < obsFile->nTypes(sys); iType++) {
+      QString type = obsFile->obsType(sys, iType);
       if (!_lli[prn].contains(iType)) {
         _lli[prn][iType] = 0;
       }
-      if (rnxSat.lli[iType] & 1) {
+      if (rnxSat.obs.contains(type) && rnxSat.obs[type].lli & 1) {
         _lli[prn][iType] |= 1;
       }
@@ -356 +357 @@
   for (unsigned iSat = 0; iSat < epo->rnxSat.size(); iSat++) {
     t_rnxObsFile::t_rnxSat& rnxSat = epo->rnxSat[iSat];
-    char                    sys    = rnxSat.satSys;
-    QString prn = QString("%1%2").arg(sys).arg(rnxSat.satNum,2,10,QChar('0'));
+    char    sys = rnxSat.prn.system();
+    QString prn(rnxSat.prn.toString().c_str());
 
     for (int iType = 0; iType < obsFile->nTypes(sys); iType++) {
+      QString type = obsFile->obsType(sys, iType);
       if (_lli[prn].contains(iType) && _lli[prn][iType] & 1) {
-         rnxSat.lli[iType] |= 1;
+        if (rnxSat.obs.contains(type)) {
+          rnxSat.obs[type].lli |= 1;
+        }
       }
     }