Changeset 3659 in ntrip for trunk

Timestamp:

Feb 3, 2012, 5:34:05 PM (13 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC

Files:

• RTCM3/ephemeris.cpp (modified) (4 diffs)
• RTCM3/ephemeris.h (modified) (5 diffs)
• rnxnavfile.cpp (modified) (4 diffs)
• rnxnavfile.h (modified) (3 diffs)

trunk/BNC/RTCM3/ephemeris.cpp

@@ -99 +99 @@
 
   _TGD      = ee->TGD;
+
+  _ok       = true;
 }
 
@@ -492 +494 @@
   _xv(5) = _y_velocity * 1.e3; 
   _xv(6) = _z_velocity * 1.e3; 
+
+  _ok = true;
 }
 
@@ -613 +617 @@
   _OMEGADOT = ee->OMEGADOT;
   _IDOT     = ee->IDOT;
+
+  _ok = true;
 }
 
@@ -783 +789 @@
   return size;
 }
+
+// Constructor
+//////////////////////////////////////////////////////////////////////////////
+t_ephGPS::t_ephGPS(float rnxVersion, const QStringList& lines) {
+
+  _ok = false;
+}
+
+// Constructor
+//////////////////////////////////////////////////////////////////////////////
+t_ephGlo::t_ephGlo(float rnxVersion, const QStringList& lines) {
+
+  _ok = false;
+}
+
+// Constructor
+//////////////////////////////////////////////////////////////////////////////
+t_ephGal::t_ephGal(float rnxVersion, const QStringList& lines) {
+
+  _ok = false;
+}

trunk/BNC/RTCM3/ephemeris.h

@@ -12 +12 @@
 class t_eph {
  public:
+  t_eph() {_ok = false;}
   virtual ~t_eph() {};
 
+  bool     ok() const {return _ok;}
   bool     isNewerThan(const t_eph* eph) const;
   QString  prn() const {return _prn;}
@@ -49 +51 @@
   double    _GPSweeks;
   QDateTime _receptDateTime;
+  bool      _ok;
 };
 
@@ -55 +58 @@
  public:
   t_ephGPS() { }
+  t_ephGPS(float rnxVersion, const QStringList& lines);
   virtual ~t_ephGPS() {}
   double TOC() const {return _TOC;}
@@ -105 +109 @@
  public:
   t_ephGlo() { _xv.ReSize(6); }
+  t_ephGlo(float rnxVersion, const QStringList& lines);
 
   virtual ~t_ephGlo() {}
@@ -146 +151 @@
  public:
   t_ephGal() { }
+  t_ephGal(float rnxVersion, const QStringList& lines);
   virtual ~t_ephGal() {}
   double TOC() const {return _TOC;}

trunk/BNC/rnxnavfile.cpp

@@ -42 +42 @@
 #include "rnxnavfile.h"
 #include "bncutils.h"
+#include "RTCM3/ephemeris.h"
 
 using namespace std;
@@ -49 +50 @@
 t_rnxNavFile::t_rnxNavHeader::t_rnxNavHeader() {
   _version = 0.0;
+  _glonass = false;
 }
 
@@ -72 +74 @@
       QTextStream in(value.toAscii(), QIODevice::ReadOnly);
       in >> _version;
+      if (value.indexOf("GLONASS") != -1) {
+        _glonass = true;
+      }
     }
   }
@@ -96 +101 @@
 }
 
+// Read Next Ephemeris
+////////////////////////////////////////////////////////////////////////////
+t_irc t_rnxNavFile::getNextEph(t_eph* eph) {
+
+  while (_stream->status() == QTextStream::Ok && !_stream->atEnd()) {
+    QString line = _stream->readLine();
+    if (line.isEmpty()) {
+      continue;
+    }
+    QStringList hlp = line.split(QRegExp("\\s+"), QString::SkipEmptyParts);
+    QString prn;
+    if (version() >= 3.0) {
+      prn = hlp.at(0);
+    }
+    else {
+      if (glonass()) {
+        prn = 'R' + QString("%1").arg(hlp.at(0).toInt(), 2, QChar('0'));
+      }
+      else {
+        prn = 'G' + QString("%1").arg(hlp.at(0).toInt(), 2, QChar('0'));
+      }
+    }
+    QStringList lines; lines << line;
+    if      (prn[0] == 'G') {
+      for (int ii = 1; ii < 8; ii++) {
+        lines << _stream->readLine();
+      }
+      eph = new t_ephGPS(version(), lines);
+    }
+    else if (prn[0] == 'R') {
+      for (int ii = 1; ii < 4; ii++) {
+        lines << _stream->readLine();
+      }
+      eph = new t_ephGlo(version(), lines);
+    }
+    else if (prn[0] == 'E') {
+      for (int ii = 1; ii < 8; ii++) {
+        lines << _stream->readLine();
+      }
+      eph = new t_ephGal(version(), lines);
+    }
+    else {
+      return failure;
+    }
+    if (!eph->ok()) {
+      delete eph;
+      eph = 0;
+      return failure;
+    }
+  }
+
+  return success;
+}

trunk/BNC/rnxnavfile.h

@@ -31 +31 @@
 class t_pppOpt;
 class bncPPPclient;
+class t_eph;
 
 class t_rnxNavFile {
@@ -39 +40 @@
     ~t_rnxNavHeader();
     t_irc read(QTextStream* stream);
+    float version() const {return _version;}
+    bool  glonass() const {return _glonass;}
    private:
     float   _version;
+    bool    _glonass;
   };
  
@@ -46 +50 @@
   t_rnxNavFile(QString fileName);
   ~t_rnxNavFile();
+  t_irc getNextEph(t_eph* eph);
+  float version() const {return _header.version();}
+  bool  glonass() const {return _header.glonass();}
 
  private: