Changeset 854 in ntrip

Timestamp:

Apr 25, 2008, 3:53:10 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bnsoutf.cpp (modified) (2 diffs)
• bnsoutf.h (modified) (2 diffs)
• bnsrinex.cpp (modified) (1 diff)
• bnsrinex.h (modified) (1 diff)
• bnssp3.cpp (modified) (2 diffs)
• bnssp3.h (modified) (1 diff)
• bnsutils.h (modified) (1 diff)

trunk/BNS/bnsoutf.cpp

@@ -16 +16 @@
  * -----------------------------------------------------------------------*/
 
+#include <math.h>
 #include <iomanip>
 
@@ -137 +138 @@
                      const ColumnVector&) {
 
+  if (_sampl != 0 && fmod(GPSweeks, _sampl) != 0.0) {
+    return failure;
+  }
+
   QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks);
 

trunk/BNS/bnsoutf.h

@@ -6 +6 @@
 #include <QtCore>
 
+#include "bnsutils.h"
+
 class bnsoutf {
  public:
@@ -12 +14 @@
   virtual ~bnsoutf();
 
-  virtual void write(int GPSweek, double GPSweeks, const QString& prn, 
-                     const ColumnVector& xx);
+  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                      const ColumnVector& xx);
 
  protected:
   virtual void writeHeader(const QDateTime& datTim) = 0;
   std::ofstream _out;
-  int           _lastGPSweek;
-  double        _lastGPSweeks;
 
  private:

trunk/BNS/bnsrinex.cpp

@@ -42 +42 @@
 // Write One Epoch
 ////////////////////////////////////////////////////////////////////////////
-void bnsRinex::write(int GPSweek, double GPSweeks, const QString& prn, 
+t_irc bnsRinex::write(int GPSweek, double GPSweeks, const QString& prn, 
                    const ColumnVector& xx) {
 
-  bnsoutf::write(GPSweek, GPSweeks, prn, xx);
+  if (bnsoutf::write(GPSweek, GPSweeks, prn, xx) == success) {
 
+    return success;
+  }
+  else {
+    return failure;
+  }
 }

trunk/BNS/bnsrinex.h

@@ -13 +13 @@
            const QString& intr, int sampl);
   virtual ~bnsRinex();
-  virtual void write(int GPSweek, double GPSweeks, const QString& prn, 
-                     const ColumnVector& xx);
+  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                      const ColumnVector& xx);
 
  private:

trunk/BNS/bnssp3.cpp

@@ -29 +29 @@
                const QString& intr, int sampl) 
   : bnsoutf(prep, ext, path, intr, sampl) {
+
+  _lastGPSweek  = 0;
+  _lastGPSweeks = 0.0;
 }
 
@@ -44 +47 @@
 // Write One Epoch
 ////////////////////////////////////////////////////////////////////////////
-void bnsSP3::write(int GPSweek, double GPSweeks, const QString& prn, 
+t_irc bnsSP3::write(int GPSweek, double GPSweeks, const QString& prn, 
                    const ColumnVector& xx) {
 
-  bnsoutf::write(GPSweek, GPSweeks, prn, xx);
+  if ( bnsoutf::write(GPSweek, GPSweeks, prn, xx) == success) {
 
-  if (_lastGPSweek != GPSweek || _lastGPSweeks != GPSweeks) {
-    _lastGPSweek  = GPSweek;
-    _lastGPSweeks = GPSweeks;
-
-    QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks);
-    double sec = fmod(GPSweeks, 60.0);
-
-    _out << "*  " 
-         << datTim.toString("yyyy MM dd hh mm").toAscii().data()
-         << setw(12) << setprecision(8) << sec << endl; 
+    if (_lastGPSweek != GPSweek || _lastGPSweeks != GPSweeks) {
+      _lastGPSweek  = GPSweek;
+      _lastGPSweeks = GPSweeks;
+    
+      QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks);
+      double sec = fmod(GPSweeks, 60.0);
+    
+      _out << "*  " 
+           << datTim.toString("yyyy MM dd hh mm").toAscii().data()
+           << setw(12) << setprecision(8) << sec << endl; 
+    }
+    _out << "P" << prn.toAscii().data()
+         << setw(14) << setprecision(6) << xx(1) / 1000.0
+         << setw(14) << setprecision(6) << xx(2) / 1000.0
+         << setw(14) << setprecision(6) << xx(3) / 1000.0
+         << setw(14) << setprecision(6) << xx(4) * 1e6 << endl;
+    
+    return success;
   }
-  _out << "P" << prn.toAscii().data()
-       << setw(14) << setprecision(6) << xx(1) / 1000.0
-       << setw(14) << setprecision(6) << xx(2) / 1000.0
-       << setw(14) << setprecision(6) << xx(3) / 1000.0
-       << setw(14) << setprecision(6) << xx(4) * 1e6 << endl;
+  else {
+    return failure;
+  }
 }

trunk/BNS/bnssp3.h

@@ -13 +13 @@
          const QString& intr, int sampl);
   virtual ~bnsSP3();
-  virtual void write(int GPSweek, double GPSweeks, const QString& prn, 
-                     const ColumnVector& xx);
+  virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
+                      const ColumnVector& xx);
 
  private:
   virtual void writeHeader(const QDateTime& datTim);
+  int    _lastGPSweek;
+  double _lastGPSweeks;
 };
 

trunk/BNS/bnsutils.h

@@ -9 +9 @@
 
 class gpsEph;
+
+enum t_irc {failure = -1, success}; // return code
 
 void expandEnvVar(QString& str);