Changeset 5900 in ntrip


Ignore:
Timestamp:
Aug 9, 2014, 10:00:20 AM (8 years ago)
Author:
mervart
Message:
 
Location:
trunk/BNC/src
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/BNC/src/PPP/pppMain.cpp

    r5898 r5900  
    5757//////////////////////////////////////////////////////////////////////////////
    5858t_pppMain::~t_pppMain() {
    59   slotStop();
     59  stop();
    6060}
    6161
     
    8181  catch (t_except exc) {
    8282    _running = true;
    83     slotStop();
     83    stop();
    8484  }
    8585}
     
    8787//
    8888//////////////////////////////////////////////////////////////////////////////
    89 void t_pppMain::slotStop() {
    90 
    91   cout << "t_pppMain::slotStop" << endl;
     89void t_pppMain::stop() {
    9290
    9391  if (!_running) {
  • trunk/BNC/src/PPP/pppMain.h

    r5870 r5900  
    88namespace BNC_PPP {
    99
    10 class t_pppMain : public QObject {
    11 Q_OBJECT
     10class t_pppMain {
    1211 public:
    1312  t_pppMain();                                                     
    1413  ~t_pppMain();
    1514  void start();                                                     
    16  public slots:
    17   void slotStop();                                                     
     15  void stop();                                                     
    1816
    1917 private:
  • trunk/BNC/src/bnccore.cpp

    r5899 r5900  
    868868  _dateAndTimeGPS = new QDateTime(dateTime);
    869869}
     870
     871//
     872////////////////////////////////////////////////////////////////////////////
     873void t_bncCore::startPPP() {
     874  _pppMain->start();
     875}
     876
     877//
     878////////////////////////////////////////////////////////////////////////////
     879void t_bncCore::stopPPP() {
     880  _pppMain->stop();
     881}
  • trunk/BNC/src/bnccore.h

    r5899 r5900  
    7171  void setMainWindow(QWidget* mainWindow){_mainWindow = mainWindow;}
    7272  bool GUIenabled() const {return _GUIenabled;}
    73   BNC_PPP::t_pppMain* pppMain() {return _pppMain;}
     73  void startPPP();
     74  void stopPPP();
    7475
    7576  QMap<int, bncTableItem*> _uploadTableItems;
  • trunk/BNC/src/bncgetthread.cpp

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

    r5899 r5900  
    5353#include "rinex/reqcedit.h"
    5454#include "rinex/reqcanalyze.h"
    55 #include "PPP/pppMain.h"
    5655
    5756using namespace std;
     
    192191    // PPP Client(s) (in separate threads)
    193192    // -----------------------------------   
    194     BNC_CORE->pppMain()->start();
     193    BNC_CORE->startPPP();
    195194
    196195    // Normal case - data from Internet
  • trunk/BNC/src/bncwindow.cpp

    r5899 r5900  
    6666#include "rinex/reqcedit.h"
    6767#include "rinex/reqcanalyze.h"
    68 #include "PPP/pppMain.h"
    6968#ifdef QT_WEBKIT
    7069#  include "map/bncmapwin.h"
     
    16531652    startRealTime();
    16541653  }
    1655   BNC_CORE->pppMain()->start();
     1654  BNC_CORE->startPPP();
    16561655}
    16571656
     
    17261725                                   QMessageBox::NoButton);
    17271726  if (iRet == QMessageBox::Yes) {
    1728     BNC_CORE->pppMain()->slotStop();
     1727    BNC_CORE->stopPPP();
    17291728    BNC_CORE->stopCombination();
    17301729    delete _caster;    _caster    = 0; BNC_CORE->setCaster(0);
     
    17511750  }
    17521751
    1753   BNC_CORE->pppMain()->slotStop();
     1752  BNC_CORE->stopPPP();
    17541753
    17551754  QMainWindow::closeEvent(event);
Note: See TracChangeset for help on using the changeset viewer.