Changeset 149 in ntrip

Timestamp:

Sep 8, 2006, 9:04:28 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (2 diffs)
• bncwindow.cpp (modified) (4 diffs)

trunk/BNC/bncapp.cpp

@@ -17 +17 @@
 
 #include <iostream>
+#include <QSettings>
 
 #include "bncapp.h" 
@@ -29 +30 @@
   _logFile   = 0;
   _logStream = 0;
-  for (int ii = 1; ii < argc; ii++) {
-    if (QString(argv[ii]) == "-o" && ii+1 < argc) {
-      _logFile = new QFile(argv[ii+1]);
-      _logFile->open(QIODevice::WriteOnly);
-      _logStream = new QTextStream();
-      _logStream->setDevice(_logFile);
-    }
+  QSettings settings;
+  QString logFileName = settings.value("logFile").toString();
+  if ( !logFileName.isEmpty() ) {
+    _logFile = new QFile(logFileName);
+    _logFile->open(QIODevice::WriteOnly);
+    _logStream = new QTextStream();
+    _logStream->setDevice(_logFile);
   }
 }

trunk/BNC/bncwindow.cpp

@@ -17 +17 @@
 
 #include "bncwindow.h" 
+#include "bncapp.h" 
 #include "bncgetthread.h" 
 #include "bnctabledlg.h" 
@@ -326 +327 @@
 void bncWindow::slotGetThreadErrors() {
   slotMessage("All Get Threads Terminated");
+  ((bncApp*)qApp)->slotMessage("All Get Threads Terminated");
   _actAddMountPoints->setEnabled(true);
   _actGetData->setEnabled(true);
@@ -347 +349 @@
   connect(_bncCaster, SIGNAL(newMessage(const QByteArray&)), 
           this, SLOT(slotMessage(const QByteArray&)));
+  connect(_bncCaster, SIGNAL(newMessage(const QByteArray&)), 
+          (bncApp*)qApp, SLOT(slotMessage(const QByteArray&)));
 
   _bncCaster->start();
@@ -360 +364 @@
     connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
             this, SLOT(slotMessage(const QByteArray&)));
+    connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
+            (bncApp*)qApp, SLOT(slotMessage(const QByteArray&)));
 
     _bncCaster->addGetThread(getThread);