Changeset 3646 in ntrip

Timestamp:

Jan 24, 2012, 12:38:25 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• bncpostprocess.cpp (modified) (4 diffs)
• bncpostprocess.h (modified) (2 diffs)
• rnxobsfile.cpp (modified) (3 diffs)
• rnxobsfile.h (modified) (2 diffs)

trunk/BNC/bncpostprocess.cpp

@@ -44 +44 @@
 #include "pppopt.h"
 #include "bncpppclient.h"
+#include "rnxobsfile.h"
+#include "rnxnavfile.h"
 
 using namespace std;
@@ -50 +52 @@
 ////////////////////////////////////////////////////////////////////////////
 t_postProcessing::t_postProcessing(QObject* parent) : QThread(parent) {
-  _opt = new t_pppOpt();
+  _opt        = new t_pppOpt();
+  _rnxObsFile = 0;
+  _rnxNavFile = 0;
+  _pppClient  = 0;
 }
 
@@ -57 +62 @@
 t_postProcessing::~t_postProcessing() {
   cout << "~t_postProcessing" << endl;
+  delete _pppClient;
+  delete _rnxNavFile;
+  delete _rnxObsFile;
   delete _opt;
-  delete _pppClient;
 }
 
@@ -75 +82 @@
   }
   else {
-    _pppClient = new bncPPPclient("POST", _opt, false);
+    _rnxObsFile = new t_rnxObsFile(_opt->obsFileName);
+    _rnxNavFile = new t_rnxNavFile(_opt->navFileName);
+    _pppClient  = new bncPPPclient("POST", _opt, false);
 
     connect(this, SIGNAL(newEphGPS(gpsephemeris)),

trunk/BNC/bncpostprocess.h

@@ -34 +34 @@
 class t_pppOpt;
 class bncPPPclient;
+class t_rnxObsFile;
+class t_rnxNavFile;
 
 class t_postProcessing : public QThread {
@@ -61 +63 @@
   t_pppOpt*     _opt;
   bncPPPclient* _pppClient;
+  t_rnxObsFile* _rnxObsFile;
+  t_rnxNavFile* _rnxNavFile;
 };
 

trunk/BNC/rnxobsfile.cpp

@@ -41 +41 @@
 #include <iostream>
 #include "rnxobsfile.h"
+#include "bncutils.h"
 
 using namespace std;
@@ -46 +47 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-t_rnxObsFile::t_rnxObsFile(const QString& fileName) {
+t_rnxObsFile::t_rnxObsHeader::t_rnxObsHeader() {
+}
+
+// Destructor
+////////////////////////////////////////////////////////////////////////////
+t_rnxObsFile::t_rnxObsHeader::~t_rnxObsHeader() {
+}
+
+// Read Header
+////////////////////////////////////////////////////////////////////////////
+t_irc t_rnxObsFile::t_rnxObsHeader::read(QTextStream* stream) {
+  while (stream->status() == QTextStream::Ok) {
+    QString line = stream->readLine();
+    cout << line.toAscii().data();
+  }
+
+  return success;
+}
+
+// Constructor
+////////////////////////////////////////////////////////////////////////////
+t_rnxObsFile::t_rnxObsFile(QString fileName) {
+  expandEnvVar(fileName);
+  _file   = new QFile(fileName);
+  _file->open(QIODevice::ReadOnly | QIODevice::Text);
+  _stream = new QTextStream();
+  _stream->setDevice(_file);
+  _header.read(_stream);
 }
 
@@ -52 +80 @@
 ////////////////////////////////////////////////////////////////////////////
 t_rnxObsFile::~t_rnxObsFile() {
+  delete _stream;
+  delete _file;
 }
 

trunk/BNC/rnxobsfile.h

@@ -33 +33 @@
 
 class t_rnxObsFile {
+
+  class t_rnxObsHeader {
+   public:
+    t_rnxObsHeader();
+    ~t_rnxObsHeader();
+    t_irc read(QTextStream* stream);
+   private:
+  };
  
  public:
-  t_rnxObsFile(const QString& fileName);
+  t_rnxObsFile(QString fileName);
   ~t_rnxObsFile();
 
@@ -41 +49 @@
 
  private:
+  t_rnxObsHeader _header;
+  QFile*         _file;
+  QTextStream*   _stream;
 };