Changeset 243 in ntrip

Timestamp:

Oct 13, 2006, 9:41:15 AM (19 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/RTCM2Decoder.cpp (modified) (1 diff)
• RTCM/RTCM2Decoder.h (modified) (1 diff)
• bnc.pro (modified) (2 diffs)
• bncapp.cpp (modified) (1 diff)
• bncapp.h (modified) (2 diffs)
• bnccaster.cpp (modified) (3 diffs)
• bnccaster.h (modified) (5 diffs)
• bncgetthread.cpp (modified) (3 diffs)
• bncmain.cpp (modified) (3 diffs)
• bncwindow.cpp (modified) (4 diffs)
• bncwindow.h (modified) (2 diffs)

trunk/BNC/RTCM/RTCM2Decoder.cpp ¶

@@ -7 +7 @@
 #include "../bncutils.h"
 #include "GPSDecoder.h"
-#include "RTCM2.h"
+#include "RTCM2Decoder.h"
 
 using namespace std;

trunk/BNC/RTCM/RTCM2Decoder.h ¶

@@ -15 +15 @@
   public:
     RTCM2Decoder();
-    ~RTCMDecoder2();
+    ~RTCM2Decoder();
     virtual void Decode(char* buffer, int bufLen);
 

trunk/BNC/bnc.pro ¶

@@ -14 +14 @@
           bnccaster.h bncrinex.h bncapp.h bncutils.h   bnchlpdlg.h    \
           bncconst.h bnchtml.h bnctableitem.h                         \
-          RTCM/GPSDecoder.h RTCM/RTCM2.h                              \
+          RTCM/GPSDecoder.h RTCM/RTCM2.h RTCM/RTCM2Decoder.h          \
           RTCM3/rtcm3.h RTCM3/rtcm3torinex.h                          \
           RTIGS/rtigs.h RTIGS/cgps_transform.h RTIGS/rtacp.h          \
@@ -23 +23 @@
           bnccaster.cpp bncrinex.cpp bncapp.cpp bncutils.cpp          \
           bncconst.cpp bnchtml.cpp bnchlpdlg.cpp bnctableitem.cpp     \
-          RTCM/RTCM2.cpp                                              \
+          RTCM/RTCM2.cpp RTCM/RTCM2Decoder.cpp                        \
           RTCM3/rtcm3.cpp RTCM3/rtcm3torinex.cpp                      \
           RTIGS/rtigs.cpp RTIGS/cgps_transform.cpp

trunk/BNC/bncapp.cpp ¶

@@ -48 +48 @@
 void bncApp::slotMessage(const QByteArray msg) {
 
+  QMutexLocker locker(&_mutex);
+
   // First time resolve the log file name
   // ------------------------------------

trunk/BNC/bncapp.h ¶

@@ -6 +6 @@
 #include <QFile>
 #include <QTextStream>
+
+#include "bnccaster.h"
+
+extern bncCaster* _global_caster;
 
 class bncApp : public QApplication {
@@ -20 +24 @@
     int          _logFileFlag;
     QString      _bncVersion;
+    QMutex       _mutex;
 };
 #endif

trunk/BNC/bnccaster.cpp ¶

@@ -83 +83 @@
 }
 
-// Run
-////////////////////////////////////////////////////////////////////////////
-void bncCaster::run() {
-  exec();
-}
-
 // New Observations
 ////////////////////////////////////////////////////////////////////////////
-void bncCaster::slotNewObs(const QByteArray& staID, Observation* obs) {
+void bncCaster::newObs(const QByteArray& staID, Observation* obs) {
+
+  QMutexLocker locker(&_mutex);
 
   long iSec    = long(floor(obs->GPSWeeks+0.5));
@@ -149 +145 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncCaster::addGetThread(bncGetThread* getThread) {
-  connect(getThread, SIGNAL(newObs(const QByteArray&, Observation*)),
-          this, SLOT(slotNewObs(const QByteArray&, Observation*)));
-
   connect(getThread, SIGNAL(error(const QByteArray&)), 
           this, SLOT(slotGetThreadError(const QByteArray&)));
@@ -162 +155 @@
 ////////////////////////////////////////////////////////////////////////////
 void bncCaster::slotGetThreadError(const QByteArray& staID) {
+  QMutexLocker locker(&_mutex);
   _staIDs.removeAll(staID);
   emit( newMessage(

trunk/BNC/bnccaster.h ¶

@@ -4 +4 @@
 
 #include <QFile>
-#include <QThread>
 #include <QtNetwork>
 #include <QMultiMap>
@@ -13 +12 @@
 class bncGetThread;
 
-class bncCaster : public QThread {
+class bncCaster : public QObject {
  Q_OBJECT
 
@@ -21 +20 @@
    void addGetThread(bncGetThread* getThread);
    int  numStations() const {return _staIDs.size();}
+   void newObs(const QByteArray& staID, Observation* obs);
+
 
  signals:
@@ -26 +27 @@
    void newMessage(const QByteArray& msg);
 
- public slots:
-   void slotNewObs(const QByteArray& staID, Observation* obs);
-
  private slots:
    void slotNewConnection();
    void slotGetThreadError(const QByteArray& staID);
-
- protected:
-   virtual void run();
 
  private:
@@ -51 +46 @@
    int                            _samplingRate;
    long                           _waitTime;
+   QMutex                         _mutex;
 };
 

trunk/BNC/bncgetthread.cpp ¶

@@ -22 +22 @@
 #include "bncgetthread.h"
 #include "bnctabledlg.h"
-
-#include "RTCM/RTCM2.h"
+#include "bncapp.h"
+
+#include "RTCM/RTCM2Decoder.h"
 #include "RTCM3/rtcm3.h"
 #include "RTIGS/rtigs.h"
@@ -181 +182 @@
     if      (_format.indexOf("RTCM_2") != -1) {
       emit(newMessage("Get Data: " + _staID + " in RTCM 2.x format"));
-      _decoder = new RTCM2();
+      _decoder = new RTCM2Decoder();
     }
     else if (_format.indexOf("RTCM_3") != -1) {
@@ -232 +233 @@
       for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
            it != _decoder->_obsList.end(); it++) {
-        emit newObs(_staID, *it);
+        _global_caster->newObs(_staID, *it);
       }
       _decoder->_obsList.clear();

trunk/BNC/bncmain.cpp ¶

@@ -24 +24 @@
 
 using namespace std;
+
+bncCaster* _global_caster = 0;
 
 // Main Program
@@ -75 +77 @@
   // ----------------------------
   else {
-    bncCaster* caster = new bncCaster(settings.value("outFile").toString(),
-                                      settings.value("outPort").toInt());
+    _global_caster = new bncCaster(settings.value("outFile").toString(),
+                                   settings.value("outPort").toInt());
 
-    app.connect(caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
-    app.connect(caster, SIGNAL(newMessage(const QByteArray&)), 
+    app.connect(_global_caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
+    app.connect(_global_caster, SIGNAL(newMessage(const QByteArray&)), 
                 &app, SLOT(slotMessage(const QByteArray&)));
 
-    caster->start();
-    
     QListIterator<QString> it(settings.value("mountPoints").toStringList());
     while (it.hasNext()) {
@@ -94 +94 @@
                   &app, SLOT(slotMessage(const QByteArray&)));
 
-      caster->addGetThread(getThread);
+      _global_caster->addGetThread(getThread);
 
       getThread->start();
     }
-    if (caster->numStations() == 0) {
+    if (_global_caster->numStations() == 0) {
       return 0;
     }

trunk/BNC/bncwindow.cpp ¶

@@ -221 +221 @@
   layout->addWidget(_logFileLineEdit,                           10, 2, 1, 3);
   layout->addWidget(_log,                                       11, 0, 1, 5);
-
-  _bncCaster = 0;
 }
 
@@ -369 +367 @@
   _actStop->setEnabled(true);
 
-  _bncCaster = new bncCaster(_outFileLineEdit->text(), 
+  _global_caster = new bncCaster(_outFileLineEdit->text(), 
                              _outPortLineEdit->text().toInt());
 
-  connect(_bncCaster, SIGNAL(getThreadErrors()), 
+  connect(_global_caster, SIGNAL(getThreadErrors()), 
           this, SLOT(slotGetThreadErrors()));
 
-  connect(_bncCaster, SIGNAL(newMessage(const QByteArray&)), 
+  connect(_global_caster, SIGNAL(newMessage(const QByteArray&)), 
           this, SLOT(slotMessage(const QByteArray&)));
-  connect(_bncCaster, SIGNAL(newMessage(const QByteArray&)), 
+  connect(_global_caster, SIGNAL(newMessage(const QByteArray&)), 
           (bncApp*)qApp, SLOT(slotMessage(const QByteArray&)));
-
-  _bncCaster->start();
 
   for (int iRow = 0; iRow < _mountPointsTable->rowCount(); iRow++) {
@@ -399 +395 @@
             SLOT(slotNewObs(const QByteArray&, Observation*)));
 
-    _bncCaster->addGetThread(getThread);
+    _global_caster->addGetThread(getThread);
 
     getThread->start();
@@ -412 +408 @@
                                    QMessageBox::NoButton);
   if (iRet == QMessageBox::Yes) {
-    _bncCaster->terminate();
-    _bncCaster->wait();
-    delete _bncCaster; 
-    _bncCaster = 0;
+    delete _global_caster; _global_caster = 0;
     _actGetData->setEnabled(true);
     _actStop->setEnabled(false);

trunk/BNC/bncwindow.h ¶

@@ -6 +6 @@
 
 #include "bncgetthread.h"
-#include "bnccaster.h"
 
 class bncWindow : public QMainWindow {
@@ -64 +63 @@
 
     QWidget*   _canvas;
-
-    bncCaster* _bncCaster;
 };
 #endif