Changeset 1171 in ntrip

Timestamp:

Oct 27, 2008, 3:57:29 PM (15 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncapp.cpp (modified) (1 diff)
• bnccaster.cpp (modified) (3 diffs)
• bncwindow.cpp (modified) (3 diffs)
• bncwindow.h (modified) (1 diff)

trunk/BNC/bncapp.cpp

@@ -152 +152 @@
 
   messagePrivate(msg);
+  emit newMessage(msg);
 }
 

trunk/BNC/bnccaster.cpp

@@ -92 +92 @@
 
   _confTimer = 0;
+
+  connect(this, SIGNAL(newMessage(QByteArray)), 
+          (bncApp*) qApp, SLOT(slotMessage(const QByteArray)));
 }
 
@@ -358 +361 @@
       app->connect(getThread, SIGNAL(newMessage(QByteArray)), 
                    app, SLOT(slotMessage(const QByteArray)));
-
-      std::cout << "newThread "  << getThread->staID().data() << std::endl;
-      
       addGetThread(getThread);
     }
@@ -385 +385 @@
 
     if (!existFlg) {
-      std::cout << "old Thread "  << thread->staID().data() << std::endl;
       disconnect(thread, 0, 0, 0);
       _staIDs.removeAll(thread->staID());

trunk/BNC/bncwindow.cpp

@@ -63 +63 @@
 
   setWindowTitle(tr("BKG Ntrip Client (BNC) Version 1.6"));
+
+  connect((bncApp*)qApp, SIGNAL(newMessage(QByteArray)), 
+          this, SLOT(slotMessage(QByteArray)));
 
   // Create Actions
@@ -654 +657 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncWindow::slotGetThreadErrors() {
-  slotMessage("All Get Threads Terminated");
   ((bncApp*)qApp)->slotMessage("All Get Threads Terminated");
   _actAddMountPoints->setEnabled(true);
@@ -679 +681 @@
           this, SLOT(slotGetThreadErrors()));
 
-  connect(_caster, SIGNAL(newMessage(QByteArray)), 
-          this, SLOT(slotMessage(QByteArray)));
-  connect(_caster, SIGNAL(newMessage(QByteArray)), 
-          (bncApp*)qApp, SLOT(slotMessage(QByteArray)));
-  connect((bncApp*)qApp, SIGNAL(newMessage(QByteArray)), 
-          this, SLOT(slotMessage(QByteArray)));
-
   _caster->slotReadMountpoints();
 
-  slotMessage                 ("============ Start BNC ============");
   ((bncApp*)qApp)->slotMessage("============ Start BNC ============");
 }

trunk/BNC/bncwindow.h

@@ -58 +58 @@
   
   public slots:  
-    void slotMessage(const QByteArray msg);
 
   private slots:
+    void slotMessage(const QByteArray msg);
     void slotHelp();
     void slotAbout();