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

Timestamp:

Dec 27, 2014, 3:58:55 PM (9 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src/rinex

Files:

• corrfile.cpp (modified) (4 diffs)
• corrfile.h (modified) (2 diffs)

trunk/BNC/src/rinex/corrfile.cpp

@@ -50 +50 @@
 t_corrFile::t_corrFile(QString fileName) {
   expandEnvVar(fileName);
-  _file   = new QFile(fileName);
-  _file->open(QIODevice::ReadOnly | QIODevice::Text);
-  _stream = new QTextStream();
-  _stream->setDevice(_file);
-  _lastOrbCorr = 0;
-  _lastClkCorr = 0;
+  _stream.open(fileName.toAscii().data());
 }
 
@@ -61 +56 @@
 ////////////////////////////////////////////////////////////////////////////
 t_corrFile::~t_corrFile() {
-  delete _stream;
-  delete _file;
 }
 
@@ -72 +65 @@
   _clkCorr.clear();
 
-  while (!stopRead(tt) && _stream->status() == QTextStream::Ok && !_stream->atEnd()) {
-    QString line = _stream->readLine().trimmed();
-    if (line.isEmpty() || line[0] == '!') {
-      continue;
-    }
-    if      (line[0] == 'O') {
-      delete _lastOrbCorr; _lastOrbCorr = new t_orbCorr(line.toAscii().data());
-    }
-    else if (line[0] == 'C') {
-      delete _lastClkCorr; _lastClkCorr = new t_clkCorr(line.toAscii().data());
-    }
+  while (!stopRead(tt) && _stream.good()) {
     if (stopRead(tt)) {
       break;
@@ -101 +84 @@
 ////////////////////////////////////////////////////////////////////////////
 bool t_corrFile::stopRead(const bncTime& tt) {
-  if (_lastOrbCorr) {
-    if (_lastOrbCorr->_time > tt) {
-      return true;
-    }
-    else {
-      _orbCorr.push_back(*_lastOrbCorr);
-      _corrIODs[QString(_lastOrbCorr->_prn.toString().c_str())] = _lastOrbCorr->_iod;
-      delete _lastOrbCorr; _lastOrbCorr = 0;
-    }
-  }
-  if (_lastClkCorr) {
-    if (_lastClkCorr->_time > tt) {
-      return true;
-    }
-    else {
-      _clkCorr.push_back(*_lastClkCorr);
-      _corrIODs[QString(_lastClkCorr->_prn.toString().c_str())] = _lastClkCorr->_iod;
-      delete _lastClkCorr; _lastClkCorr = 0;
-    }
-  }
-  return false;
+  return true;
 }

trunk/BNC/src/rinex/corrfile.h

@@ -26 +26 @@
 #define CORRFILE_H
 
+#include <fstream>
 #include <QtCore>
 #include "bncconst.h"
@@ -46 +47 @@
  private:
   bool stopRead(const bncTime& tt);
-  QFile*             _file;
-  QTextStream*       _stream;
+  std::fstream       _stream;
   QList<t_orbCorr>   _orbCorr;
   QList<t_clkCorr>   _clkCorr;
-  t_orbCorr*         _lastOrbCorr;
-  t_clkCorr*         _lastClkCorr;
   QMap<QString, int> _corrIODs;
 };