Changeset 757 in ntrip

Timestamp:

Mar 30, 2008, 5:30:50 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNS

Files:

• bns.cpp (modified) (1 diff)
• bns.h (modified) (1 diff)
• bnsmain.cpp (modified) (4 diffs)
• bnswindow.cpp (modified) (2 diffs)
• bnswindow.h (modified) (3 diffs)

trunk/BNS/bns.cpp

@@ -23 +23 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bns::bns(QObject* parent) : QThread(parent) {
+t_bns::t_bns(QObject* parent) : QThread(parent) {
 }
 
 // Destructor
 ////////////////////////////////////////////////////////////////////////////
-bns::~bns() {
+t_bns::~t_bns() {
 }
 
 // Write a Program Message
 ////////////////////////////////////////////////////////////////////////////
-void bns::slotMessage(const QByteArray msg) {
-  QMutexLocker locker(&_mutex);
+void t_bns::message(const QByteArray msg) {
   cout << msg.data() << endl;
+  emit(newMessage(msg));
 }
 
 // Start 
 ////////////////////////////////////////////////////////////////////////////
-void bns::run() {
-  slotMessage("============ Start BNS ============");
+void t_bns::run() {
+  message("============ Start BNS ============");
 }
 

trunk/BNS/bns.h

@@ -6 +6 @@
 #include <QMutex>
 
-class bns : public QThread {
-  Q_OBJECT
+class t_bns : public QThread {
+ Q_OBJECT
  public:
-  bns(QObject* parent = 0);
-  virtual ~bns();  
+  t_bns(QObject* parent = 0);
+  virtual ~t_bns();  
   virtual void run();  
 
- protected:
-
- public slots:
-  void slotMessage(const QByteArray msg);
-    
- private slots:
+ signals:
+  void newMessage(const QByteArray msg);
  
  private:
+  void message(const QByteArray msg);
   QMutex _mutex;
 };

trunk/BNS/bnsmain.cpp

@@ -26 +26 @@
 int main(int argc, char *argv[]) {
 
+  // Command-Line Options
+  // --------------------
   bool GUIenabled = true;
   for (int ii = 1; ii < argc; ii++) {
@@ -34 +36 @@
   }
 
+  // Main Qt Class
+  // -------------
   QApplication app(argc, argv, GUIenabled);
 
@@ -40 +44 @@
   app.setApplicationName("BKG_NTRIP_Server");
 
+  // Main processing class
+  // ---------------------
+  t_bns* bns = new t_bns();
+
   // Interactive Mode - open the main window
   // ---------------------------------------
   if (GUIenabled) {
-    bnsWindow* bnsWin = new bnsWindow();
+    bnsWindow* bnsWin = new bnsWindow(bns);
     bnsWin->show();
   }
@@ -50 +58 @@
   // ----------------------------
   else {
-
+    bns->start();
   }
 

trunk/BNS/bnswindow.cpp

@@ -58 +58 @@
 // Constructor
 ////////////////////////////////////////////////////////////////////////////
-bnsWindow::bnsWindow() {
+bnsWindow::bnsWindow(t_bns* bns) {
+
+  _bns = bns;
+
+  connect(bns, SIGNAL(newMessage(QByteArray)),
+          this, SLOT(slotMessage(const QByteArray)));
 
   QSettings settings;
@@ -298 +303 @@
   _actStop->setEnabled(true);
 
-  slotMessage("============ Start BNS ============");
-
-}
+  _bns->start();
+}

trunk/BNS/bnswindow.h

@@ -4 +4 @@
 #include <QtGui>
 #include <QWhatsThis>
+
+#include "bns.h"
 
 class bnsAboutDlg : public QDialog {
@@ -16 +18 @@
 
  public:
-  bnsWindow();
+  bnsWindow(t_bns* bns);
   ~bnsWindow();
 
@@ -58 +60 @@
 
   QTextEdit*  _log;
+
+  t_bns*      _bns;
 };
 #endif