Changeset 621 in ntrip

Timestamp:

Dec 16, 2007, 3:44:57 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• RTCM/GPSDecoder.h (modified) (2 diffs)
• RTCM/RTCM2Decoder.cpp (modified) (1 diff)
• RTCM3/RTCM3Decoder.cpp (modified) (1 diff)
• RTIGS/RTIGSDecoder.cpp (modified) (1 diff)
• bnc.pro (modified) (1 diff)
• bncapp.cpp (modified) (2 diffs)
• bncapp.h (modified) (2 diffs)
• bncgetthread.cpp (modified) (4 diffs)
• bncmain.cpp (modified) (3 diffs)

trunk/BNC/RTCM/GPSDecoder.h

@@ -26 +26 @@
 #define GPSDECODER_H
 
-#include <list>
+#include <QPointer>
+#include <QList>
 
-class Observation {
+class Observation : public QObject{
   public:
   Observation() {
@@ -68 +69 @@
 };
 
+typedef QPointer<Observation> p_obs;
+
 class GPSDecoder {
   public:
     virtual void Decode(char* buffer, int bufLen) = 0;
     virtual ~GPSDecoder() {}
-    std::list<Observation*> _obsList;
+    QList<p_obs> _obsList;
 };
 

trunk/BNC/RTCM/RTCM2Decoder.cpp

@@ -58 +58 @@
 
 RTCM2Decoder::~RTCM2Decoder() {
-
+  QListIterator<p_obs> it(_obsList);
+  while (it.hasNext()) {
+    delete it.next();
+  }
+  _obsList.clear();
 }
 

trunk/BNC/RTCM3/RTCM3Decoder.cpp

@@ -84 +84 @@
 ////////////////////////////////////////////////////////////////////////////
 RTCM3Decoder::~RTCM3Decoder() {
+  QListIterator<p_obs> it(_obsList);
+  while (it.hasNext()) {
+    delete it.next();
+  }
+  _obsList.clear();
 }
 

trunk/BNC/RTIGS/RTIGSDecoder.cpp

@@ -55 +55 @@
 ////////////////////////////////////////////////////////////////////////////
 RTIGSDecoder::~RTIGSDecoder() {
+  QListIterator<p_obs> it(_obsList);
+  while (it.hasNext()) {
+    delete it.next();
+  }
+  _obsList.clear();
 }
 

trunk/BNC/bnc.pro

@@ -2 +2 @@
 # Switch to debug configuration
 # -----------------------------
-### CONFIG -= release
-### CONFIG += debug
+CONFIG -= release
+CONFIG += debug
 
 DEFINES += NO_RTCM3_MAIN

trunk/BNC/bncapp.cpp

@@ -73 +73 @@
   _logFile     = 0;
   _logStream   = 0;
+  _caster      = 0;
 
   // Lists of Ephemeris
@@ -617 +618 @@
 }
 
+// 
+////////////////////////////////////////////////////////////////////////////
+void bncApp::slotQuit() {
+  cout << "bncApp::slotQuit" << endl;
+  delete _caster;
+  quit();
+}
+
+

trunk/BNC/bncapp.h

@@ -40 +40 @@
     QString bncVersion() const {return _bncVersion;}
     void    setPort(int port);
+    void setCaster(bncCaster* caster) {_caster = caster;}
   public slots:
     void slotMessage(const QByteArray msg);
     void slotNewGPSEph(gpsephemeris* gpseph);
     void slotNewGlonassEph(glonassephemeris* glonasseph);
+    void slotQuit();
+    
  private slots:
    void slotNewConnection();
@@ -70 +73 @@
     QTcpServer*         _server;
     QList<QTcpSocket*>* _sockets;
+    bncCaster*          _caster;
 };
 #endif

trunk/BNC/bncgetthread.cpp

@@ -377 +377 @@
   // ------------------
   while (true) {
+
+    if (_decoder) {
+      QListIterator<p_obs> it(_decoder->_obsList);
+      while (it.hasNext()) {
+        delete it.next();
+      }
+      _decoder->_obsList.clear();
+    }
+
     try {
       if (_socket->state() != QAbstractSocket::ConnectedState) {
@@ -394 +403 @@
         delete [] data;
         
-        for (list<Observation*>::iterator it = _decoder->_obsList.begin(); 
-             it != _decoder->_obsList.end(); it++) {
+
+        QListIterator<p_obs> it(_decoder->_obsList);
+        while (it.hasNext()) {
+          p_obs obs = it.next();
 
           // Check observation epoch
@@ -406 +417 @@
           const double maxDt      = 600.0;            
 
-          if (week < (*it)->GPSWeek) {
+          if (week < obs->GPSWeek) {
             week += 1;
             sec  -= secPerWeek;
           }
-          if (week > (*it)->GPSWeek) {
+          if (week > obs->GPSWeek) {
             week -= 1;
             sec  += secPerWeek;
           }
-          double dt = fabs(sec - (*it)->GPSWeeks);
-          if (week != (*it)->GPSWeek || dt > maxDt) {
+          double dt = fabs(sec - obs->GPSWeeks);
+          if (week != obs->GPSWeek || dt > maxDt) {
             emit( newMessage("Wrong observation epoch") );
-            delete (*it);
+            delete obs;
             continue;
           }
@@ -424 +435 @@
           // ------------
           if (_rnx) {
-             long iSec    = long(floor((*it)->GPSWeeks+0.5));
-             long newTime = (*it)->GPSWeek * 7*24*3600 + iSec;
+             long iSec    = long(floor(obs->GPSWeeks+0.5));
+             long newTime = obs->GPSWeek * 7*24*3600 + iSec;
             if (_samplingRate == 0 || iSec % _samplingRate == 0) {
-              _rnx->deepCopy(*it);
+              _rnx->deepCopy(obs);
             }
             _rnx->dumpEpoch(newTime);
           }
 
-          bool firstObs = (it == _decoder->_obsList.begin());
-          emit newObs(_staID, firstObs, *it);
+          bool firstObs = (obs == _decoder->_obsList.first());
+          emit newObs(_staID, firstObs, obs);
         }
         _decoder->_obsList.clear();

trunk/BNC/bncmain.cpp

@@ -50 +50 @@
 using namespace std;
 
-bncCaster* _caster = 0;
-
 void catch_signal(int) {
-  delete _caster;
   cout << "Program Interrupted by Ctrl-C" << endl;
-  ((bncApp*)qApp)->quit();
+  ((bncApp*)qApp)->slotQuit();
 }
 
@@ -109 +106 @@
   // ----------------------------
   else {
+
+    bncCaster* caster = new bncCaster(settings.value("outFile").toString(),
+                                      settings.value("outPort").toInt());
+    
+    app.setCaster(caster);
+
     // Ctrl-C Signal Handling
     // ----------------------
     signal(SIGINT, catch_signal);
 
-    _caster = new bncCaster(settings.value("outFile").toString(),
-                            settings.value("outPort").toInt());
-    
+    //// beg test
+    QTimer::singleShot(30000, &app, SLOT(slotQuit()));
+    //// end test
+
     app.setPort(settings.value("outEphPort").toInt());
 
-    app.connect(_caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
-    app.connect(_caster, SIGNAL(newMessage(const QByteArray&)), 
+    app.connect(caster, SIGNAL(getThreadErrors()), &app, SLOT(quit()));
+    app.connect(caster, SIGNAL(newMessage(const QByteArray&)), 
                 &app, SLOT(slotMessage(const QByteArray&)));
   
@@ -139 +143 @@
                   &app, SLOT(slotMessage(const QByteArray&)));
 
-      _caster->addGetThread(getThread);
+      caster->addGetThread(getThread);
 
       getThread->start();
     }
-    if (_caster->numStations() == 0) {
+    if (caster->numStations() == 0) {
       return 0;
     }