Changeset 9854 in ntrip for trunk/BNC/src/rinex

Timestamp:

Oct 21, 2022, 2:04:29 PM (2 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (5 diffs)
• reqcedit.cpp (modified) (1 diff)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -98 +98 @@
   delete _logFile; _logFile = 0;
   if (BNC_CORE->mode() != t_bncCore::interactive) {
-    qApp->exit(0);
+    qApp->exit(8);
     msleep(100); //sleep 0.1 sec
   }
@@ -765 +765 @@
         << "Interval           : " << _qcFile._interval << " sec"                  << '\n';
 
-  // Number of systems
-  // -----------------
-  QMap<QChar, QVector<const t_qcSatSum*> > systemMap;
-  QMapIterator<t_prn, t_qcSatSum> itSat(_qcFile._qcSatSum);
-  while (itSat.hasNext()) {
-    itSat.next();
-    const t_prn&      prn      = itSat.key();
-    const t_qcSatSum& qcSatSum = itSat.value();
-    systemMap[prn.system()].push_back(&qcSatSum);
-  }
-  *_log << "Navigation Systems : " << systemMap.size() << "   ";
-
-  QMapIterator<QChar, QVector<const t_qcSatSum*> > itSys(systemMap);
-  while (itSys.hasNext()) {
-    itSys.next();
-    *_log << ' ' << itSys.key();
-  }
-  *_log << '\n';
 
   // Observation types per system
@@ -797 +779 @@
     }
   }
+
+  // Number of analysed systems
+  // --------------------------
+  QMap<QChar, QVector<const t_qcSatSum*> > systemMap;
+  QMapIterator<t_prn, t_qcSatSum> itSat(_qcFile._qcSatSum);
+  while (itSat.hasNext()) {
+    itSat.next();
+    const t_prn&      prn      = itSat.key();
+    const t_qcSatSum& qcSatSum = itSat.value();
+    systemMap[prn.system()].push_back(&qcSatSum);
+  }
+  *_log << "Analysed GNSS      : " << systemMap.size() << "   ";
+  QMapIterator<QChar, QVector<const t_qcSatSum*> > itSys(systemMap);
+  while (itSys.hasNext()) {
+    itSys.next();
+    *_log << ' ' << itSys.key();
+  }
+  *_log << '\n';
+
 
   // System specific summary
@@ -1013 +1014 @@
                                        << numUnhealthy << " UNHEALTHY   "
                                        << numBad       << " WRONG\n";
-    }
-    if (numBad > 0 || numUnhealthy > 0) {
-      for (unsigned ii = 0; ii < rnxNavFile.ephs().size(); ii++) {
-        t_eph* eph = rnxNavFile.ephs()[ii];
-        QFileInfo navFi(fileName);
-        if (_log) {
-#ifdef BNC_DEBUG_BCEP
-          if (eph->checkState() == t_eph::unhealthy) {
-            *_log  << "                     "
-                << navFi.fileName() << ' ' << QString(": UNHEALTHY %2:%3\n")
-                           .arg(eph->navTypeString(eph->navType(), eph->prn(), 99.0))
-                           .arg(eph->rinexDateStr(eph->TOC(), eph->prn(), 99.0)).toLatin1();
-          }
-#endif
+      if (numBad > 0) {
+        for (unsigned ii = 0; ii < rnxNavFile.ephs().size(); ii++) {
+          t_eph* eph = rnxNavFile.ephs()[ii];
+          QFileInfo navFi(fileName);
           if (eph->checkState() == t_eph::bad) {
             *_log  << "                     "
@@ -1035 +1026 @@
         }
       }
-    }
-  }
-  if (_log) {
-    *_log << '\n';
+      *_log << '\n';
+    }
   }
 }

trunk/BNC/src/rinex/reqcedit.cpp

@@ -152 +152 @@
   // -------------
   if (BNC_CORE->mode() != t_bncCore::interactive) {
-    qApp->exit(0);
+    qApp->exit(9);
     msleep(100); //sleep 0.1 sec
   }