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

Timestamp:

Jun 1, 2015, 12:38:27 PM (9 years ago)

Author:

stuerze

Message:

minor changes to prevent crash, if no logfile is specified for qc

File:

• trunk/BNC/src/rinex/reqcanalyze.cpp (modified) (6 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -111 +111 @@
   // Open Log File
   // -------------
-  _logFile = new QFile(_logFileName);
-  if (_logFile->open(QIODevice::WriteOnly | QIODevice::Text)) {
-    _log = new QTextStream();
-    _log->setDevice(_logFile);
-  }
-  *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1)  << endl << endl;
+  if (!_logFileName.isEmpty()) {
+    _logFile = new QFile(_logFileName);
+    if (_logFile->open(QIODevice::WriteOnly | QIODevice::Text)) {
+      _log = new QTextStream();
+      _log->setDevice(_logFile);
+    }
+  }
+
+  if (_log) {
+    *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1)  << endl << endl;
+  }
 
   // Check Ephemerides
@@ -816 +821 @@
     systemMap[prn.system()].push_back(&qcSatSum);
   }
-
   *_log << "Navigation Systems: " << systemMap.size() << "   ";
+
   QMapIterator<QChar, QVector<const t_qcSatSum*> > itSys(systemMap);
   while (itSys.hasNext()) {
@@ -845 +850 @@
           << prefixSys << "Satellites: " << qcSatVec.size() << endl
           << prefixSys << "Signals   : " << frqMap.size() << "   ";
-    QMapIterator<QString, QVector<const t_qcFrqSum*> > itFrq(frqMap); 
+    QMapIterator<QString, QVector<const t_qcFrqSum*> > itFrq(frqMap);
     while (itFrq.hasNext()) {
       itFrq.next();
@@ -996 +1001 @@
     }
   }
-
-  *_log << "Navigation File(s): " << navFileName                                   << endl;
-
+  if (_log) {
+    *_log << "Navigation File(s): " << navFileName                                   << endl;
+  }
   QStringListIterator it(_navFileNames);
   while (it.hasNext()) {
@@ -1016 +1021 @@
       }
     }
-    *_log << "Ephemeris         : " << numOK << " OK   " << numBad << " BAD" << endl;
+    if (_log) {
+      *_log << "Ephemeris         : " << numOK << " OK   " << numBad << " BAD" << endl;
+    }
     if (numBad > 0) {
       for (unsigned ii = 0; ii < rnxNavFile.ephs().size(); ii++) {
@@ -1022 +1029 @@
         if (eph->checkState() == t_eph::bad) {
           QFileInfo navFi(fileName);
-          *_log << "  Bad Ephemeris   : " << navFi.fileName() << ' '
-                << eph->toString(3.0).left(24) << endl;
-        }
-      }
-    }
-  }
-
-  *_log << endl;
-}
+          if (_log) {
+            *_log << "  Bad Ephemeris   : " << navFi.fileName() << ' '
+                  << eph->toString(3.0).left(24) << endl;
+          }
+        }
+      }
+    }
+  }
+  if (_log) {
+    *_log << endl;
+  }
+}