Changeset 5528 in ntrip for trunk

Timestamp:

Nov 6, 2013, 2:57:57 PM (11 years ago)

Author:

mervart

Message:

 

Location:

trunk/BNC/src

Files:

• bnccaster.cpp (modified) (4 diffs)
• bnccaster.h (modified) (2 diffs)
• bncmain.cpp (modified) (1 diff)
• bncwindow.cpp (modified) (1 diff)

trunk/BNC/src/bnccaster.cpp

@@ -60 +60 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bncCaster::bncCaster(const QString& outFileName, int port) {
+bncCaster::bncCaster() {
 
   bncSettings settings;
@@ -67 +67 @@
           BNC_CORE, SLOT(slotMessage(const QByteArray,bool)));
 
-  if ( !outFileName.isEmpty() ) {
-    QString lName = outFileName;
-    expandEnvVar(lName);
-    _outFile = new QFile(lName); 
-    if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
-      _outFile->open(QIODevice::WriteOnly | QIODevice::Append);
-    }
-    else {
-      _outFile->open(QIODevice::WriteOnly);
-    }
-    _out = new QTextStream(_outFile);
-    _out->setRealNumberNotation(QTextStream::FixedNotation);
-  }
-  else {
-    _outFile = 0;
-    _out     = 0;
-  }
-
-  _port = port;
+  _outFile = 0;
+  _out     = 0;
+  reopenOutFile();
+
+  _port = settings.value("outPort").toInt();
 
   if (_port != 0) {
@@ -178 +164 @@
 
   QMutexLocker locker(&_mutex);
+
+  reopenOutFile();
 
   unsigned index = 0;
@@ -561 +549 @@
   }
 }
+
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncCaster::reopenOutFile() {
+
+  bncSettings settings;
+
+  QString outFileName = settings.value("outFile").toString();
+  if ( !outFileName.isEmpty() ) {
+    expandEnvVar(outFileName);
+    if (!_outFile || _outFile->fileName() != outFileName) {
+      delete _out;
+      delete _outFile;
+      _outFile = new QFile(outFileName); 
+      if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
+        _outFile->open(QIODevice::WriteOnly | QIODevice::Append);
+      }
+      else {
+        _outFile->open(QIODevice::WriteOnly);
+      }
+      _out = new QTextStream(_outFile);
+      _out->setRealNumberNotation(QTextStream::FixedNotation);
+    }
+  }
+  else {
+    delete _out;     _out     = 0;
+    delete _outFile; _outFile = 0;
+  }
+}
+

trunk/BNC/src/bnccaster.h

@@ -41 +41 @@
 
  public:
-   bncCaster(const QString& outFileName, int port);
+   bncCaster();
    ~bncCaster();
    void addGetThread(bncGetThread* getThread, bool noNewThread = false);
@@ -66 +66 @@
    void dumpEpochs(long minTime, long maxTime);
    static int myWrite(QTcpSocket* sock, const char* buf, int bufLen);
+   void reopenOutFile();
 
    QFile*                   _outFile;

trunk/BNC/src/bncmain.cpp

@@ -193 +193 @@
     bncEphUploadCaster* casterEph = new bncEphUploadCaster(); (void) casterEph;
     
-    bncCaster* caster = new bncCaster(settings.value("outFile").toString(),
-                                      settings.value("outPort").toInt());
+    bncCaster* caster = new bncCaster();
     
     BNC_CORE->setCaster(caster);

trunk/BNC/src/bncwindow.cpp

@@ -2055 +2055 @@
   enableStartStop();
 
-  _caster = new bncCaster(_outFileLineEdit->text(), 
-                          _outPortLineEdit->text().toInt());
+  _caster = new bncCaster();
 
   BNC_CORE->setPort(_outEphPortLineEdit->text().toInt());