Changeset 2000 in ntrip for trunk


Ignore:
Timestamp:
Nov 21, 2009, 3:35:20 PM (15 years ago)
Author:
mervart
Message:

* empty log message *

Location:
trunk/BNC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/bnccaster.cpp

    r1999 r2000  
    4747#include "bncutils.h"
    4848#include "bncsettings.h"
     49#include "bncpppthread.h"
    4950#include "RTCM/GPSDecoder.h"
    5051
     
    250251  _staIDs.push_back(getThread->staID());
    251252  _threads.push_back(getThread);
     253
     254  bncPPPthread* PPPthread = getThread->PPPthread();
     255  if (PPPthread) {
     256    connect(this, SIGNAL(newEpochData(QList<p_obs>)),
     257            PPPthread, SLOT(slotNewEpochData(QList<p_obs>)));
     258    connect(((bncApp*)qApp), SIGNAL(newEphGPS(gpsephemeris)),
     259            PPPthread, SLOT(slotNewEphGPS(gpsephemeris)));
     260    PPPthread->start();
     261  }
    252262
    253263  getThread->start();
  • trunk/BNC/bncgetthread.cpp

    r1973 r2000  
    6363#include "bncsettings.h"
    6464#include "latencychecker.h"
     65#include "bncpppthread.h"
    6566
    6667#include "RTCM/RTCM2Decoder.h"
     
    122123  _nextSleep     = 0;
    123124  _rawOutFile    = 0;
     125  _PPPthread     = 0;
    124126
    125127  bncSettings settings;
     
    289291    emit(newMessage(_staID + ": Get data in RTCM 2.x format", true));
    290292    _decoder = new RTCM2Decoder(_staID.data());
     293    _PPPthread = new bncPPPthread(_staID);
    291294  }
    292295  else if (_format.indexOf("RTCM_3") != -1 || _format.indexOf("RTCM3") != -1 ||
     
    296299    connect((RTCM3Decoder*) _decoder, SIGNAL(newMessage(QByteArray,bool)),
    297300            this, SIGNAL(newMessage(QByteArray,bool)));
     301    _PPPthread = new bncPPPthread(_staID);
    298302  }
    299303  else if (_format.indexOf("RTIGS") != -1) {
    300304    emit(newMessage(_staID + ": Get data in RTIGS format", true));
    301305    _decoder = new RTIGSDecoder();
     306    _PPPthread = new bncPPPthread(_staID);
    302307  }
    303308  else if (_format.indexOf("GPSS") != -1 || _format.indexOf("BNC") != -1) {
     
    322327////////////////////////////////////////////////////////////////////////////
    323328bncGetThread::~bncGetThread() {
     329
     330  if (_PPPthread) {
     331    _PPPthread->terminate();
     332  }
    324333
    325334  if (isRunning()) {
  • trunk/BNC/bncgetthread.h

    r1974 r2000  
    3939class QextSerialPort;
    4040class latencyChecker;
     41class bncPPPthread;
    4142
    4243class bncGetThread : public QThread {
     
    7273   QByteArray longitude() const {return _longitude;}
    7374   QByteArray ntripVersion() const {return _ntripVersion;}
     75   bncPPPthread* PPPthread() {return _PPPthread;}
    7476
    7577 signals:
     
    121123   t_serialNMEA    _serialNMEA;
    122124   QMutex          _mutex;
     125   bncPPPthread*   _PPPthread;
    123126};
    124127
Note: See TracChangeset for help on using the changeset viewer.