Changeset 6455 in ntrip

Timestamp:

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

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• RTCM3/RTCM3coDecoder.cpp (modified) (4 diffs)
• RTCM3/RTCM3coDecoder.h (modified) (2 diffs)
• bnccore.cpp (modified) (2 diffs)
• rinex/corrfile.cpp (modified) (4 diffs)
• rinex/corrfile.h (modified) (2 diffs)
• satObs.cpp (modified) (3 diffs)
• satObs.h (modified) (3 diffs)

trunk/BNC/src/RTCM3/RTCM3coDecoder.cpp

@@ -262 +262 @@
 void RTCM3coDecoder::sendResults() {
 
-  QList<t_orbCorr> orbCorrections;
-  QList<t_clkCorr> clkCorrections;
-
-  // Loop over all satellites (GPS and Glonass)
-  // ------------------------------------------
+  QList<t_orbCorr>& orbCorrections = _orbCorrections[_lastTime];
+  QList<t_clkCorr>& clkCorrections = _clkCorrections[_lastTime];
+
+  // Orbit and clock corrections of all satellites
+  // ---------------------------------------------
   for (unsigned ii = 0; ii < CLOCKORBIT_NUMGPS + _clkOrb.NumberOfSat[CLOCKORBIT_SATGLONASS]; ii++) {
     char sysCh = ' ';
@@ -304 +304 @@
     }
 
+    // Clock Corrections
+    // -----------------
     if ( _clkOrb.messageType == COTYPE_GPSCOMBINED     ||
          _clkOrb.messageType == COTYPE_GLONASSCOMBINED ||
@@ -331 +333 @@
   }
 
-  // Loop over all satellites (GPS and Glonass)
-  // ------------------------------------------
+  // Code Biases
+  // -----------
   QList<t_satBias> satBiases;
   for (unsigned ii = 0; ii < CLOCKORBIT_NUMGPS + _codeBias.NumberOfSat[CLOCKORBIT_SATGLONASS]; ii++) {
@@ -354 +356 @@
   }
 
-  if (orbCorrections.size() > 0) {
-    emit newOrbCorrections(orbCorrections);
-  }
-  if (clkCorrections.size() > 0) {
-    emit newClkCorrections(clkCorrections);
-  }
+  // Dump all older epochs
+  // ---------------------
+  QMutableMapIterator<bncTime, QList<t_orbCorr> > itOrb(_orbCorrections);
+  while (itOrb.hasNext()) {
+    itOrb.next();
+    if (itOrb.key() < _lastTime) {
+      emit newOrbCorrections(itOrb.value());
+      if (_out) {
+        t_orbCorr::writeEpoch(_out, itOrb.value());
+      }
+      itOrb.remove();
+    } 
+  }
+  QMutableMapIterator<bncTime, QList<t_clkCorr> > itClk(_clkCorrections);
+  while (itClk.hasNext()) {
+    itClk.next();
+    if (itClk.key() < _lastTime) {
+      emit newClkCorrections(itClk.value());
+      if (_out) {
+        t_clkCorr::writeEpoch(_out, itClk.value());
+      }
+      itClk.remove();
+    } 
+  }
+
   if (_out) {
-    QListIterator<t_orbCorr> itOrb(orbCorrections);
-    while (itOrb.hasNext()) {
-      const t_orbCorr& orbCorr = itOrb.next();
-      *_out << orbCorr.toLine();
-    }
-    QListIterator<t_clkCorr> itClk(clkCorrections);
-    while (itClk.hasNext()) {
-      const t_clkCorr& clkCorr = itClk.next();
-      *_out << clkCorr.toLine();
-    }
     _out->flush();
   }

trunk/BNC/src/RTCM3/RTCM3coDecoder.h

@@ -44 +44 @@
 
  signals:
-  void newOrbCorrections(QList<t_orbCorr> orbCorr);
-  void newClkCorrections(QList<t_clkCorr> clkCorr);
-  void newBiases(QList<t_satBias> biases);
+  void newOrbCorrections(QList<t_orbCorr>);
+  void newClkCorrections(QList<t_clkCorr>);
   void newMessage(QByteArray msg, bool showOnScreen);
   void providerIDChanged(QString staID);
@@ -66 +65 @@
   bncTime        _lastTime;
   QMap<std::string, unsigned short> _IODs;
+  QMap<bncTime, QList<t_orbCorr> >  _orbCorrections;
+  QMap<bncTime, QList<t_clkCorr> >  _clkCorrections;
 };
 

trunk/BNC/src/bnccore.cpp

@@ -534 +534 @@
   emit newOrbCorrections(orbCorrections);
   if (_socketsCorr) {
-    QListIterator<t_orbCorr> it(orbCorrections);
-    while (it.hasNext()) {
-      const t_orbCorr& corr = it.next();
-      QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
-      while (is.hasNext()) {
-        QTcpSocket* sock = is.next();
-        if (sock->state() == QAbstractSocket::ConnectedState) {
-          if (sock->write(corr.toLine().c_str()) == -1) {
-            delete sock;
-            is.remove();
-          }
-        }
-        else if (sock->state() != QAbstractSocket::ConnectingState) {
+    ostringstream out;
+    t_orbCorr::writeEpoch(&out, orbCorrections);   
+    QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
+    while (is.hasNext()) {
+      QTcpSocket* sock = is.next();
+      if (sock->state() == QAbstractSocket::ConnectedState) {
+        if (sock->write(out.str().c_str()) == -1) {
           delete sock;
           is.remove();
         }
+      }
+      else if (sock->state() != QAbstractSocket::ConnectingState) {
+        delete sock;
+        is.remove();
       }
     }
@@ -561 +559 @@
   emit newClkCorrections(clkCorrections);
   if (_socketsCorr) {
-    QListIterator<t_clkCorr> it(clkCorrections);
-    while (it.hasNext()) {
-      const t_clkCorr& corr = it.next();
-      QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
-      while (is.hasNext()) {
-        QTcpSocket* sock = is.next();
-        if (sock->state() == QAbstractSocket::ConnectedState) {
-          if (sock->write(corr.toLine().c_str()) == -1) {
-            delete sock;
-            is.remove();
-          }
-        }
-        else if (sock->state() != QAbstractSocket::ConnectingState) {
+    ostringstream out;
+    t_clkCorr::writeEpoch(&out, clkCorrections);   
+    QMutableListIterator<QTcpSocket*> is(*_socketsCorr);
+    while (is.hasNext()) {
+      QTcpSocket* sock = is.next();
+      if (sock->state() == QAbstractSocket::ConnectedState) {
+        if (sock->write(out.str().c_str()) == -1) {
           delete sock;
           is.remove();
         }
+      }
+      else if (sock->state() != QAbstractSocket::ConnectingState) {
+        delete sock;
+        is.remove();
       }
     }

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;
 };

trunk/BNC/src/satObs.cpp

@@ -6 +6 @@
 
 using namespace std;
-
-// 
-////////////////////////////////////////////////////////////////////////////
-t_clkCorr::t_clkCorr(const string& line) {
-  reset();
-  istringstream in(line);
-  char ch; in >> ch; if (ch != 'C') return;
-  int    gpsw;
-  double gpssec;
-  in >> gpsw >> gpssec >> _prn >> _iod >> _dClk >> _dotDClk >> _dotDotDClk;
-  _time.set(gpsw, gpssec);
-  _dClk       /= t_CST::c;
-  _dotDClk    /= t_CST::c;
-  _dotDotDClk /= t_CST::c;
-}
 
 // 
@@ -36 +21 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-string t_clkCorr::toLine() const {
-  ostringstream str;
-  str.setf(ios::showpoint | ios::fixed);
-  str << "C " << _time.gpsw() << ' ' << setprecision(2) << _time.gpssec() << ' '
-      << _prn.toString() << ' ' << setw(3) << _iod << ' '
-      << setw(10) << setprecision(4) << _dClk       * t_CST::c << ' '
-      << setw(10) << setprecision(4) << _dotDClk    * t_CST::c << ' '
-      << setw(10) << setprecision(4) << _dotDotDClk * t_CST::c << endl;
-  return str.str();
+void t_clkCorr::writeEpoch(std::ostream* out, const QList<t_clkCorr>& corrList) {
+  *out << "CLOCK CORRECTIONS: " << corrList.size() << endl;
 }
 
 // 
 ////////////////////////////////////////////////////////////////////////////
-t_orbCorr::t_orbCorr(const string& line) {
-  reset();
-  istringstream in(line);
-  char ch; in >> ch; if (ch != 'O') return;
-  int    gpsw;
-  double gpssec;
-  in >> gpsw >> gpssec >> _prn >> _iod 
-     >> _xr[0]    >> _xr[1]    >> _xr[2]
-     >> _dotXr[0] >> _dotXr[1] >> _dotXr[2];
-  _time.set(gpsw, gpssec);
+void t_clkCorr::readEpoch(std::istream* in, QList<t_clkCorr>& corrList) {
 }
 
@@ -74 +43 @@
 // 
 ////////////////////////////////////////////////////////////////////////////
-string t_orbCorr::toLine() const {
-  ostringstream str;
-  str.setf(ios::showpoint | ios::fixed);
-  str << "O " << _time.gpsw() << ' ' << setprecision(2) << _time.gpssec() << ' '
-      << _prn.toString() << ' ' << setw(3) << _iod << ' '
-      << setw(10) << setprecision(4) << _xr[0]     << ' '
-      << setw(10) << setprecision(4) << _xr[1]     << ' '
-      << setw(10) << setprecision(4) << _xr[2]     << "    "
-      << setw(10) << setprecision(4) << _dotXr[0]  << ' '
-      << setw(10) << setprecision(4) << _dotXr[1]  << ' '
-      << setw(10) << setprecision(4) << _dotXr[2]  << endl;
-  return str.str();
+void t_orbCorr::writeEpoch(std::ostream* out, const QList<t_orbCorr>& corrList) {
+  *out << "ORB CORRECTIONS: " << corrList.size() << endl;
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+void t_orbCorr::readEpoch(std::istream* in, QList<t_orbCorr>& corrList) {
+}

trunk/BNC/src/satObs.h

@@ -5 +5 @@
 #include <vector>
 #include <newmat.h>
+
+#include <QtCore>
 
 #include "bncconst.h"
@@ -60 +62 @@
  public:
   t_orbCorr() {reset();}
-  t_orbCorr(const std::string& line);
+  static void writeEpoch(std::ostream* out, const QList<t_orbCorr>& corrList);
+  static void readEpoch(std::istream* in, QList<t_orbCorr>& corrList);
   void           reset();
   t_prn          prn() const {return _prn;}
   unsigned short IOD() const {return _iod;}
-  std::string    toLine() const;
   std::string    _staID;
   t_prn          _prn;
@@ -77 +79 @@
  public:
   t_clkCorr() {reset();}
-  t_clkCorr(const std::string& line);
+  static void writeEpoch(std::ostream* out, const QList<t_clkCorr>& corrList);
+  static void readEpoch(std::istream* in, QList<t_clkCorr>& corrList);
   void           reset();
   t_prn          prn() const {return _prn;}
   unsigned short IOD() const {return _iod;}
-  std::string    toLine() const;
   std::string    _staID;
   t_prn          _prn;