Changeset 4525 in ntrip for trunk/BNC

Timestamp:

Aug 13, 2012, 1:43:02 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• reqcanalyze.cpp (modified) (1 diff)
• reqcedit.cpp (modified) (4 diffs)
• reqcedit.h (modified) (1 diff)

trunk/BNC/src/rinex/reqcanalyze.cpp

@@ -159 +159 @@
   // Initialize RINEX Observation Files
   // ----------------------------------
-  t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles);
+  t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _log);
 
   // Read Ephemerides

trunk/BNC/src/rinex/reqcedit.cpp

@@ -161 +161 @@
 ////////////////////////////////////////////////////////////////////////////
 void t_reqcEdit::initRnxObsFiles(const QStringList& obsFileNames, 
-                                 QVector<t_rnxObsFile*>& rnxObsFiles) {
+                                 QVector<t_rnxObsFile*>& rnxObsFiles,
+                                 QTextStream* log) {
 
   QStringListIterator it(obsFileNames);
@@ -180 +181 @@
         catch (...) {
           delete rnxObsFile;
-          cerr << "Error in rnxObsFile " << filePath.toAscii().data() << endl;
+          if (log) {
+            *log << "Error in rnxObsFile " << filePath.toAscii().data() << endl;
+          }
         }
       }
@@ -191 +194 @@
       }
       catch (...) {
-        cerr << "Error in rnxObsFile " << fileName.toAscii().data() << endl;
+        if (log) {
+          *log << "Error in rnxObsFile " << fileName.toAscii().data() << endl;
+        }
       }
     }
@@ -209 +214 @@
   }
 
-  t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles);
+  t_reqcEdit::initRnxObsFiles(_obsFileNames, _rnxObsFiles, _log);
 
   // Initialize output observation file

trunk/BNC/src/rinex/reqcedit.h

@@ -48 +48 @@
   virtual void run();
   static void initRnxObsFiles(const QStringList& obsFileNames, 
-                              QVector<t_rnxObsFile*>& rnxObsFiles);
+                              QVector<t_rnxObsFile*>& rnxObsFiles,
+                              QTextStream* log);
   static void readEphemerides(const QStringList& navFileNames,
                               QVector<t_eph*>& ephs);