Changeset 3035 in ntrip for trunk/BNC/RTCM3

Timestamp:

Feb 25, 2011, 1:35:15 PM (14 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/RTCM3

Files:

• RTCM3coDecoder.cpp (modified) (3 diffs)
• RTCM3coDecoder.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -85 +85 @@
 // Reopen Output File
 //////////////////////////////////////////////////////////////////////// 
-void RTCM3coDecoder::reopen() {
-
-  if (!_fileNameSkl.isEmpty()) {
+void RTCM3coDecoder::reopen(const QString& fileNameSkl, QString& fileName,
+                            ofstream*& out) {
+
+  if (!fileNameSkl.isEmpty()) {
 
     bncSettings settings;
@@ -96 +97 @@
                                       settings.value("corrIntr").toString());
 
-    QString fileName = _fileNameSkl 
+    QString fileNameHlp = fileNameSkl 
       + QString("%1").arg(datTim.date().dayOfYear(), 3, 10, QChar('0'))
       + hlpStr + datTim.toString(".yyC");
 
-    if (_fileName == fileName) {
+    if (fileName == fileNameHlp) {
       return;
     }
     else {
-      _fileName = fileName;
-    }
-
-    delete _out;
+      fileName = fileNameHlp;
+    }
+
+    delete out;
     if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
-      _out = new ofstream( _fileName.toAscii().data(),
+      out = new ofstream( fileName.toAscii().data(),
                            ios_base::out | ios_base::app );
     }
     else {
-      _out = new ofstream( _fileName.toAscii().data() );
+      out = new ofstream( fileName.toAscii().data() );
     }
   }
@@ -154 +155 @@
            (_co.NumberOfGPSSat > 0 || _co.NumberOfGLONASSSat > 0) ) {
 
-        reopen();
+        reopen(_fileNameSkl, _fileName, _out);
 
         // Guess GPS week and sec using system time

trunk/BNC/RTCM3/RTCM3coDecoder.h

@@ -47 +47 @@
   static QStringList corrsToASCIIlines(int GPSweek, double GPSweeks, 
                                        const ClockOrbit& co, const Bias* bias);
-
+  static void reopen(const QString& fileNameSkl, QString& fileName,
+                     std::ofstream*& out);
  signals:
   void newCorrLine(QString line, QString staID, long coTime);
 
  private:
-  void reopen();
   void printLine(const QString& line, long coTime);