Changeset 3999 in ntrip


Ignore:
Timestamp:
Apr 22, 2012, 11:14:15 AM (13 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/rinex
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/rinex/bncpostprocess.cpp

    r3973 r3999  
    111111  else {
    112112    _rnxObsFile = new t_rnxObsFile(_opt->obsFileName, t_rnxObsFile::input);
    113     _rnxNavFile = new t_rnxNavFile(_opt->navFileName);
     113    _rnxNavFile = new t_rnxNavFile(_opt->navFileName, t_rnxNavFile::input);
    114114    _pppClient  = new bncPPPclient("POST", _opt, false);
    115115

  • trunk/BNC/rinex/reqcedit.cpp

    r3998 r3999  
    4343#include "bncapp.h"
    4444#include "bncsettings.h"
     45#include "rnxnavfile.h"
    4546
    4647using namespace std;
    … …  
    5455  _obsFileNames   = settings.value("reqcObsFile").toString().split(",", QString::SkipEmptyParts);
    5556  _outObsFileName = settings.value("reqcOutObsFile").toString();
     57  _navFileNames   = settings.value("reqcNavFile").toString().split(",", QString::SkipEmptyParts);
     58  _outNavFileName = settings.value("reqcOutNavFile").toString();
    5659  _rnxVersion     = settings.value("reqcRnxVersion").toDouble();
    5760  _samplingRate   = settings.value("reqcSampling").toInt();
    … …  
    219222void t_reqcEdit::editEphemerides() {
    220223
    221 }
     224  QStringListIterator it(_navFileNames);
     225  while (it.hasNext()) {
     226    QString fileName = it.next();
     227    t_rnxNavFile rnxNavFile(fileName, t_rnxNavFile::input);
     228  }
     229
     230}

  • trunk/BNC/rinex/reqcedit.h

    r3998 r3999  
    5656  QVector<t_rnxObsFile*> _rnxObsFiles;
    5757  QString                _outObsFileName;
     58  QStringList            _navFileNames;
     59  QString                _outNavFileName;
    5860  double                 _rnxVersion;
    5961  int                    _samplingRate;

  • trunk/BNC/rinex/rnxnavfile.cpp

    r3764 r3999  
    8686// Constructor
    8787////////////////////////////////////////////////////////////////////////////
    88 t_rnxNavFile::t_rnxNavFile(QString fileName) {
    89   expandEnvVar(fileName);
    90   QFile*       file   = new QFile(fileName);
    91   file->open(QIODevice::ReadOnly | QIODevice::Text);
    92   QTextStream* stream = new QTextStream();
    93   stream->setDevice(file);
    94   _header.read(stream);
    95   this->read(stream);
    96   delete stream;
    97   delete file;
     88t_rnxNavFile::t_rnxNavFile(const QString& fileName, e_inpOut inpOut) {
     89  _inpOut = inpOut;
     90  _stream = 0;
     91  _file   = 0;
     92  if (_inpOut == input) {
     93    openRead(fileName);
     94  }
     95  else {
     96    openWrite(fileName);
     97  }
     98}
     99
     100// Open for input
     101////////////////////////////////////////////////////////////////////////////
     102void t_rnxNavFile::openRead(const QString& fileName) {
     103
     104  _fileName = fileName; expandEnvVar(_fileName);
     105  _file     = new QFile(_fileName);
     106  _file->open(QIODevice::ReadOnly | QIODevice::Text);
     107  _stream = new QTextStream();
     108  _stream->setDevice(_file);
     109
     110  _header.read(_stream);
     111  this->read(_stream);
     112}
     113
     114// Open for output
     115////////////////////////////////////////////////////////////////////////////
     116void t_rnxNavFile::openWrite(const QString& fileName) {
     117
     118  _fileName = fileName; expandEnvVar(_fileName);
     119  _file     = new QFile(_fileName);
     120  _file->open(QIODevice::WriteOnly | QIODevice::Text);
     121  _stream = new QTextStream();
     122  _stream->setDevice(_file);
    98123}
    99124
    … …  
    101126////////////////////////////////////////////////////////////////////////////
    102127t_rnxNavFile::~t_rnxNavFile() {
     128  close();
    103129  for (unsigned ii = 0; ii < _ephs.size(); ii++) {
    104130    delete _ephs[ii];
    105   }
     131  } 
     132}
     133
     134// Close
     135////////////////////////////////////////////////////////////////////////////
     136void t_rnxNavFile::close() {
     137  delete _stream; _stream = 0;
     138  delete _file;   _file = 0;
    106139}
    107140

  • trunk/BNC/rinex/rnxnavfile.h

    r3758 r3999  
    3737class t_rnxNavFile {
    3838
     39 public:
     40  enum e_inpOut {input, output};
     41
     42 private:
    3943  class t_rnxNavHeader {
    4044   public:
    … …  
    5054 
    5155 public:
    52   t_rnxNavFile(QString fileName);
     56  t_rnxNavFile(const QString& fileName, e_inpOut inpOut);
    5357  ~t_rnxNavFile();
    5458  t_eph* getNextEph(const bncTime& tt, const QMap<QString, int>* corrIODs);
    … …  
    5660  bool  glonass() const {return _header.glonass();}
    5761
     62 protected:
     63  t_rnxNavFile() {};
     64  void openRead(const QString& fileName);
     65  void openWrite(const QString& fileName);
     66  void close();
     67
    5868 private:
    5969  void read(QTextStream* stream);
    6070
     71  e_inpOut            _inpOut;
     72  QFile*              _file;
     73  QString             _fileName;
     74  QTextStream*        _stream;
    6175  std::vector<t_eph*> _ephs;
    6276  t_rnxNavHeader      _header;
Note: See TracChangeset for help on using the changeset viewer.