Changeset 5946 in ntrip


Ignore:
Timestamp:
Aug 16, 2014, 1:45:47 PM (11 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r5944 r5946  
    6363//
    6464//////////////////////////////////////////////////////////////////////////////
    65 void t_pppMain::start(bool ownThread) {
     65void t_pppMain::start() {
    6666  if (_running) {
    6767    return;
    … …  
    7474    while (iOpt.hasNext()) {
    7575      const t_pppOptions* opt = iOpt.next();
    76       t_pppThread* pppThread = new t_pppThread(ownThread, opt);
    77       if (ownThread) {
    78         pppThread->start();
    79       }
    80       else {
    81         pppThread->run();
    82       }
     76      t_pppThread* pppThread = new t_pppThread(opt);
     77      pppThread->start();
    8378      _pppThreads << pppThread;
    8479      _running = true;
    … …  
    9489//////////////////////////////////////////////////////////////////////////////
    9590void t_pppMain::stop() {
    96 
    97   cout << "t_pppMain::stop" << endl;
    9891
    9992  if (!_running) {

  • TabularUnified trunk/BNC/src/PPP/pppMain.h

    r5905 r5946  
    1212  t_pppMain();
    1313  ~t_pppMain();
    14   void start(bool ownThread);
     14  void start();
    1515  void stop();
    1616

  • TabularUnified trunk/BNC/src/PPP/pppRun.cpp

    r5945 r5946  
    6060////////////////////////////////////////////////////////////////////////////
    6161t_pppRun::t_pppRun(const t_pppOptions* opt) {
    62 
    63   cout << "t_pppRun" << endl;
    6462
    6563  _opt = opt;
    … …  
    113111////////////////////////////////////////////////////////////////////////////
    114112t_pppRun::~t_pppRun() {
    115   cout << "~t_pppRun" << endl;
    116113}
    117114

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

    r5944 r5946  
    5555// Constructor
    5656////////////////////////////////////////////////////////////////////////////
    57 t_pppThread::t_pppThread(bool ownThread, const t_pppOptions* opt) : QThread(0) {
     57t_pppThread::t_pppThread(const t_pppOptions* opt) : QThread(0) {
    5858
    59   cout << "t_pppThread" << endl;
    60 
    61   _ownThread = ownThread;
    6259  _opt       = opt;
    6360  _pppRun    = 0;
    … …  
    7269////////////////////////////////////////////////////////////////////////////
    7370t_pppThread::~t_pppThread() {
    74   cout << "~t_pppThread" << endl;
    7571  delete _pppRun;
    7672}
    … …  
    8379    _pppRun = new t_pppRun(_opt);
    8480    if (_opt->_realTime) {
    85       if (_ownThread) {
    86         QThread::exec();
    87       }
     81      QThread::exec();
    8882    }
    8983    else {

  • TabularUnified trunk/BNC/src/PPP/pppThread.h

    r5930 r5946  
    1616 Q_OBJECT
    1717 public:
    18   t_pppThread(bool ownThread, const t_pppOptions* opt);
     18  t_pppThread(const t_pppOptions* opt);
    1919  ~t_pppThread();
    2020  virtual void run();
    … …  
    2525
    2626 private:
    27   bool                _ownThread;
    2827  const t_pppOptions* _opt;
    2928  t_pppRun*           _pppRun;

  • TabularUnified trunk/BNC/src/bnccore.cpp

    r5938 r5946  
    873873//
    874874////////////////////////////////////////////////////////////////////////////
    875 void t_bncCore::startPPP(bool ownThread) {
    876   _pppMain->start(ownThread);
     875void t_bncCore::startPPP() {
     876  _pppMain->start();
    877877}
    878878

  • TabularUnified trunk/BNC/src/bnccore.h

    r5941 r5946  
    7171  void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
    7272  bool GUIenabled() const {return _GUIenabled;}
    73   void startPPP(bool ownThread);
     73  void startPPP();
    7474  void stopPPP();
    7575

  • TabularUnified trunk/BNC/src/bncmain.cpp

    r5945 r5946  
    174174  else if (settings.value("PPP/dataSource").toString() == "RINEX Files") {
    175175    BNC_CORE->setMode(t_bncCore::batchPostProcessing);
    176     BNC_CORE->startPPP(true);
     176    BNC_CORE->startPPP();
    177177  }
    178178
    … …  
    200200    if ( rawFileName.isEmpty() ) {
    201201      BNC_CORE->setMode(t_bncCore::nonInteractive);
    202       BNC_CORE->startPPP(true);
     202      BNC_CORE->startPPP();
    203203
    204204      caster->readMountPoints();
    … …  
    212212    else {
    213213      BNC_CORE->setMode(t_bncCore::batchPostProcessing);
    214       BNC_CORE->startPPP(true);
     214      BNC_CORE->startPPP();
    215215
    216216      bncRawFile*   rawFile   = new bncRawFile(rawFileName, "", bncRawFile::input);

  • TabularUnified trunk/BNC/src/bncwindow.cpp

    r5943 r5946  
    16501650  saveOptions();
    16511651  if      ( _pppWidgets._dataSource->currentText() == "RINEX Files") {
    1652     BNC_CORE->startPPP(true);
     1652    BNC_CORE->startPPP();
    16531653  }
    16541654  else if ( !_reqcActionComboBox->currentText().isEmpty() ) {
    … …  
    16571657  else {
    16581658    startRealTime();
    1659     BNC_CORE->startPPP(true);
     1659    BNC_CORE->startPPP();
    16601660  }
    16611661}
Note: See TracChangeset for help on using the changeset viewer.