Changeset 5899 in ntrip


Ignore:
Timestamp:
Aug 9, 2014, 9:29:34 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/bnccore.cpp

    r5875 r5899  
    5151#include "rinex/rnxobsfile.h"
    5252#include "rinex/rnxnavfile.h"
     53#include "PPP/pppMain.h"
    5354
    5455#ifdef USE_COMBINATION
     
    126127
    127128  _mainWindow = 0;
     129
     130  _pppMain = new BNC_PPP::t_pppMain();
    128131}
    129132
  • trunk/BNC/src/bnccore.h

    r5884 r5899  
    3535class bncComb;
    3636class bncTableItem;
     37namespace BNC_PPP {
     38  class t_pppMain;
     39}
    3740
    3841class t_bncCore : public QObject {
     
    6871  void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
    6972  bool GUIenabled() const {return _GUIenabled;}
     73  BNC_PPP::t_pppMain* pppMain() {return _pppMain;}
    7074
    7175  QMap<int, bncTableItem*> _uploadTableItems;
     
    148152  QDateTime*          _dateAndTimeGPS;
    149153  mutable QMutex      _mutexDateAndTimeGPS;
     154  BNC_PPP::t_pppMain* _pppMain;
    150155};
    151156
  • trunk/BNC/src/bncgetthread.cpp

    r5869 r5899  
    413413          cout << "no more data" << endl;
    414414          BNC_CORE->stopCombination();
     415          BNC_CORE->pppMain()->deleteLater();
    415416          emit finished();
    416417          this->deleteLater();
  • trunk/BNC/src/bncmain.cpp

    r5887 r5899  
    192192    // PPP Client(s) (in separate threads)
    193193    // -----------------------------------   
    194     BNC_PPP::t_pppMain* pppMain = new BNC_PPP::t_pppMain();
    195     pppMain->start();
     194    BNC_CORE->pppMain()->start();
    196195
    197196    // Normal case - data from Internet
  • trunk/BNC/src/bncwindow.cpp

    r5896 r5899  
    9797  _runningRealTime           = false;
    9898  _runningPostProcessingReqc = false;
    99   _pppMain                   = new BNC_PPP::t_pppMain();
    10099  _reqcActionComboBox        = 0; // necessary for enableStartStop()
    101100
     
    12171216  delete _caster; BNC_CORE->setCaster(0);
    12181217  delete _casterEph;
    1219   delete _pppMain;
    12201218}
    12211219
     
    16551653    startRealTime();
    16561654  }
    1657   if (_pppMain) {
    1658     _pppMain->start();
    1659   }
     1655  BNC_CORE->pppMain()->start();
    16601656}
    16611657
     
    17301726                                   QMessageBox::NoButton);
    17311727  if (iRet == QMessageBox::Yes) {
    1732     if (_pppMain) {
    1733       _pppMain->slotStop();
    1734     }
     1728    BNC_CORE->pppMain()->slotStop();
    17351729    BNC_CORE->stopCombination();
    17361730    delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
     
    17571751  }
    17581752
    1759   if (_pppMain) {
    1760     _pppMain->slotStop();
    1761   }
     1753  BNC_CORE->pppMain()->slotStop();
    17621754
    17631755  QMainWindow::closeEvent(event);
  • trunk/BNC/src/bncwindow.h

    r5893 r5899  
    5555class qtFileChooser;
    5656class bncMapWin;
    57 
    58 namespace BNC_PPP {
    59 class t_pppMain;
    60 }
    6157
    6258class bncWindow : public QMainWindow {
     
    234230
    235231    t_pppWidgets         _pppWidgets;
    236     BNC_PPP::t_pppMain*  _pppMain;
    237232};
    238233
Note: See TracChangeset for help on using the changeset viewer.