Changeset 82 in ntrip for trunk/BNC/bncmain.cpp

Timestamp:

Aug 30, 2006, 5:35:40 PM (18 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/bncmain.cpp (modified) (6 diffs)

trunk/BNC/bncmain.cpp

@@ -16 +16 @@
  * -----------------------------------------------------------------------*/
 
-#ifdef WIN32
-#include <windows.h>
-#endif
-
 #include <QApplication>
 #include <QFile>
 #include <iostream>
 
+#include "bncapp.h"
 #include "bncwindow.h"
 
 using namespace std;
 
-#ifdef WIN32
-QFile       logFile("BNC.LOG");
-QTextStream logStream;
-#endif
-
-void myMessageOutput(QtMsgType, const char *msg) {
-#ifdef WIN32
-  logStream << msg << endl;
-  logStream.flush();
-#else
-  cerr << msg << endl;
-#endif
-}
-
+// Main Program
+/////////////////////////////////////////////////////////////////////////////
 int main(int argc, char *argv[]) {
 
@@ -49 +34 @@
   }
 
-  QApplication app(argc, argv, GUIenabled);
-
-#ifdef WIN32
-  logFile.open(QIODevice::WriteOnly);
-  logStream.setDevice(&logFile);
-#endif
-  qInstallMsgHandler(myMessageOutput);
+  bncApp app(argc, argv, GUIenabled);
 
   QCoreApplication::setOrganizationName("AIUB");
@@ -61 +40 @@
   QCoreApplication::setApplicationName("Bernese NTRIP Client");
 
-  bncWindow* bncWin = 0;
-
   if (GUIenabled) {
-    bncWin = new bncWindow();
+    bncWindow* bncWin = new bncWindow();
     bncWin->show();
   }
@@ -78 +55 @@
 
     app.connect(caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
+    app.connect(caster, SIGNAL(newMessage(const QByteArray&)), 
+                &app, SLOT(slotMessage(const QByteArray&)));
 
     caster->start();
@@ -84 +63 @@
     while (it.hasNext()) {
       QStringList hlp = it.next().split(" ");
+      if (hlp.size() <= 1) continue;
       QUrl url(hlp[0]);
       QByteArray mountPoint = url.path().mid(1).toAscii();
@@ -92 +72 @@
                                                  mountPoint, user, password,
                                                  format);
+      app.connect(getThread, SIGNAL(newMessage(const QByteArray&)), 
+                  &app, SLOT(slotMessage(const QByteArray&)));
+
       caster->addGetThread(getThread);
 
       getThread->start();
     }
+    if (caster->nMountPoints() == 0) {
+      return 0;
+    }
   }
   return app.exec();