Changeset 5729 in ntrip for trunk/BNC


Ignore:
Timestamp:
Jul 31, 2014, 3:18:23 PM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/PPP/pppMain.cpp

    r5725 r5729  
    8383  if (!_running) {
    8484    return;
     85  }
     86  QListIterator<t_pppThread*> it(_pppThreads);
     87  while (it.hasNext()) {
     88    t_pppThread* pppThread = it.next();
     89    pppThread->exit();
    8590  }
    8691  _running = false;

  • trunk/BNC/src/PPP/pppThread.cpp

    r5727 r5729  
    6666void t_pppThread::run() {
    6767
     68  cout << _opt._roverName << " run" << endl;
     69
    6870  // Connect to BNC Signals
    6971  // ----------------------
    7072  if (BNC_CORE->caster()) {
    71     connect(BNC_CORE->caster().data(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
    72           this,      SLOT(slotNewObs(QByteArray, QList<t_obs>)));
     73    connect(BNC_CORE->caster(), SIGNAL(newObs(QByteArray, QList<t_obs>)),
     74            this, SLOT(slotNewObs(QByteArray, QList<t_obs>)));
    7375
    7476    connect(BNC_CORE, SIGNAL(newEphGPS(gpsephemeris)),
    … …  
    8890  // ---------------------
    8991  QThread::exec();
     92
     93  cout << _opt._roverName << " exit" << endl;
    9094}
    9195

  • trunk/BNC/src/bnccore.cpp

    r5727 r5729  
    7373  _logStream   = 0;
    7474  _rawFile     = 0;
     75  _caster      = 0;
    7576#ifdef USE_COMBINATION
    7677  _bncComb     = 0;
    … …  
    630631void t_bncCore::slotQuit() {
    631632  cout << "t_bncCore::slotQuit" << endl;
    632   _caster.clear();
     633  delete _caster; _caster = 0;
    633634  qApp->quit();
    634635}

  • trunk/BNC/src/bnccore.h

    r5728 r5729  
    5151    void setPort(int port);
    5252    void setPortCorr(int port);
    53     void setCaster(QSharedPointer<bncCaster> caster) {_caster = caster;}
    54     void deleteCaster() {_caster.clear();}
    55     QSharedPointer<bncCaster> caster() const {return _caster;}
     53    void setCaster(bncCaster* caster) {_caster = caster;}
     54    const bncCaster* caster() const {return _caster;}
    5655    QDateTime* _currentDateAndTimeGPS;
    5756    void setConfFileName(const QString& confFileName);
    … …  
    129128    QTcpServer*         _serverNMEA;
    130129    QList<QTcpSocket*>* _socketsNMEA;
    131     QSharedPointer<bncCaster> _caster;
     130    bncCaster*          _caster;
    132131    QMap<QString, bncTime> _lastCorrDumpTime;
    133132    double              _waitCoTime;

  • trunk/BNC/src/bncmain.cpp

    r5727 r5729  
    193193    bncEphUploadCaster* casterEph = new bncEphUploadCaster(); (void) casterEph;
    194194   
    195     QSharedPointer<bncCaster> caster(new bncCaster());
     195    bncCaster* caster = new bncCaster();
    196196   
    197197    BNC_CORE->setCaster(caster);
    … …  
    200200    BNC_CORE->initCombination();
    201201   
    202     BNC_CORE->connect(caster.data(), SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
     202    BNC_CORE->connect(caster, SIGNAL(getThreadsFinished()), &app, SLOT(quit()));
    203203   
    204204    BNC_CORE->slotMessage("========== Start BNC v" BNCVERSION " =========", true);

  • trunk/BNC/src/bncwindow.cpp

    r5728 r5729  
    9090#endif
    9191
     92  _caster    = 0;
    9293  _casterEph = 0;
    9394
    … …  
    15271528////////////////////////////////////////////////////////////////////////////
    15281529bncWindow::~bncWindow() {
    1529   _caster.clear(); BNC_CORE->deleteCaster();
     1530  delete _caster; BNC_CORE->setCaster(0);
    15301531  delete _casterEph;
    15311532  delete _pppMain;
    … …  
    19901991void bncWindow::slotGetThreadsFinished() {
    19911992  BNC_CORE->slotMessage("All Get Threads Terminated", true);
    1992   _caster.clear(); BNC_CORE->deleteCaster();
     1993  delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
    19931994  delete _casterEph; _casterEph = 0;
    19941995  _runningRealTime = false;
    … …  
    20252026  enableStartStop();
    20262027
    2027   _caster = QSharedPointer<bncCaster>(new bncCaster());
     2028  _caster = new bncCaster();
    20282029
    20292030  BNC_CORE->setCaster(_caster);
    … …  
    20322033  BNC_CORE->initCombination();
    20332034
    2034   connect(_caster.data(), SIGNAL(getThreadsFinished()),
     2035  connect(_caster, SIGNAL(getThreadsFinished()),
    20352036          this, SLOT(slotGetThreadsFinished()));
    20362037
    2037   connect (_caster.data(), SIGNAL(mountPointsRead(QList<bncGetThread*>)),
     2038  connect (_caster, SIGNAL(mountPointsRead(QList<bncGetThread*>)),
    20382039           this, SLOT(slotMountPointsRead(QList<bncGetThread*>)));
    20392040
    … …  
    20872088    }
    20882089    BNC_CORE->stopCombination();
    2089     _caster.clear(); BNC_CORE->deleteCaster();
     2090    delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
    20902091    delete _casterEph; _casterEph = 0;
    20912092    _runningRealTime = false;

  • trunk/BNC/src/bncwindow.h

    r5727 r5729  
    260260    bncBytesCounter* _uploadEphBytesCounter;
    261261
    262     QSharedPointer<bncCaster> _caster;
    263 
     262    bncCaster*          _caster;
    264263    bncEphUploadCaster* _casterEph;
    265264
Note: See TracChangeset for help on using the changeset viewer.