Changeset 3041 in ntrip for trunk

Timestamp:

Feb 25, 2011, 2:17:45 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNS

Files:

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

trunk/BNS/bns.cpp

@@ -113 +113 @@
   // Log File
   // --------
+  _append = Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked;
+
   QIODevice::OpenMode oMode;
-  if (Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked) {
+  if (_append) {
     oMode = QIODevice::WriteOnly | QIODevice::Unbuffered | QIODevice::Append;
   }
@@ -652 +654 @@
     }
     if (_sp3) {
-      _sp3->write(GPSweek, GPSweeks, prn, xx);
+      _sp3->write(GPSweek, GPSweeks, prn, xx, _append);
     }
   }

trunk/BNS/bns.h

@@ -91 +91 @@
   bnsSP3*                   _sp3;
   QByteArray                _clkLine;
+  bool                      _append;
   
   int    _GPSweek;

trunk/BNS/bnsoutf.cpp

@@ -137 +137 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bnsoutf::write(int GPSweek, double GPSweeks, const QString&, 
-                     const ColumnVector&) {
+                     const ColumnVector&, bool append) {
 
   if (_sampl != 0 && fmod(GPSweeks, _sampl) != 0.0) {
@@ -158 +158 @@
     _out.setf(ios::showpoint | ios::fixed);
     bnsSettings settings;
-    if (QFile::exists(_fName) &&
-        Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked) {
+    if (append && QFile::exists(_fName)) {
       _out.open(_fName.data(), ios::out | ios::app);
     }

trunk/BNS/bnsoutf.h

@@ -15 +15 @@
 
   virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx);
+                      const ColumnVector& xx, bool append);
 
  protected:

trunk/BNS/bnsrinex.cpp

@@ -20 +20 @@
 
 #include "bnsrinex.h"
+#include "bnssettings.h"
 
 using namespace std;
@@ -28 +29 @@
                const QString& intr, int sampl) 
   : bnsoutf(prep, ext, path, intr, sampl) {
+  bnsSettings settings;
+  _append = Qt::CheckState(settings.value("fileAppend").toInt()) == Qt::Checked;
 }
 
@@ -40 +43 @@
                    const ColumnVector& xx) {
 
-  if (bnsoutf::write(GPSweek, GPSweeks, prn, xx) == success) {
+  if (bnsoutf::write(GPSweek, GPSweeks, prn, xx, _append) == success) {
 
       QDateTime datTim = dateAndTimeFromGPSweek(GPSweek, GPSweeks);

trunk/BNS/bnsrinex.h

@@ -18 +18 @@
  private:
   virtual void writeHeader(const QDateTime& datTim);
+  bool _append;
 };
 

trunk/BNS/bnssp3.cpp

@@ -42 +42 @@
 ////////////////////////////////////////////////////////////////////////////
 t_irc bnsSP3::write(int GPSweek, double GPSweeks, const QString& prn, 
-                   const ColumnVector& xx) {
+                    const ColumnVector& xx, bool append) {
 
-  if ( bnsoutf::write(GPSweek, GPSweeks, prn, xx) == success) {
+  if ( bnsoutf::write(GPSweek, GPSweeks, prn, xx, append) == success) {
 
     if (_lastGPSweek != GPSweek || _lastGPSweeks != GPSweeks) {

trunk/BNS/bnssp3.h

@@ -14 +14 @@
   virtual ~bnsSP3();
   virtual t_irc write(int GPSweek, double GPSweeks, const QString& prn, 
-                      const ColumnVector& xx);
+                      const ColumnVector& xx, bool append);
 
  private: