Changeset 6529 in ntrip for trunk

Timestamp:

Dec 30, 2014, 6:26:22 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (6 diffs)
• reqcanalyze.h (modified) (2 diffs)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -41 +41 @@
 #include <iostream>
 #include <iomanip>
-#include <sstream>
 #include <qwt_plot_renderer.h>
 
@@ -102 +101 @@
 void t_reqcAnalyze::run() {
 
+  static const double QC_FORMAT_VERSION = 1.0;
+
   // Open Log File
   // -------------
@@ -109 +110 @@
     _log->setDevice(_logFile);
   }
+  *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1)  << endl << endl;
 
   // Check Ephemerides
@@ -121 +123 @@
   // ----------------
   t_reqcEdit::readEphemerides(_navFileNames, _ephs);
-
-  QString navFileName;
-  QStringListIterator namIt(_navFileNames);
-  bool firstName = true;
-  while (namIt.hasNext()) {
-    QFileInfo navFi(namIt.next());
-    if (firstName) {
-      firstName = false;
-      navFileName += navFi.fileName();
-    }
-    else {
-      navFileName += ", " + navFi.fileName();
-    }
-  }
-
-  static const double QC_FORMAT_VERSION = 1.0;
-
-  *_log << "QC Format Version : " << QString("%1").arg(QC_FORMAT_VERSION,3,'f',1)  << endl << endl
-        << "Navigation File(s): " << navFileName                                   << endl;
-
-  *_log << _ephMsg.c_str() << endl;
 
   // Loop over all RINEX Files
@@ -1019 +1000 @@
 void t_reqcAnalyze::checkEphemerides() {
 
-  ostringstream out;
+  QString navFileName;
+  QStringListIterator namIt(_navFileNames);
+  bool firstName = true;
+  while (namIt.hasNext()) {
+    QFileInfo navFi(namIt.next());
+    if (firstName) {
+      firstName = false;
+      navFileName += navFi.fileName();
+    }
+    else {
+      navFileName += ", " + navFi.fileName();
+    }
+  }
+
+  *_log << "Navigation File(s): " << navFileName                                   << endl;
 
   QStringListIterator it(_navFileNames);
@@ -1038 +1033 @@
       }
     }
-    out << "Ephemeris         : " << numOK << " OK   " << numBad << " BAD" << endl;
+    *_log << "Ephemeris         : " << numOK << " OK   " << numBad << " BAD" << endl;
     if (numBad > 0) {
       for (unsigned ii = 0; ii < rnxNavFile.ephs().size(); ii++) {
         t_eph* eph = rnxNavFile.ephs()[ii];
         if (eph->checkState() == t_eph::bad) {
-          out << "  Bad Ephemeris   : " << fileName.toAscii().data() << ' '
-              << eph->prn().toString() << ' '
-              << eph->TOC().datestr(' ') << ' '
-              << eph->TOC().timestr(1, ' ') << endl;
-        }
-      }
-    }
-  }
-
-  _ephMsg = out.str();
-}
+          QFileInfo navFi(fileName);
+          *_log << "  Bad Ephemeris   : " << navFi.fileName() << ' '
+                << eph->prn().toString() << ' '
+                << eph->TOC().datestr(' ').c_str() << ' '
+                << eph->TOC().timestr(1, ' ').c_str() << endl;
+        }
+      }
+    }
+  }
+}

trunk/BNC/src/rinex/reqcanalyze.h

@@ -26 +26 @@
 #define REQCANALYZE_H
 
-#include <string>
 #include <QtCore>
 #include "rnxobsfile.h"
@@ -189 +188 @@
   t_rnxObsFile::t_rnxEpo* _currEpo;
   t_qcFile                _qcFile;
-  std::string             _ephMsg;
 };