Changeset 2386 in ntrip

Timestamp:

Mar 26, 2010, 11:47:04 AM (14 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM3/RTCM3Decoder.cpp (modified) (2 diffs)
• bncapp.cpp (modified) (1 diff)
• bncgetthread.cpp (modified) (3 diffs)
• bncgetthread.h (modified) (1 diff)
• bncwindow.cpp (modified) (3 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -119 +119 @@
       decoded = true;
       if (_mode == unknown) {
-        _mode = corrections;
+        /////        _mode = corrections;
       }
     }
@@ -341 +341 @@
     }
     if (_mode == unknown && decoded) {
-      _mode = observations;
+      ////      _mode = observations;
     }
   }

trunk/BNC/bncapp.cpp

@@ -711 +711 @@
 void bncApp::writeRawData(const QByteArray& data) {
 
-////  QMutexLocker locker(&_mutex);
-////
-////  if (!_rawOutFile) {
-////    QByteArray rawOutFileName = "./bnc.raw";
-////    _rawOutFile = new QFile(rawOutFileName);
-////    _rawOutFile->open(QIODevice::WriteOnly);
-////  }
-////
-////  _rawOutFile->write(data);
-////  _rawOutFile->flush();
-}
+  QMutexLocker locker(&_mutex);
+
+  if (!_rawOutFile) {
+    bncSettings settings;
+    QString rawOutFileName = settings.value("rawOutFile").toString();
+    _rawOutFile = new QFile(rawOutFileName);
+    _rawOutFile->open(QIODevice::WriteOnly);
+  }
+
+  if (_rawOutFile) {
+    _rawOutFile->write(data);
+    _rawOutFile->flush();
+  }
+}

trunk/BNC/bncgetthread.cpp

@@ -84 +84 @@
                        rawInpFileName.lastIndexOf(QDir::separator())+1,4);  
 
+  _rawOutput = false;
+
   initialize();
 }
@@ -104 +106 @@
   _ntripVersion = ntripVersion;
 
+  bncSettings settings;
+  if (!settings.value("rawOutFile").toString().isEmpty()) {
+    _rawOutput = true;
+  }
+
   initialize();
 }
@@ -410 +417 @@
       // Output Data
       // -----------
-      bncApp* app = (bncApp*) qApp;
-      app->writeRawData(data); 
+      if (_rawOutput) {
+        bncApp* app = (bncApp*) qApp;
+        app->writeRawData(data); 
+      }
 
       if (_serialPort) {

trunk/BNC/bncgetthread.h

@@ -126 +126 @@
    QMutex          _mutex;
    bncPPPclient*   _PPPclient;
+   bool            _rawOutput;
 };
 

trunk/BNC/bncwindow.cpp

@@ -134 +134 @@
   // ---------------
   _logFileLineEdit    = new QLineEdit(settings.value("logFile").toString());
+  _rawOutFileLineEdit = new QLineEdit(settings.value("rawOutFile").toString());
   _rnxAppendCheckBox  = new QCheckBox();
   _rnxAppendCheckBox->setCheckState(Qt::CheckState(
@@ -529 +530 @@
   gLayout->addWidget(new QLabel("Auto start"),                   3, 0);
   gLayout->addWidget(_autoStartCheckBox,                         3, 1);
-  gLayout->addWidget(new QLabel("General settings for logfile, file handling, configuration on-the-fly, and auto-start."),4, 0, 1, 50, Qt::AlignLeft);
-  gLayout->addWidget(new QLabel("    "),5,0);
+  gLayout->addWidget(new QLabel("raw output file (full path)"),  4, 0);
+  gLayout->addWidget(_rawOutFileLineEdit,                        4, 1, 1,30);
+  gLayout->addWidget(new QLabel("General settings for logfile, file handling, configuration on-the-fly, and auto-start."),5, 0, 1, 50, Qt::AlignLeft);
+  gLayout->addWidget(new QLabel("    "),6,0);
   ggroup->setLayout(gLayout);
 
@@ -1035 +1038 @@
   settings.setValue("ephV3",       _ephV3CheckBox->checkState());
   settings.setValue("logFile",     _logFileLineEdit->text());
+  settings.setValue("rawOutFile",  _rawOutFileLineEdit->text());
   settings.setValue("miscMount",   _miscMountLineEdit->text());
   settings.setValue("pppMount",    _pppMountLineEdit->text());

trunk/BNC/bncwindow.h

@@ -128 +128 @@
     QLineEdit* _rnxScrpLineEdit;
     QLineEdit* _logFileLineEdit;
+    QLineEdit* _rawOutFileLineEdit;
     QComboBox* _pppSPPComboBox;
     QComboBox* _rnxIntrComboBox;